[adonthell-wastesedge-commits] Release_0-3-1 b1a1e7a 154/237: ADDED extro dialogue

[Kai Sterker]

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

    ADDED extro dialogue
    FIXED Jelom's dialogue
    NEW Delete $gamedir before installing the data
---
 Makefile.am                                  |    7 +-
 scripts/dialogues/Makefile.am                |    5 +-
 scripts/dialogues/extro.py                   |  185 ++++++++++++++++++++++++++
 scripts/dialogues/jelom_2nd.py               |   10 +-
 scripts/schedules/mapcharacters/to_cellar.py |    6 +-
 5 files changed, 202 insertions(+), 11 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3274b31..a9f4d1f 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = audio gfx maps scripts 
+SUBDIRS = . audio gfx maps scripts 
 
 pkgdatadir = $(gamedatadir)
 
@@ -8,10 +8,13 @@ EXTRA_DIST = $(pkgdata_DATA)
 
 bin_SCRIPTS = adonthell-wastesedge
 
+# -- clean game directory before installing
+install-exec-local:
+       rm -Rf $(gamedatadir)
 
 adonthell-wastesedge:
        echo -e "#!/bin/sh\n\n$(adonthell_binary) wastesedge" > 
adonthell-wastesedge
 
-## Be sure the data directory gets deleted
+# -- make sure the data directory gets deleted
 uninstall-local:
        rm -Rf $(gamedatadir)
diff --git a/scripts/dialogues/Makefile.am b/scripts/dialogues/Makefile.am
index f45f127..2fb9b07 100755
--- a/scripts/dialogues/Makefile.am
+++ b/scripts/dialogues/Makefile.am
@@ -5,12 +5,11 @@ pkgdata_DATA = *.pyc
 EXTRA_DIST = 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 jelom_2nd.py demo_intro_1.py
+    tristan_start.py jelom_2nd.py demo_intro_1.py extro.py
 
 all:
        $(adonthell_binary) -c
 
 *.pyc: *.py
 
