[adonthell-wastesedge-commits] Release_0-3-1 7e2a6c6 157/237: FIXED some bugs

[Kai Sterker]

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

    FIXED some bugs
---
 scripts/dialogues/jelom_2nd.py     |    4 +-
 scripts/dialogues/orloth_start.py  |    6 +--
 scripts/dialogues/talan_start.py   |   10 ++--
 scripts/dialogues/tristan_start.py |   95 ++++++++++++++++++++++++++++++------
 scripts/init.py                    |    1 +
 5 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index f0c5cc7..3f50c01 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -120,12 +120,14 @@ class jelom_2nd:
                self.player.append (-1)
 
        def answer34 (self):
-               self.color = self.the_npc.get_color()
+               self.set_npc ("Erek Stonebreaker")
+               self.color = adonthell.gamedata_get_character("Erek 
Stonebreaker").get_color()
                self.npc.append (35)
                self.cont.append (21)
                self.player.append (-1)
 
        def answer35 (self):
+               self.set_npc (self.the_npc.get_id())
                self.color = self.the_npc.get_color()
                self.npc.append (36)
                self.cont.append (-1)
diff --git a/scripts/dialogues/orloth_start.py 
b/scripts/dialogues/orloth_start.py
index aa157b1..22e3f35 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 class orloth_start:
        loop = []
-       strings = ["This is seemingly the Innkeeper and owner of the place. He 
appears to be lost in thought and from his eyes you can see that he hasn't 
slept much lately. His worried face brightens up as you approach, and his voice 
is warm and friendly:", "Welcome to Waste's Edge, traveller. Here you shall 
find the pleasures of a hot meal and bath if you desire. And safe and 
comfortable lodging.", "But excuse me sir, I talk and talk and haven't even 
introduced myself. Orloth's the name, sir.  [...]
+       strings = ["This appears to be the Innkeeper and owner of the place. He 
seems lost in thought and it looks as if he hasn't slept much lately. His 
worried face brightens up as you approach though, and his voice is warm and 
friendly:", "Welcome to Waste's Edge, traveller. Here you shall find the 
pleasures of a hot meal and bath if you desire. And safe and comfortable 
lodging.", "But excuse me sir, I talk and talk and haven't even introduced 
myself. Orloth's the name, sir. Orloth Redwyne,  [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class orloth_start:
                self.the_player = p
                self.the_npc = n
 
-               self.dialogue = [self.start, self.answer0, self.answer1, 
self.answer3, self.answer4, self.answer6, self.answer7, self.answer9, 
self.answer10, self.answer11, self.answer13, self.answer15, self.answer16, 
self.answer17, self.answer18, self.answer20, self.answer21, self.answer22, 
self.answer24, self.answer28, self.answer29, self.answer30, self.answer32, 
self.answer33, self.answer35, self.answer37, self.answer38, self.answer40, 
self.answer42, self.answer43, self.answer45, self.answer46, sel [...]
+               self.dialogue = [self.start, self.answer0, self.answer1, 
self.answer3, self.answer4, self.answer6, self.answer7, self.answer9, 
self.answer10, self.answer11, self.answer13, self.answer15, self.answer16, 
self.answer17, self.answer18, self.answer20, self.answer21, self.answer22, 
self.answer24, self.answer28, self.answer29, self.answer30, self.answer32, 
self.answer33, self.answer35, self.answer37, self.answer38, self.answer40, 
self.answer42, self.answer43, self.answer45, self.answer46, sel [...]
 
        def clear (self):
                del self.dialogue
@@ -746,7 +746,7 @@ class orloth_start:
                        self.cont.append (29)
                self.player.append (-1)
 
-       def answer257 (self):
+       def answer118 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (41)
                self.cont.append (-1)
diff --git a/scripts/dialogues/talan_start.py b/scripts/dialogues/talan_start.py
index 3f67ecb..ec99c12 100755
--- a/scripts/dialogues/talan_start.py
+++ b/scripts/dialogues/talan_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 class talan_start:
        loop = []
-       strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about 
that fuss at the gate. I hope you will not hold it against me.", "Please do not 
mention it again. I assure you that I hold no grudge against you.", "Oh... 
that. Yes, how may I help you?", "Hello, Talan. Look, I have a couple more 
questions about the theft.", "In the morning, of course, I heard that Master 
Fingolson's gems had been stolen and that Lady Silverhair was suspected of the 
theft.", "So you did not see or he [...]
+       strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about 
that fuss at the gate. I hope you will not hold it against me.", "Please do not 
mention it again. I assure you that I hold no grudge against you.", "Oh... 
that. Yes, how may I help you?", "Hello, Talan. Look, I have a couple more 
questions about the theft.", "In the morning, of course, I heard that Master 
Fingolson's gems had been stolen and that Lady Silverhair was suspected of the 
theft.", "So you did not see or he [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class talan_start:
                self.the_player = p
                self.the_npc = n
 
-               self.dialogue = [self.start, self.answer2, self.answer4, 
self.answer6, self.answer7, self.answer10, self.answer11, self.answer13, 
self.answer15, self.answer18, self.answer20, self.answer23, self.answer25, 
self.answer27, self.answer28, self.answer29, self.answer31, self.answer32, 
self.answer35, self.answer36, self.answer39, self.answer44, self.answer49, 
self.answer50, self.answer51, self.answer54, self.answer55, self.answer56, 
self.answer57, self.answer58, self.answer60, self.answer61,  [...]
+               self.dialogue = [self.start, self.answer2, self.answer4, 
self.answer6, self.answer7, self.answer10, self.answer11, self.answer13, 
self.answer15, self.answer18, self.answer20, self.answer23, self.answer25, 
self.answer27, self.answer28, self.answer29, self.answer31, self.answer32, 
self.answer35, self.answer36, self.answer39, self.answer44, self.answer49, 
self.answer50, self.answer51, self.answer54, self.answer55, self.answer56, 
self.answer57, self.answer58, self.answer60, self.answer61,  [...]
 
        def clear (self):
                del self.dialogue
@@ -161,7 +161,7 @@ class talan_start:
        def answer9 (self):
                pass
 
-       def answer162 (self):
+       def answer75 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (24)
                self.cont.append (-1)
@@ -329,7 +329,7 @@ class talan_start:
                self.cont.append (16)
                self.player.append (-1)
 
-       def answer165 (self):
+       def answer76 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (7)
                self.cont.append (4)
@@ -484,7 +484,7 @@ class talan_start:
                self.cont.append (39)
                self.player.append (-1)
 
-       def answer159 (self):
+       def answer74 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (72)
                self.cont.append (38)
diff --git a/scripts/dialogues/tristan_start.py 
b/scripts/dialogues/tristan_start.py
index 077615d..faf6946 100644
--- a/scripts/dialogues/tristan_start.py
+++ b/scripts/dialogues/tristan_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 class tristan_start:
        loop = []
-       strings = ["Yes?", "Hello, sir. My name is $name, and I am 
investigating the theft of Master Fingolson's gems.", "Oh, well met then, 
$name! I am Tristan Illig, a merchant by trade, and I am currently stuck in 
this trading post until this theft is cleared up. And you are the man who will 
do it?", "Well, good sir, I certainly will try. Now, do you mind if I ask you a 
couple of questions?", "Well, $name, I would like to be of help, but I am 
afraid that I know nothing that will aid you. You [...]
+       strings = ["Yes?", "Hello, sir. My name is $name, and I am 
investigating the theft of Master Fingolson's gems.", "Well met then, $name! I 
am Tristan Illig, a merchant by trade, and currently stuck here at the Redwyne 
Inn until this business is cleared up. So may I suggest to continue your 
investigation.", "Well, good sir, I certainly will try. Now, do you mind if I 
ask you a couple of questions?", "Well, $name, I would like to be of help, but 
I am afraid that I know nothing that will ai [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class tristan_start:
                self.the_player = p
                self.the_npc = n
 
-               self.dialogue = [self.start, self.answer1, self.answer3, 
self.answer5, self.answer8, self.answer10, None]
+               self.dialogue = [self.start, self.answer1, self.answer5, 
self.answer6, self.answer8, self.answer9, self.answer12, self.answer25, 
self.answer28, self.answer30, self.answer31, self.answer34, self.answer37, None]
 
        def clear (self):
                del self.dialogue
@@ -32,57 +32,120 @@ class tristan_start:
                self.dialogue[answer]()
 
        def start (self):
+               self.color = 0
+               self.npc.append (12)
+               self.cont.append (6)
+               self.player.append (-1)
+
+       def answer12 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (0)
                self.cont.append (-1)
-               self.player.append (1)
-               self.cont.append (1)
+               if adonthell.gamedata_get_quest("demo").get_val 
("know_argument") == 1:
+
+                       self.player.append (1)
+                       self.cont.append (1)
+               else:
+
+                       self.player.append (13)
+                       self.cont.append (-1)
                self.player.append (-1)
 
+       def answer23 (self):
+               pass
+
        def answer1 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (2)
                self.cont.append (-1)
                self.player.append (3)
-               self.cont.append (2)
+               self.cont.append (-1)
+               self.player.append (14)
+               self.cont.append (7)
                self.player.append (-1)
 
-       def answer3 (self):
+       def answer25 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (4)
                self.cont.append (-1)
                self.player.append (5)
-               self.cont.append (3)
+               self.cont.append (2)
+               self.player.append (15)
+               self.cont.append (8)
                self.player.append (-1)
 
-       def answer5 (self):
+       def answer28 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (6)
+               self.npc.append (16)
+               self.cont.append (9)
+               self.player.append (-1)
+
+       def answer30 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (17)
+               self.cont.append (10)
+               self.player.append (-1)
+
+       def answer31 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (18)
+               self.cont.append (11)
+               self.player.append (-1)
+
+       def answer34 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (21)
                self.cont.append (-1)
                self.player.append (7)
                self.cont.append (-1)
-               self.player.append (8)
+               self.player.append (20)
+               self.cont.append (12)
+               self.player.append (19)
+               self.cont.append (-1)
+               self.player.append (-1)
+
+       def answer36 (self):
+               pass
+
+       def answer37 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (8)
                self.cont.append (4)
                self.player.append (-1)
 
        def answer8 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (9)
+               self.npc.append (22)
                self.cont.append (-1)
-               self.player.append (10)
+               self.player.append (9)
                self.cont.append (5)
                self.player.append (-1)
 
-       def answer10 (self):
+       def answer9 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (11)
+               self.npc.append (10)
                self.cont.append (-1)
-               self.player.append (12)
+               self.player.append (11)
                self.cont.append (-1)
                self.player.append (-1)
 
-       def answer12 (self):
+       def answer11 (self):
                pass
 
        def answer7 (self):
                pass
+
+       def answer5 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (6)
+               self.cont.append (3)
+               self.player.append (-1)
+
+       def answer6 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (17)
+               self.cont.append (10)
+               self.player.append (-1)
+
+       def answer3 (self):
+               pass
diff --git a/scripts/init.py b/scripts/init.py
index 8761e27..101b0e6 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -916,6 +916,7 @@ class title_screen:
         jelom.jump_to (9, 2, 6)
         jelom.set_action ("talk")
         jelom.stand_north ()
+        jelom.set_color (5)
         jelom.set_schedule ("jelom")
         jelom.set_portrait ("jelom.pnm")