[adonthell-wastesedge-commits] Release_0-3-1 9cad88a 080/237: Some changes to the dialogues (shortened player answers, splitted long NPC answers, etc.)

[Kai Sterker]

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

    Some changes to the dialogues (shortened player answers, splitted long NPC 
answers, etc.)
---
 scripts/dialogues/erek_start.py       |    2 +-
 scripts/dialogues/frostbloom_start.py |  189 ++++++++++++++++++++++++++-------
 scripts/dialogues/lucia_start.py      |   28 +++--
 scripts/dialogues/orloth_start.py     |    2 +-
 scripts/schedules/orloth.py           |    4 +-
 5 files changed, 174 insertions(+), 51 deletions(-)

diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index f2e205c..37f4bae 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
diff --git a/scripts/dialogues/frostbloom_start.py 
b/scripts/dialogues/frostbloom_start.py
index 1adb5df..50d0d27 100755
--- a/scripts/dialogues/frostbloom_start.py
+++ b/scripts/dialogues/frostbloom_start.py
@@ -1,6 +1,6 @@
 class frostbloom_start:
     loop = []
-    strings = ["Hm?  What do you want?", "I am a servant of Lady Imoen 
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care 
what you wish to ask.  Now go away.  The Yeti of my soul must have silence.", 
"You again?  I thought I told you to leave me alone.", "But lady, I must ask 
you about the theft...", "The theft?  You mean your theft of my precious time, 
when I could be receiving inspiration?  I've lost enought of that already, 
thank you.  Now be gone, silly serv [...]
+    strings = ["Hm?  What do you want?", "I am a servant of Lady Imoen 
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care 
what you wish to ask.  Now go away.  The Yeti of my soul must have silence.", 
"You again?  I thought I told you to leave me alone.", "But lady, I must ask 
you about the theft...", "The theft?  You mean your theft of my precious time, 
when I could be receiving inspiration?  I've lost enought of that already, 
thank you.  Now be gone, silly serv [...]
 
     def set_name (self, new_name):
         pass
@@ -12,7 +12,7 @@ class frostbloom_start:
         pass
 
     def __init__(self):
-        self.dialogue = [self.start, self.answer1, self.answer4, self.answer6, 
self.answer8, self.answer9, self.answer12, self.answer14, self.answer16, 
self.answer19, self.answer21, None]
+        self.dialogue = [self.start, self.answer1, self.answer4, self.answer6, 
self.answer8, self.answer9, self.answer12, self.answer14, self.answer16, 
self.answer18, self.answer19, self.answer21, self.answer23, self.answer24, 
self.answer26, self.answer27, self.answer32, self.answer33, self.answer34, 
self.answer37, self.answer38, self.answer41, None]
 
     def clear (self):
         del self.dialogue
@@ -27,35 +27,91 @@ class frostbloom_start:
         self.dialogue[answer]()
 
     def start (self):
-        if the_npc.get_val ("spoken_to") == 0:
+        if the_npc.get_val ("flattered") == 1:
 
             self.color = characters["Rhayne Frostbloom"].get_color()
-            self.npc.append (0)
+            self.npc.append (35)
             self.cont.append (-1)
-            the_npc.set_val ("spoken_to" , 1)
+            self.player.append (26)
+            self.cont.append (14)
+            self.player.append (27)
+            self.cont.append (15)
+            self.player.append (-1)
+        if the_npc.get_val ("flattered") == 2:
 
-            self.player.append (1)
-            self.cont.append (1)
+            self.color = characters["Rhayne Frostbloom"].get_color()
+            self.npc.append (31)
+            self.cont.append (-1)
+            self.player.append (32)
+            self.cont.append (16)
+            self.player.append (33)
+            self.cont.append (17)
+            self.player.append (34)
+            self.cont.append (18)
             self.player.append (-1)
-        elif the_npc.get_val ("spoken_to") == 1:
+        if quests["demo"].get_val ("talked_about_yeti") == 1 and 
the_npc.get_val ("flattered") == 0:
 
             self.color = characters["Rhayne Frostbloom"].get_color()
-            self.npc.append (3)
+            self.npc.append (11)
             self.cont.append (-1)
-            the_npc.set_val ("spoken_to" , 2)
+            self.player.append (12)
+            self.cont.append (6)
+            self.player.append (-1)
+        if the_npc.get_val ("talked_to") == 1 and quests["demo"].get_val 
("talked_about_yeti") == 0:
 
+            self.color = characters["Rhayne Frostbloom"].get_color()
+            self.npc.append (3)
+            self.cont.append (-1)
             self.player.append (4)
             self.cont.append (2)
             self.player.append (-1)
-        else:
+        if the_npc.get_val ("talked_to") == 0:
 
             self.color = characters["Rhayne Frostbloom"].get_color()
-            self.npc.append (11)
+            self.npc.append (0)
             self.cont.append (-1)
-            self.player.append (12)
-            self.cont.append (6)
+            the_npc.set_val ("talked_to" , 1)
+
+            self.player.append (1)
+            self.cont.append (1)
             self.player.append (-1)
 
+    def answer1 (self):
+        self.color = characters["Rhayne Frostbloom"].get_color()
+        self.npc.append (2)
+        self.cont.append (-1)
+        self.player.append (-1)
+
+    def answer4 (self):
+        self.color = characters["Rhayne Frostbloom"].get_color()
+        self.npc.append (5)
+        self.cont.append (-1)
+        self.player.append (6)
+        self.cont.append (3)
+        self.player.append (8)
+        self.cont.append (4)
+        self.player.append (-1)
+
+    def answer8 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = 0
+        self.npc.append (9)
+        self.cont.append (5)
+        self.player.append (-1)
+
+    def answer9 (self):
+        self.set_npc ("Rhayne Frostbloom")
+        self.color = characters["Rhayne Frostbloom"].get_color()
+        self.npc.append (10)
+        self.cont.append (-1)
+        self.player.append (-1)
+
+    def answer6 (self):
+        self.color = characters["Rhayne Frostbloom"].get_color()
+        self.npc.append (7)
+        self.cont.append (-1)
+        self.player.append (-1)
+
     def answer12 (self):
         self.color = characters["Rhayne Frostbloom"].get_color()
         self.npc.append (13)
@@ -71,18 +127,41 @@ class frostbloom_start:
         self.npc.append (17)
         self.cont.append (-1)
         self.player.append (18)
+        self.cont.append (9)
+        self.player.append (23)
+        self.cont.append (12)
+        self.player.append (-1)
+
+    def answer23 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = 0
+        self.npc.append (24)
+        self.cont.append (13)
+        self.player.append (-1)
+
+    def answer24 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (25)
         self.cont.append (-1)
+        self.player.append (26)
+        self.cont.append (14)
+        self.player.append (27)
+        self.cont.append (15)
         self.player.append (-1)
 
     def answer18 (self):
-        pass
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (30)
+        self.cont.append (-1)
+        self.player.append (-1)
 
     def answer14 (self):
         self.color = characters["Rhayne Frostbloom"].get_color()
         self.npc.append (15)
         self.cont.append (-1)
         self.player.append (19)
-        self.cont.append (9)
+        self.cont.append (10)
         self.player.append (-1)
 
     def answer19 (self):
@@ -91,7 +170,7 @@ class frostbloom_start:
         self.npc.append (20)
         self.cont.append (-1)
         self.player.append (21)
-        self.cont.append (10)
+        self.cont.append (11)
         self.player.append (-1)
 
     def answer21 (self):
@@ -100,38 +179,72 @@ class frostbloom_start:
         self.cont.append (-1)
         self.player.append (-1)
 
-    def answer4 (self):
-        self.color = characters["Rhayne Frostbloom"].get_color()
-        self.npc.append (5)
+    def answer34 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (41)
+        self.cont.append (21)
+        self.player.append (-1)
+
+    def answer41 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (42)
         self.cont.append (-1)
-        self.player.append (6)
-        self.cont.append (3)
-        self.player.append (8)
-        self.cont.append (4)
         self.player.append (-1)
 
-    def answer8 (self):
+    def answer33 (self):
         self.set_npc (the_npc.get_name())
-        self.color = 0
-        self.npc.append (9)
-        self.cont.append (5)
+        self.color = the_npc.get_color()
+        self.npc.append (40)
+        self.cont.append (-1)
         self.player.append (-1)
 
-    def answer9 (self):
-        self.set_npc ("Rhayne Frostbloom")
-        self.color = characters["Rhayne Frostbloom"].get_color()
-        self.npc.append (10)
+    def answer32 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (36)
+        self.cont.append (-1)
+        self.player.append (37)
+        self.cont.append (19)
+        self.player.append (-1)
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (39)
         self.cont.append (-1)
         self.player.append (-1)
 
-    def answer6 (self):
-        self.color = characters["Rhayne Frostbloom"].get_color()
-        self.npc.append (7)
+    def answer37 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (38)
+        self.cont.append (20)
+        self.player.append (-1)
+
+    def answer38 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (43)
         self.cont.append (-1)
         self.player.append (-1)
 
-    def answer1 (self):
-        self.color = characters["Rhayne Frostbloom"].get_color()
-        self.npc.append (2)
+    def answer27 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (29)
         self.cont.append (-1)
+        the_npc.set_val ("flattered" , 2)
+
+        self.player.append (32)
+        self.cont.append (16)
+        self.player.append (33)
+        self.cont.append (17)
+        self.player.append (34)
+        self.cont.append (18)
+        self.player.append (-1)
+
+    def answer26 (self):
+        self.set_npc (the_npc.get_name())
+        self.color = the_npc.get_color()
+        self.npc.append (28)
+        self.cont.append (-1)
+        the_npc.set_val ("flattered" , 1)
+
         self.player.append (-1)
diff --git a/scripts/dialogues/lucia_start.py b/scripts/dialogues/lucia_start.py
index 9e47cfb..fe27aab 100755
--- a/scripts/dialogues/lucia_start.py
+++ b/scripts/dialogues/lucia_start.py
@@ -1,6 +1,6 @@
 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 do 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  [...]
+    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 do 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  [...]
 
     def set_name (self, new_name):
         pass
@@ -12,7 +12,7 @@ class lucia_start:
         pass
 
     def __init__(self):
-        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.answe [...]
+        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.answe [...]
 
     def clear (self):
         del self.dialogue
@@ -93,7 +93,7 @@ class lucia_start:
             self.cont.append (-1)
             self.player.append (18)
             self.cont.append (11)
-            if quests["demo"].get_val ("know_noise") != 0 and 
quests["demo"].get_val ("know_olivers_noise") == 0:
+            if quests["demo"].get_val ("know_noise") != 0:
 
                 self.player.append (84)
                 self.cont.append (51)
@@ -109,11 +109,15 @@ class lucia_start:
         self.cont.append (-1)
         self.player.append (69)
         self.cont.append (43)
+        if quests["demo"].get_val ("know_noise") != 0:
+
+            self.player.append (98)
+            self.cont.append (60)
         self.player.append (-1)
 
-    def answer69 (self):
+    def answer201 (self):
         self.color = the_npc.get_color()
-        self.npc.append (70)
+        self.npc.append (85)
         self.cont.append (-1)
         if quests["demo"].get_val ("know_talan_singing") == 0:
 
@@ -208,6 +212,12 @@ class lucia_start:
         self.cont.append (-1)
         self.player.append (-1)
 
+    def answer69 (self):
+        self.color = the_npc.get_color()
+        self.npc.append (70)
+        self.cont.append (-1)
+        self.player.append (-1)
+
     def answer84 (self):
         self.color = the_npc.get_color()
         self.npc.append (85)
@@ -333,7 +343,7 @@ class lucia_start:
         self.cont.append (-1)
         self.player.append (56)
         self.cont.append (36)
-        if quests["demo"].get_val ("know_noise") != 0 and 
quests["demo"].get_val ("know_olivers_noise") == 0:
+        if quests["demo"].get_val ("know_noise") != 0:
 
             self.player.append (84)
             self.cont.append (51)
@@ -417,7 +427,7 @@ class lucia_start:
         self.cont.append (-1)
         self.player.append (65)
         self.cont.append (41)
-        if quests["demo"].get_val ("know_noise") != 0 and 
quests["demo"].get_val ("know_olivers_noise") == 0:
+        if quests["demo"].get_val ("know_noise") != 0:
 
             self.player.append (84)
             self.cont.append (51)
@@ -453,7 +463,7 @@ class lucia_start:
             self.cont.append (-1)
             self.player.append (18)
             self.cont.append (11)
-            if quests["demo"].get_val ("know_noise") != 0 and 
quests["demo"].get_val ("know_olivers_noise") == 0:
+            if quests["demo"].get_val ("know_noise") != 0:
 
                 self.player.append (84)
                 self.cont.append (51)
@@ -572,7 +582,7 @@ class lucia_start:
             self.cont.append (-1)
             self.player.append (18)
             self.cont.append (11)
-            if quests["demo"].get_val ("know_noise") != 0 and 
quests["demo"].get_val ("know_olivers_noise") == 0:
+            if quests["demo"].get_val ("know_noise") != 0:
 
                 self.player.append (84)
                 self.cont.append (51)
diff --git a/scripts/dialogues/orloth_start.py 
b/scripts/dialogues/orloth_start.py
index f4c5513..b8b2846 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -1,6 +1,6 @@
 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 though 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. Although, I fear, this is no longer granted for sure. 
You've chosen troublesome times fo [...]
+    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 though 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. Although, I fear, this is no longer granted for sure. 
You've chosen troublesome times fo [...]
 
     def set_name (self, new_name):
         pass
diff --git a/scripts/schedules/orloth.py b/scripts/schedules/orloth.py
index 5cdf638..4499c49 100755
--- a/scripts/schedules/orloth.py
+++ b/scripts/schedules/orloth.py
@@ -39,6 +39,8 @@ if todo == 0:
     if delay == 0:
         myself.set_val ("todo", 1)
     else:
+        myself.set_val ("delay", delay - 1)
+
         # -- put/take the first mug
         if delay == 100:
             index = myself.get_val ("table_num")
@@ -66,8 +68,6 @@ if todo == 0:
                 else:
                     map_engine.get_landmap ().remove_mapobject (1,x,y,107)
 
-        myself.set_val ("delay", delay - 1)
-
 # -- engage a new movement
 elif todo == 1:
     # -- when we are at the bar, then wait a while before