[adonthell-wastesedge-commits] Release_0-3-1 d304dc6 069/237: Updated Orloth's and Erek's dialogue

[Kai Sterker]

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

    Updated Orloth's and Erek's dialogue
---
 scripts/dialogues/erek_start.py |   16 +++++++++++-----
 scripts/schedules/oliver.py     |    8 +++++---
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index e555d70..a75abc4 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
@@ -196,7 +196,7 @@ class erek_start:
     def answer87 (self):
         pass
 
-    def answer191 (self):
+    def answer94 (self):
         self.color = the_npc.get_color()
         self.npc.append (95)
         self.cont.append (-1)
@@ -204,7 +204,7 @@ class erek_start:
         self.cont.append (59)
         self.player.append (-1)
 
-    def answer195 (self):
+    def answer96 (self):
         self.color = the_npc.get_color()
         self.npc.append (97)
         self.cont.append (-1)
@@ -212,7 +212,7 @@ class erek_start:
         self.cont.append (-1)
         self.player.append (-1)
 
-    def answer199 (self):
+    def answer98 (self):
         pass
 
     def answer48 (self):
@@ -534,6 +534,12 @@ class erek_start:
 
     def answer20 (self):
         self.color = the_npc.get_color()
+        self.npc.append (99)
+        self.cont.append (60)
+        self.player.append (-1)
+
+    def answer204 (self):
+        self.color = the_npc.get_color()
         self.npc.append (21)
         self.cont.append (-1)
         quests["demo"].set_val ("know_alek_eavesdrop" , 1)
diff --git a/scripts/schedules/oliver.py b/scripts/schedules/oliver.py
index 2bae077..351e55d 100755
--- a/scripts/schedules/oliver.py
+++ b/scripts/schedules/oliver.py
@@ -50,21 +50,23 @@ elif myself.get_val ("goto_players_room") == 3:
 # -- leave the player's room and goto the barn
 elif myself.get_val ("goto_barn") == 1:
     location = myself.submap ()
+    myself.set_val ("goto_barn", 2)
 
     # -- Player's room
     if location == 12:
         myself.set_goal (5, 1, NO_MOVE)
-        myself.set_val ("goto_barn", 2)
 
     # -- First floor
     elif location == 9:
         myself.set_goal (8, 1, NO_MOVE)
-        myself.set_val ("goto_barn", 2)
+
+    # -- Second floor (this shouldn't happen, but it once did ...)
+    elif location == 14:
+        myself.set_goal (4, 1, NO_MOVE)
 
     # -- Common Room
     elif location == 1:
         myself.set_goal (13, 8, NO_MOVE)
-        myself.set_val ("goto_barn", 2)
 
     # -- Yard, our final goal (for now)
     elif location == 0: