[adonthell-wastesedge-commits] Release_0-3-1 e7e6e03 121/237: ADDED script to get all character's to Bjarn's room

[Kai Sterker]

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

    ADDED script to get all character's to Bjarn's room
    FIXED some spelling errors
---
 scripts/dialogues/Makefile.am               |    2 +-
 scripts/dialogues/erek_start.py             |   23 ++++++++++---------
 scripts/dialogues/jelom_2nd.py              |   32 +++++++++++++++++++++++++++
 scripts/schedules/mapcharacters/Makefile.am |    2 +-
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/scripts/dialogues/Makefile.am b/scripts/dialogues/Makefile.am
index 67a42f8..da196c2 100755
--- a/scripts/dialogues/Makefile.am
+++ b/scripts/dialogues/Makefile.am
@@ -3,7 +3,7 @@ pkgdatadir = $(gamedatadir)/scripts/dialogues
 pkgdata_DATA = orloth_start.py lucia_start.py sarin_start.py \
     janesta_start.py erek_start.py oliver_start.py bjarn_start.py \
     frostbloom_start.py talan_start.py alek_start.py jelom_start.py \
-    tristan_start.py
+    tristan_start.py jelom_2nd.py
 
 EXTRA_DIST = $(pkgdata_DATA)
 
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 111cf90..1203822 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -2,7 +2,7 @@ import adonthell
 
 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 I f [...]
+       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 I f [...]
 
        def set_name (self, new_name):
                pass
@@ -17,7 +17,7 @@ class erek_start:
                self.the_player = p
                self.the_npc = n
 
-               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.answer45, s [...]
+               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.answer45, s [...]
 
        def clear (self):
                del self.dialogue
@@ -86,7 +86,7 @@ class erek_start:
 
                        self.color = 0
                        self.npc.append (112)
-                       self.cont.append (70)
+                       self.cont.append (71)
                        self.the_npc.set_val ("apologize" , 0)
 
                        self.player.append (-1)
@@ -96,13 +96,13 @@ class erek_start:
                self.npc.append (113)
                self.cont.append (-1)
                self.player.append (115)
-               self.cont.append (72)
+               self.cont.append (73)
                self.player.append (-1)
 
        def answer115 (self):
                self.color = self.the_npc.get_color()
                self.npc.append (114)
-               self.cont.append (71)
+               self.cont.append (72)
                self.player.append (-1)
 
        def answer114 (self):
@@ -129,13 +129,16 @@ class erek_start:
                if adonthell.gamedata_get_quest("demo").get_val 
("convince_jelom") == 1:
 
                        self.player.append (105)
-                       self.cont.append (-1)
+                       self.cont.append (67)
                self.player.append (-1)
 
        def answer105 (self):
                adonthell.gamedata_get_quest("demo").set_val ("convince_jelom" 
, 2)
 
-               pass
+               self.color = self.the_npc.get_color()
+               self.npc.append (117)
+               self.cont.append (-1)
+               self.player.append (-1)
 
        def answer106 (self):
                pass
@@ -267,7 +270,7 @@ class erek_start:
                if adonthell.gamedata_get_quest("demo").get_val ("have_gem") == 
1:
 
                        self.player.append (111)
-                       self.cont.append (69)
+                       self.cont.append (70)
                if adonthell.gamedata_get_quest("demo").get_val 
("bjarn_door_open") == 1:
 
                        self.player.append (81)
@@ -404,9 +407,9 @@ class erek_start:
                self.npc.append (107)
                self.cont.append (-1)
                self.player.append (108)
-               self.cont.append (67)
-               self.player.append (109)
                self.cont.append (68)
+               self.player.append (109)
+               self.cont.append (69)
                self.player.append (-1)
 
        def answer109 (self):
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index e4c42b5..a32b22f 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -22,6 +22,35 @@ class jelom_2nd:
        def clear (self):
                del self.dialogue
 
+       def __del__(self):
+           if adonthell.gamedata_get_quest("demo").get_val ("the_end") == 1:
+               # make all dudes go down to Bjarn
+               shair = adonthell.gamedata_get_character("Imoen Silverhair")
+               shair.set_schedule ("to_cellar")
+               shair.set_val ("delay", 5)
+       
+               jelom = adonthell.gamedata_get_character("Jelom Rasgar")
+               jelom.set_val ("delay", 20)
+               jelom.set_schedule ("to_cellar")
+                       
+               player = adonthell.gamedata_player ()
+               player.set_val ("delay", 35)
+               player.set_schedule ("to_cellar")
+                       
+               erek = adonthell.gamedata_get_character("Erek Stonebreaker")
+               erek.set_schedule ("to_cellar")
+               erek.set_val ("delay", 45)
+                       
+               fnir = adonthell.gamedata_get_character("Fellnir Kezular")
+               fnir.set_schedule ("to_cellar")
+               fnir.set_val ("delay", 130)
+                       
+               illig = adonthell.gamedata_get_character("Tristan Illig")
+               illig.set_schedule ("to_cellar")
+               illig.set_val ("delay", 300)
+       
+
+
        def __getattr__ (self, name):
                return 0
 
@@ -113,6 +142,9 @@ class jelom_2nd:
                self.color = self.the_npc.get_color()
                self.npc.append (36)
                self.cont.append (-1)
+               # make all dudes go down to Bjarn
+               adonthell.gamedata_get_quest("demo").set_val ("the_end" , 1)
+
                self.player.append (-1)
 
        def answer31 (self):
diff --git a/scripts/schedules/mapcharacters/Makefile.am 
b/scripts/schedules/mapcharacters/Makefile.am
index c305d5d..31ffbdd 100644
--- a/scripts/schedules/mapcharacters/Makefile.am
+++ b/scripts/schedules/mapcharacters/Makefile.am
@@ -2,6 +2,6 @@ pkgdatadir = $(gamedatadir)/scripts/schedules/mapcharacters
 
 pkgdata_DATA = alek.py erek.py frostbloom.py janesta.py jelom.py \
        keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
-       talan.py tristan.py fellnir.py
+       talan.py tristan.py fellnir.py to_cellar.py
 
 EXTRA_DIST = $(pkgdata_DATA)