[adonthell-wastesedge-commits] Release_0-3-1 30df91a 158/237: FINISHED Tristan

[Kai Sterker]

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

    FINISHED Tristan
---
 scripts/dialogues/lucia_start.py   |   10 ++-
 scripts/dialogues/orloth_start.py  |   10 ++-
 scripts/dialogues/tristan_start.py |  169 +++++++++++++++++++++++-------------
 3 files changed, 124 insertions(+), 65 deletions(-)

diff --git a/scripts/dialogues/lucia_start.py b/scripts/dialogues/lucia_start.py
index 0f7d8a3..12bde89 100755
--- a/scripts/dialogues/lucia_start.py
+++ b/scripts/dialogues/lucia_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 class lucia_start:
        loop = []
-       strings = ["There is little doubt that this busy-looking woman is the 
unchallenged mistress of the Redwyne household. As she spots you, a look of 
resignation flashes across her face.", "You young people never learn to keep 
out of my kitchen, do you?", "Sorry madam, I did not mean to trespass, but I 
need to talk to you.", "I have no time for this, woman! I have some questions 
for you.", "What questions? Don't you see I'm busy? Who's going to put the food 
on the table, if I'm going to cha [...]
+       strings = ["There is little doubt that this busy-looking woman is the 
unchallenged mistress of the Redwyne household. As she spots you, a look of 
resignation flashes across her face.", "You young people never learn to keep 
out of my kitchen, do you?", "Sorry madam, I did not mean to trespass, but I 
need to talk to you.", "I have no time for this, woman! I have some questions 
for you.", "What questions? Don't you see I'm busy? Who's going to put the food 
on the table, if I'm going to cha [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class lucia_start:
                self.the_player = p
                self.the_npc = n
 
-               self.dialogue = [self.start, self.answer0, self.answer2, 
self.answer3, self.answer6, self.answer8, self.answer10, self.answer11, 
self.answer13, self.answer15, self.answer16, self.answer18, self.answer19, 
self.answer21, self.answer22, self.answer23, self.answer24, self.answer25, 
self.answer27, self.answer29, self.answer30, self.answer32, self.answer33, 
self.answer35, self.answer36, self.answer38, self.answer40, self.answer41, 
self.answer42, self.answer44, self.answer46, self.answer48, s [...]
+               self.dialogue = [self.start, self.answer0, self.answer2, 
self.answer3, self.answer6, self.answer8, self.answer10, self.answer11, 
self.answer13, self.answer15, self.answer16, self.answer18, self.answer19, 
self.answer21, self.answer22, self.answer23, self.answer24, self.answer25, 
self.answer27, self.answer29, self.answer30, self.answer32, self.answer33, 
self.answer35, self.answer36, self.answer38, self.answer40, self.answer41, 
self.answer42, self.answer44, self.answer46, self.answer48, s [...]
 
        def clear (self):
                del self.dialogue
@@ -410,6 +410,12 @@ class lucia_start:
 
        def answer61 (self):
                self.color = self.the_npc.get_color()
+               self.npc.append (102)
+               self.cont.append (63)
+               self.player.append (-1)
+
+       def answer211 (self):
+               self.color = self.the_npc.get_color()
                self.npc.append (62)
                self.cont.append (40)
                self.player.append (-1)
diff --git a/scripts/dialogues/orloth_start.py 
b/scripts/dialogues/orloth_start.py
index 22e3f35..35eab82 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 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,  [...]
+       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
@@ -700,6 +700,12 @@ class orloth_start:
 
        def answer73 (self):
                self.color = self.the_npc.get_color()
+               self.npc.append (119)
+               self.cont.append (89)
+               self.player.append (-1)
+
+       def answer262 (self):
+               self.color = self.the_npc.get_color()
                self.npc.append (74)
                self.cont.append (55)
                self.player.append (-1)
diff --git a/scripts/dialogues/tristan_start.py 
b/scripts/dialogues/tristan_start.py
index faf6946..51de3cf 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.", "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 [...]
+       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 ask you to continue your 
investigation?", "Well, $name, I would like to be of help, but I am afraid that 
I know nothing that will aid you. Your time would be better spent talking to 
those who are involved, I would imagine.", " [...]
 
        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.answer5, 
self.answer6, self.answer8, self.answer9, self.answer12, self.answer25, 
self.answer28, self.answer30, self.answer31, self.answer34, self.answer37, None]
+               self.dialogue = [self.start, self.answer1, self.answer4, 
self.answer5, self.answer7, self.answer8, self.answer10, self.answer11, 
self.answer12, self.answer13, self.answer14, self.answer15, self.answer16, 
self.answer17, self.answer18, self.answer22, self.answer23, self.answer53, 
self.answer59, None]
 
        def clear (self):
                del self.dialogue
@@ -32,12 +32,22 @@ class tristan_start:
                self.dialogue[answer]()
 
        def start (self):
-               self.color = 0
-               self.npc.append (12)
-               self.cont.append (6)
-               self.player.append (-1)
+               if self.the_npc.get_val ("talked_to") == 1:
 
-       def answer12 (self):
+                       self.color = 0
+                       self.npc.append (25)
+                       self.cont.append (17)
+                       self.player.append (-1)
+               else:
+
+                       self.color = 0
+                       self.npc.append (10)
+                       self.cont.append (6)
+                       self.the_npc.set_val ("talked_to" , 1)
+
+                       self.player.append (-1)
+
+       def answer10 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (0)
                self.cont.append (-1)
@@ -47,105 +57,142 @@ class tristan_start:
                        self.cont.append (1)
                else:
 
-                       self.player.append (13)
-                       self.cont.append (-1)
+                       self.player.append (11)
+                       self.cont.append (7)
+               self.player.append (-1)
+
+       def answer11 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (21)
+               self.cont.append (-1)
+               self.player.append (22)
+               self.cont.append (15)
+               self.player.append (6)
+               self.cont.append (-1)
+               self.player.append (-1)
+
+       def answer6 (self):
+               pass
+
+       def answer22 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (23)
+               self.cont.append (16)
                self.player.append (-1)
 
        def answer23 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (26)
+               self.cont.append (-1)
+               self.player.append (27)
+               self.cont.append (18)
+               self.player.append (-1)
+
+       def answer59 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (7)
+               self.cont.append (4)
+               self.player.append (-1)
+
+       def answer7 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (20)
+               self.cont.append (-1)
+               self.player.append (8)
+               self.cont.append (5)
+               self.player.append (24)
+               self.cont.append (-1)
+               self.player.append (-1)
+
+       def answer51 (self):
                pass
 
-       def answer1 (self):
+       def answer8 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (2)
+               self.npc.append (9)
                self.cont.append (-1)
-               self.player.append (3)
+               self.player.append (24)
                self.cont.append (-1)
-               self.player.append (14)
-               self.cont.append (7)
                self.player.append (-1)
 
-       def answer25 (self):
+       def answer1 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (4)
+               self.npc.append (2)
                self.cont.append (-1)
-               self.player.append (5)
-               self.cont.append (2)
-               self.player.append (15)
+               self.player.append (6)
+               self.cont.append (-1)
+               self.player.append (12)
                self.cont.append (8)
                self.player.append (-1)
 
-       def answer28 (self):
+       def answer12 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (16)
+               self.npc.append (3)
+               self.cont.append (-1)
+               self.player.append (4)
+               self.cont.append (2)
+               self.player.append (13)
                self.cont.append (9)
                self.player.append (-1)
 
-       def answer30 (self):
+       def answer13 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (17)
+               self.npc.append (14)
                self.cont.append (10)
                self.player.append (-1)
 
-       def answer31 (self):
+       def answer14 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (18)
+               self.npc.append (15)
                self.cont.append (11)
                self.player.append (-1)
 
-       def answer34 (self):
+       def answer15 (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 (20)
+               self.npc.append (16)
                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):
+       def answer16 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (22)
+               self.npc.append (19)
                self.cont.append (-1)
-               self.player.append (9)
-               self.cont.append (5)
+               self.player.append (6)
+               self.cont.append (-1)
+               self.player.append (18)
+               self.cont.append (14)
+               self.player.append (17)
+               self.cont.append (13)
                self.player.append (-1)
 
-       def answer9 (self):
+       def answer17 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (10)
+               self.npc.append (9)
                self.cont.append (-1)
-               self.player.append (11)
+               self.player.append (24)
                self.cont.append (-1)
                self.player.append (-1)
 
-       def answer11 (self):
-               pass
-
-       def answer7 (self):
-               pass
+       def answer18 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (7)
+               self.cont.append (4)
+               self.player.append (-1)
 
-       def answer5 (self):
+       def answer4 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (6)
+               self.npc.append (5)
                self.cont.append (3)
                self.player.append (-1)
 
-       def answer6 (self):
+       def answer5 (self):
                self.color = self.the_npc.get_color()
-               self.npc.append (17)
-               self.cont.append (10)
+               self.npc.append (15)
+               self.cont.append (11)
                self.player.append (-1)
 
-       def answer3 (self):
-               pass
+       def answer53 (self):
+               self.color = self.the_npc.get_color()
+               self.npc.append (5)
+               self.cont.append (3)
+               self.player.append (-1)