-clean:
-       rm -f *.pyc
+CLEANFILES = *.pyc
diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
new file mode 100644
index 0000000..30baac2
--- /dev/null
+++ b/scripts/dialogues/extro.py
@@ -0,0 +1,185 @@
+import adonthell
+
+class extro:
+       loop = []
+       strings = ["What is going on here? What are all these people doing in 
my room? Are you behind this, Half-Elf? I demand an explanation!", "Please calm 
down Master Fingolson. We are here to sort out this business once and for 
all.", "Sort this business out? Good ... good! It's about time, I'd say! So ... 
will that foul Elf finally return my Catseyes? I hear one was found amongst her 
belongings. And where there is one, the others shouldn't be far.", "I fear you 
are mistaken my good Dwarf.  [...]
+
+       def set_name (self, new_name):
+               pass
+
+       def set_npc (self, new_npc):
+               pass
+
+       def set_portrait (self, new_portrait):
+               pass
+
+       def __init__(self, p, n):
+               self.the_player = p
+               self.the_npc = n
+
+               self.dialogue = [self.start, self.answer0, self.answer1, 
self.answer2, self.answer3, self.answer4, self.answer8, self.answer11, 
self.answer12, self.answer13, self.answer14, self.answer15, self.answer16, 
self.answer17, self.answer19, self.answer21, self.answer23, None]
+
+       def clear (self):
+               del self.dialogue
+
+       def __getattr__ (self, name):
+               return 0
+
+       def run (self, answer):
+               self.npc = []
+               self.player = []
+               self.cont = []
+               self.dialogue[answer]()
+
+       def start (self):
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (0)
+               self.cont.append (1)
+               self.player.append (-1)
+
+       def answer0 (self):
+               self.set_npc ("Jelom Rasgar")
+               self.color = adonthell.gamedata_get_character("Jelom 
Rasgar").get_color()
+               self.npc.append (1)
+               self.cont.append (2)
+               self.player.append (-1)
+
+       def answer1 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (2)
+               self.cont.append (3)
+               self.player.append (-1)
+
+       def answer2 (self):
+               self.set_npc ("Imoen Silverhair")
+               self.color = adonthell.gamedata_get_character("Imoen 
Silverhair").get_color()
+               self.npc.append (3)
+               self.cont.append (4)
+               self.player.append (-1)
+
+       def answer3 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (4)
+               self.cont.append (5)
+               self.player.append (-1)
+
+       def answer4 (self):
+               self.set_npc ("Jelom Rasgar")
+               self.color = adonthell.gamedata_get_character("Jelom 
Rasgar").get_color()
+               self.npc.append (5)
+               self.cont.append (-1)
+               self.player.append (6)
+               self.cont.append (-1)
+               self.player.append (7)
+               self.cont.append (-1)
+               self.player.append (8)
+               self.cont.append (6)
+               self.player.append (-1)
+
+       def answer8 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (9)
+               self.cont.append (-1)
+               self.player.append (10)
+               self.cont.append (-1)
+               self.player.append (11)
+               self.cont.append (7)
+               self.player.append (-1)
+
+       def answer11 (self):
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (12)
+               self.cont.append (8)
+               self.player.append (-1)
+
+       def answer12 (self):
+               self.set_npc ("Erek Stonebreaker")
+               self.color = adonthell.gamedata_get_character("Erek 
Stonebreaker").get_color()
+               self.npc.append (13)
+               self.cont.append (9)
+               self.player.append (-1)
+
+       def answer13 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (14)
+               self.cont.append (10)
+               self.player.append (-1)
+
+       def answer14 (self):
+               self.set_npc ("Erek Stonebreaker")
+               self.color = adonthell.gamedata_get_character("Erek 
Stonebreaker").get_color()
+               self.npc.append (15)
+               self.cont.append (11)
+               self.player.append (-1)
+
+       def answer15 (self):
+               self.set_npc ("Jelom Rasgar")
+               self.color = adonthell.gamedata_get_character("Jelom 
Rasgar").get_color()
+               self.npc.append (16)
+               self.cont.append (12)
+               self.player.append (-1)
+
+       def answer16 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (17)
+               self.cont.append (13)
+               self.player.append (-1)
+
+       def answer17 (self):
+               self.set_npc ("Erek Stonebreaker")
+               self.color = adonthell.gamedata_get_character("Erek 
Stonebreaker").get_color()
+               self.npc.append (19)
+               self.cont.append (14)
+               self.player.append (-1)
+
+       def answer19 (self):
+               self.set_npc ("Bjarn Fingolson")
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (18)
+               self.cont.append (-1)
+               self.player.append (20)
+               self.cont.append (-1)
+               self.player.append (21)
+               self.cont.append (15)
+               self.player.append (-1)
+
+       def answer21 (self):
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (22)
+               self.cont.append (-1)
+               self.player.append (23)
+               self.cont.append (16)
+               self.player.append (24)
+               self.cont.append (-1)
+               self.player.append (-1)
+
+       def answer24 (self):
+               pass
+
+       def answer23 (self):
+               self.color = adonthell.gamedata_get_character("Bjarn 
Fingolson").get_color()
+               self.npc.append (25)
+               self.cont.append (-1)
+               self.player.append (26)
+               self.cont.append (-1)
+               self.player.append (-1)
+
+       def answer26 (self):
+               pass
+
+       def answer20 (self):
+               pass
+
+       def answer10 (self):
+               pass
+
+       def answer7 (self):
+               pass
+
+       def answer6 (self):
+               pass
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index 41d269e..d1df0cf 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -107,7 +107,7 @@ class jelom_2nd:
 
                                self.player.append (38)
                                self.cont.append (22)
-                       if bjarn_lies == 1:
+                       if adonthell.gamedata_get_quest("demo").get_val 
("bjarn_lies") == 1:
 
                                self.player.append (33)
                                self.cont.append (19)
@@ -127,7 +127,7 @@ class jelom_2nd:
                self.player.append (-1)
 
        def answer35 (self):
-               self.set_npc (self.the_npc.get_name())
+               self.set_npc (self.the_npc.get_id())
                self.color = self.the_npc.get_color()
                self.npc.append (36)
                self.cont.append (-1)
@@ -150,7 +150,7 @@ class jelom_2nd:
                self.player.append (-1)
 
        def answer24 (self):
-               self.set_npc (self.the_npc.get_name())
+               self.set_npc (self.the_npc.get_id())
                self.color = self.the_npc.get_color()
                self.npc.append (25)
                self.cont.append (-1)
@@ -166,7 +166,7 @@ class jelom_2nd:
                self.cont.append (-1)
                self.player.append (31)
                self.cont.append (18)
-               if bjarn_lies == 1:
+               if adonthell.gamedata_get_quest("demo").get_val ("bjarn_lies") 
== 1:
 
                        self.player.append (33)
                        self.cont.append (19)
@@ -190,7 +190,7 @@ class jelom_2nd:
                self.cont.append (-1)
                self.player.append (31)
                self.cont.append (18)
-               if bjarn_lies == 1:
+               if adonthell.gamedata_get_quest("demo").get_val ("bjarn_lies") 
== 1:
 
                        self.player.append (33)
                        self.cont.append (19)
diff --git a/scripts/schedules/mapcharacters/to_cellar.py 
b/scripts/schedules/mapcharacters/to_cellar.py
index 744244a..297f58b 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -93,5 +93,9 @@ class to_cellar:
                 if myself.submap () == 7 and myself.posx () != 1:
                     if myself.get_name () == adonthell.gamedata_player 
().get_name ():
                         myself.set_schedule ("keyboard_control")
+                        bjarn = adonthell.gamedata_get_character ("Bjarn 
Fingolson")
+                        bjarn.set_dialogue ("dialogues/extro")
+                        bjarn.launch_action (myself)
+                        
                     else:
-                        myself.set_schedule_active (0)
\ No newline at end of file
+                        myself.set_schedule_active (0)