[adonthell-wastesedge-commits] Release_0-3-1 3ad0ff2 043/237: Some bugfixes and little updates

[Kai Sterker]

tag: Release_0-3-1
commit 3ad0ff22fe7a9af6aa9b0a314e67cbc5531f6e4a
Author: adondev <adondev>
Commit: adondev <adondev>

    Some bugfixes and little updates
---
 scripts/dialogues/alek_start.py   |    7 ++++-
 scripts/dialogues/erek_start.py   |   39 +++++++++++++++++++++++--
 scripts/dialogues/orloth_start.py |   58 ++++++++++++++++++++++---------------
 3 files changed, 78 insertions(+), 26 deletions(-)

diff --git a/scripts/dialogues/alek_start.py b/scripts/dialogues/alek_start.py
index e7c9e7f..a3c26d4 100755
--- a/scripts/dialogues/alek_start.py
+++ b/scripts/dialogues/alek_start.py
@@ -1,6 +1,6 @@
 class alek_start:
     loop = []
-    strings = ["And who do we have here? A damn freak Half-Elf I say!", 
"That's $name, you ass! I'm working for Lady Silverhair.", "For Lady 
Silverhair, eh? Now that scares the shit out of me, Half-Elf. Go and bother 
somebody else!", "I'll be damned if that's not our freakish Half-Elf! Still 
pokin' your nose in other peoples business?", "Listen! Need we really go 
through all this crap again?", "You're getting on my nerves, Half-Elf. Go ahead 
then, ask your stupid questions.", "I don't li [...]
+    strings = ["And who do we have here? A damn freak Half-Elf I say!", 
"That's $name, you ass! I'm working for Lady Silverhair.", "For Lady 
Silverhair, eh? Now that scares the shit out of me, Half-Elf. Go and bother 
somebody else!", "I'll be damned if that's not our freakish Half-Elf! Still 
pokin' your nose in other peoples business?", "Listen! Need we really go 
through all this crap again?", "You're getting on my nerves, Half-Elf. Go ahead 
then, ask your stupid questions.", "I don't li [...]
 
     def set_name (self, new_name):
         pass
@@ -54,6 +54,8 @@ class alek_start:
         self.color = the_npc.get_color()
         self.npc.append (5)
         self.cont.append (-1)
+        self.player.append (69)
+        self.cont.append (-1)
         self.player.append (23)
         self.cont.append (14)
         if not self.eavesdrop and quests["demo"].get_val 
("know_alek_eavesdrop"):
@@ -290,6 +292,9 @@ class alek_start:
         self.cont.append (20)
         self.player.append (-1)
 
+    def answer147 (self):
+        pass
+
     def answer56 (self):
         self.color = the_npc.get_color()
         self.npc.append (0)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 3e8578e..e555d70 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -1,6 +1,6 @@
 class erek_start:
     loop = []
-    strings = ["Before you stands a young Dwarf, with an open face and no sign 
of the traditional beard. His expression shows his intelligence and a trace of 
humor as he watches you expectantly.", "You are Erek Stonebreaker, aren't 
you?", "That I am. Erek Stonebreaker, aspirant to the trading business and 
Master Fingolsons apprentice. But I seem to not remember you, $fm 
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some 
questions.", "Well met then, $name. Only  [...]
+    strings = ["Before you stands a young Dwarf, with an open face and no sign 
of the traditional beard. His expression shows his intelligence and a trace of 
humor as he watches you expectantly.", "You are Erek Stonebreaker, aren't 
you?", "That I am. Erek Stonebreaker, aspirant to the trading business and 
Master Fingolsons apprentice. But I seem to not remember you, $fm 
{madam/sir}.", "I am $name.", "I am $name, Lady Silverhair's man. I have some 
questions.", "Well met then, $name. Only  [...]
 
     def set_name (self, new_name):
         pass
@@ -12,7 +12,7 @@ class erek_start:
         pass
 
     def __init__(self):
-        self.dialogue = [self.start, self.answer1, self.answer3, self.answer4, 
self.answer7, self.answer8, self.answer11, self.answer12, self.answer13, 
self.answer14, self.answer16, self.answer19, self.answer20, self.answer22, 
self.answer23, self.answer24, self.answer25, self.answer26, self.answer27, 
self.answer28, self.answer29, self.answer30, self.answer32, self.answer33, 
self.answer34, self.answer37, self.answer38, self.answer40, self.answer41, 
self.answer42, self.answer43, self.answe [...]
+        self.dialogue = [self.start, self.answer1, self.answer3, self.answer4, 
self.answer7, self.answer8, self.answer11, self.answer12, self.answer13, 
self.answer14, self.answer16, self.answer19, self.answer20, self.answer22, 
self.answer23, self.answer24, self.answer25, self.answer26, self.answer27, 
self.answer28, self.answer29, self.answer30, self.answer32, self.answer33, 
self.answer34, self.answer37, self.answer38, self.answer40, self.answer41, 
self.answer42, self.answer43, self.answe [...]
 
     def clear (self):
         del self.dialogue
@@ -86,6 +86,10 @@ class erek_start:
         self.cont.append (-1)
         self.player.append (48)
         self.cont.append (32)
+        if quests["demo"].get_val ("ask_packed_gems") == 1:
+
+            self.player.append (94)
+            self.cont.append (58)
         if quests["demo"].get_val ("bjarn_door_open") == 1:
 
             self.player.append (84)
@@ -102,6 +106,10 @@ class erek_start:
         self.cont.append (-1)
         self.player.append (48)
         self.cont.append (32)
+        if quests["demo"].get_val ("ask_packed_gems") == 1:
+
+            self.player.append (94)
+            self.cont.append (58)
         if quests["demo"].get_val ("bjarn_door_open") == 1:
 
             self.player.append (84)
@@ -188,6 +196,25 @@ class erek_start:
     def answer87 (self):
         pass
 
+    def answer191 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (95)
+        self.cont.append (-1)
+        self.player.append (96)
+        self.cont.append (59)
+        self.player.append (-1)
+
+    def answer195 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (97)
+        self.cont.append (-1)
+        self.player.append (98)
+        self.cont.append (-1)
+        self.player.append (-1)
+
+    def answer199 (self):
+        pass
+
     def answer48 (self):
         self.color = the_npc.get_color()
         self.npc.append (41)
@@ -386,6 +413,10 @@ class erek_start:
         self.cont.append (-1)
         self.player.append (48)
         self.cont.append (32)
+        if quests["demo"].get_val ("ask_packed_gems") == 1:
+
+            self.player.append (94)
+            self.cont.append (58)
         if quests["demo"].get_val ("bjarn_door_open") == 1:
 
             self.player.append (84)
@@ -413,6 +444,10 @@ class erek_start:
         self.cont.append (-1)
         self.player.append (48)
         self.cont.append (32)
+        if quests["demo"].get_val ("ask_packed_gems") == 1:
+
+            self.player.append (94)
+            self.cont.append (58)
         if quests["demo"].get_val ("bjarn_door_open") == 1:
 
             self.player.append (84)
diff --git a/scripts/dialogues/orloth_start.py 
b/scripts/dialogues/orloth_start.py
index 5add552..e3178fa 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -73,12 +73,14 @@ class orloth_start:
         self.color = the_npc.get_color()
         self.npc.append (41)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
         if quests["demo"].get_val ("complain_about_wastesedge") == 1:
 
             self.player.append (42)
             self.cont.append (28)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         if the_npc.get_val ("explain_events") == 0:
 
             self.player.append (45)
@@ -129,12 +131,14 @@ class orloth_start:
         self.cont.append (-1)
         self.player.append (80)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
         if quests["demo"].get_val ("complain_about_wastesedge") == 1:
 
             self.player.append (42)
             self.cont.append (28)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         self.player.append (-1)
 
     def answer80 (self):
@@ -270,12 +274,14 @@ class orloth_start:
         self.cont.append (-1)
         self.player.append (80)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
         if quests["demo"].get_val ("complain_about_wastesedge") == 1:
 
             self.player.append (42)
             self.cont.append (28)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         self.player.append (-1)
 
     def answer56 (self):
@@ -366,7 +372,7 @@ class orloth_start:
         self.cont.append (-1)
         self.player.append (111)
         self.cont.append (81)
-        if the_npc.get_val ("introduce_guests") == 0:
+        if self.introduce_guests == 0:
 
             self.player.append (112)
             self.cont.append (82)
@@ -376,7 +382,7 @@ class orloth_start:
         self.color = the_npc.get_color()
         self.npc.append (9)
         self.cont.append (7)
-        the_npc.set_val ("introduce_guests" , 1)
+        self.introduce_guests = 1
 
         self.player.append (-1)
 
@@ -402,10 +408,12 @@ class orloth_start:
         self.color = the_npc.get_color()
         self.npc.append (47)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
         self.player.append (30)
         self.cont.append (21)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
 
             self.player.append (43)
@@ -643,6 +651,14 @@ class orloth_start:
         self.cont.append (69)
         self.player.append (-1)
 
+    def answer46 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (9)
+        self.cont.append (7)
+        self.introduce_guests = 1
+
+        self.player.append (-1)
+
     def answer42 (self):
         self.color = the_npc.get_color()
         self.npc.append (37)
@@ -673,8 +689,10 @@ class orloth_start:
         self.cont.append (-1)
         self.player.append (80)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         if the_npc.get_val ("explain_events") == 1 and self.first_run != 1:
 
             self.player.append (43)
@@ -685,24 +703,18 @@ class orloth_start:
             self.cont.append (30)
         self.player.append (-1)
 
-    def answer46 (self):
-        self.color = the_npc.get_color()
-        self.npc.append (9)
-        self.cont.append (7)
-        the_npc.set_val ("introduce_guests" , 1)
-
-        self.player.append (-1)
-
     def answer40 (self):
         self.color = the_npc.get_color()
         self.npc.append (41)
         self.cont.append (-1)
-        self.player.append (46)
-        self.cont.append (31)
         if quests["demo"].get_val ("complain_about_wastesedge") == 1:
 
             self.player.append (42)
             self.cont.append (28)
+        if self.introduce_guests == 0:
+
+            self.player.append (46)
+            self.cont.append (31)
         if the_npc.get_val ("explain_events") == 0:
 
             self.player.append (45)
@@ -767,7 +779,7 @@ class orloth_start:
         self.color = the_npc.get_color()
         self.npc.append (9)
         self.cont.append (7)
-        the_npc.set_val ("introduce_guests" , 1)
+        self.introduce_guests = 1
 
         self.player.append (-1)