[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 d2a86c9 030/237: Added some
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 d2a86c9 030/237: Added some more characters and dialogues |
|
Date: |
Mon, 25 Jul 2016 18:14:54 +0000 (UTC) |
tag: Release_0-3-1
commit d2a86c970470b3ca4692985e7abcb5a327d8ec1c
Author: adondev <adondev>
Commit: adondev <adondev>
Added some more characters and dialogues
---
character.data | Bin 385 -> 511 bytes
scripts/dialogues/.cvsignore | 1 +
scripts/dialogues/Makefile.am | 3 +-
scripts/dialogues/erek_start.py | 621 ++++++++++++++++++++++++++++++++++++
scripts/dialogues/janesta_start.py | 58 ++++
scripts/dialogues/sarin_start.py | 81 +++++
scripts/init.py | 53 +++
scripts/modules/console.py | 8 +-
8 files changed, 822 insertions(+), 3 deletions(-)
diff --git a/character.data b/character.data
index cee0998..0481912 100755
Binary files a/character.data and b/character.data differ
diff --git a/scripts/dialogues/.cvsignore b/scripts/dialogues/.cvsignore
index 3dda729..551aedb 100755
--- a/scripts/dialogues/.cvsignore
+++ b/scripts/dialogues/.cvsignore
@@ -1,2 +1,3 @@
Makefile.in
Makefile
+*.pyc
diff --git a/scripts/dialogues/Makefile.am b/scripts/dialogues/Makefile.am
index c832766..4d31fd9 100755
--- a/scripts/dialogues/Makefile.am
+++ b/scripts/dialogues/Makefile.am
@@ -1,5 +1,6 @@
pkgdatadir = $(gamedatadir)/scripts/dialogues
-pkgdata_DATA = orloth_start.py lucia_start.py
+pkgdata_DATA = orloth_start.py lucia_start.py sarin_start.py \
+ janesta_start.py erek_start.py
EXTRA_DIST = $(pkgdata_DATA)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
new file mode 100755
index 0000000..5749c69
--- /dev/null
+++ b/scripts/dialogues/erek_start.py
@@ -0,0 +1,621 @@
+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 [...]
+
+ def set_name (self, new_name):
+ pass
+
+ def set_npc (self, new_npc):
+ pass
+
+ def set_portrait (self, new_portrait):
+ 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 [...]
+
+ def clear (self):
+ del self.dialogue
+
+ self.demo = quests["demo"]
+
+
+ # Returns whom the Player told about his connection
+ # with Lady Silverhair
+
+ def get_right_npc (self):
+ if self.demo.get ("work_4_shair") & 1 == 1:
+ return "Master Orloth"
+
+ elif self.demo.get ("work_4_shair") & 2 == 2:
+ return "the mercenary"
+
+ else:
+ return "Tristan the merchant"
+
+
+ def __getattr__ (self, name):
+ return 0
+
+ def run (self, answer):
+ self.npc = []
+ self.player = []
+ self.cont = []
+ self.dialogue[answer]()
+
+ def start (self):
+ if the_npc.get ("talked_to") == 0:
+
+ self.color = 0
+ self.npc.append (0)
+ self.cont.append (-1)
+ the_npc.set ("talked_to", 1)
+
+ if self.demo.get ("know_erek") == 1:
+
+ self.player.append (1)
+ self.cont.append (1)
+ else:
+
+ self.player.append (43)
+ self.cont.append (30)
+ self.player.append (-1)
+ elif the_npc.get ("work_4_shair") == 0 and self.demo.get
("work_4_shair") > 0:
+
+ self.color = 0
+ self.npc.append (50)
+ self.cont.append (34)
+ self.player.append (-1)
+ else:
+
+ self.color = 0
+ self.npc.append (45)
+ self.cont.append (31)
+ self.player.append (-1)
+
+ def answer45 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (46)
+ self.cont.append (-1)
+ self.player.append (73)
+ self.cont.append (-1)
+ self.player.append (49)
+ self.cont.append (33)
+ self.player.append (48)
+ self.cont.append (32)
+ if quests.get ("demo").get ("bjarn_door_open") == 1:
+
+ self.player.append (84)
+ self.cont.append (53)
+ self.player.append (-1)
+ self.color = the_npc.get_color()
+ self.npc.append (47)
+ self.cont.append (-1)
+ self.player.append (73)
+ self.cont.append (-1)
+ self.player.append (49)
+ self.cont.append (33)
+ self.player.append (48)
+ self.cont.append (32)
+ if quests.get ("demo").get ("bjarn_door_open") == 1:
+
+ self.player.append (84)
+ self.cont.append (53)
+ self.player.append (-1)
+
+ def answer84 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (85)
+ self.cont.append (-1)
+ self.player.append (87)
+ self.cont.append (-1)
+ self.player.append (88)
+ self.cont.append (54)
+ self.player.append (-1)
+
+ def answer88 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (86)
+ self.cont.append (-1)
+ self.player.append (90)
+ self.cont.append (56)
+ self.player.append (89)
+ self.cont.append (55)
+ self.player.append (-1)
+
+ def answer89 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (91)
+ self.cont.append (57)
+ self.player.append (-1)
+
+ def answer91 (self):
+ self.color = 0
+ self.npc.append (92)
+ self.cont.append (-1)
+ quests.get ("demo").set ("bjarn_door_open" , 2)
+
+ self.player.append (-1)
+
+ def answer90 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (93)
+ self.cont.append (-1)
+ self.player.append (87)
+ self.cont.append (-1)
+ self.player.append (89)
+ self.cont.append (55)
+ self.player.append (-1)
+
+ def answer87 (self):
+ pass
+
+ def answer48 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (41)
+ self.cont.append (28)
+ self.player.append (-1)
+
+ def answer41 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (24)
+ self.cont.append (15)
+ self.player.append (-1)
+
+ def answer24 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = characters["Bjarn Fingolson"].get_color()
+ self.npc.append (25)
+ self.cont.append (16)
+ self.player.append (-1)
+
+ def answer25 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (26)
+ self.cont.append (17)
+ self.player.append (-1)
+
+ def answer26 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = characters["Bjarn Fingolson"].get_color()
+ self.npc.append (27)
+ self.cont.append (18)
+ self.player.append (-1)
+
+ def answer27 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (28)
+ self.cont.append (19)
+ self.player.append (-1)
+
+ def answer28 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = characters["Bjarn Fingolson"].get_color()
+ self.npc.append (29)
+ self.cont.append (20)
+ self.player.append (-1)
+
+ def answer29 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (30)
+ self.cont.append (21)
+ self.player.append (-1)
+
+ def answer30 (self):
+ self.set_npc (the_npc.get_name())
+ self.color = the_npc.get_color()
+ self.npc.append (31)
+ self.cont.append (-1)
+ self.player.append (33)
+ self.cont.append (23)
+ self.player.append (34)
+ self.cont.append (24)
+ self.player.append (79)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer79 (self):
+ pass
+
+ def answer34 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (35)
+ self.cont.append (-1)
+ self.player.append (79)
+ self.cont.append (-1)
+ self.player.append (80)
+ self.cont.append (51)
+ self.player.append (-1)
+
+ def answer80 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (81)
+ self.cont.append (-1)
+ self.player.append (82)
+ self.cont.append (52)
+ self.player.append (-1)
+
+ def answer82 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (83)
+ self.cont.append (-1)
+ self.player.append (79)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer33 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (36)
+ self.cont.append (-1)
+ self.player.append (37)
+ self.cont.append (25)
+ self.player.append (79)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer37 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (35)
+ self.cont.append (-1)
+ self.player.append (79)
+ self.cont.append (-1)
+ self.player.append (80)
+ self.cont.append (51)
+ self.player.append (-1)
+
+ def answer49 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (75)
+ self.cont.append (49)
+ self.player.append (-1)
+
+ def answer75 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (76)
+ self.cont.append (50)
+ self.player.append (-1)
+
+ def answer76 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (77)
+ self.cont.append (-1)
+ self.player.append (78)
+ self.cont.append (-1)
+ self.player.append (48)
+ self.cont.append (32)
+ if quests.get ("demo").get ("bjarn_door_open") == 1:
+
+ self.player.append (84)
+ self.cont.append (53)
+ self.player.append (-1)
+
+ def answer78 (self):
+ pass
+
+ def answer73 (self):
+ pass
+
+ def answer50 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (51)
+ self.cont.append (-1)
+ self.player.append (52)
+ self.cont.append (35)
+ self.player.append (53)
+ self.cont.append (36)
+ self.player.append (-1)
+
+ def answer53 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (55)
+ self.cont.append (-1)
+ self.player.append (56)
+ self.cont.append (37)
+ self.player.append (57)
+ self.cont.append (38)
+ self.player.append (-1)
+
+ def answer57 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (58)
+ self.cont.append (39)
+ self.player.append (-1)
+
+ def answer58 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (59)
+ self.cont.append (-1)
+ self.player.append (60)
+ self.cont.append (40)
+ self.player.append (64)
+ self.cont.append (43)
+ self.player.append (-1)
+
+ def answer64 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (65)
+ self.cont.append (-1)
+ self.player.append (66)
+ self.cont.append (44)
+ self.player.append (-1)
+
+ def answer66 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (67)
+ self.cont.append (45)
+ self.player.append (-1)
+
+ def answer67 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (68)
+ self.cont.append (-1)
+ self.player.append (69)
+ self.cont.append (46)
+ self.player.append (-1)
+
+ def answer69 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (70)
+ self.cont.append (47)
+ self.player.append (-1)
+
+ def answer70 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (71)
+ self.cont.append (48)
+ self.player.append (-1)
+
+ def answer71 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (72)
+ self.cont.append (-1)
+ self.player.append (74)
+ self.cont.append (-1)
+ self.player.append (49)
+ self.cont.append (33)
+ self.player.append (48)
+ self.cont.append (32)
+ if quests.get ("demo").get ("bjarn_door_open") == 1:
+
+ self.player.append (84)
+ self.cont.append (53)
+ self.player.append (-1)
+
+ def answer74 (self):
+ pass
+
+ def answer60 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (61)
+ self.cont.append (41)
+ self.player.append (-1)
+
+ def answer61 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (62)
+ self.cont.append (-1)
+ self.player.append (74)
+ self.cont.append (-1)
+ self.player.append (48)
+ self.cont.append (32)
+ self.player.append (49)
+ self.cont.append (33)
+ if quests.get ("demo").get ("bjarn_door_open") == 1:
+
+ self.player.append (84)
+ self.cont.append (53)
+ self.player.append (-1)
+
+ def answer56 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (63)
+ self.cont.append (42)
+ self.player.append (-1)
+
+ def answer63 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (59)
+ self.cont.append (-1)
+ self.player.append (60)
+ self.cont.append (40)
+ self.player.append (64)
+ self.cont.append (43)
+ self.player.append (-1)
+
+ def answer52 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (54)
+ self.cont.append (-1)
+ self.player.append (56)
+ self.cont.append (37)
+ self.player.append (-1)
+
+ def answer43 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (44)
+ self.cont.append (-1)
+ self.player.append (3)
+ self.cont.append (2)
+ self.player.append (4)
+ self.cont.append (3)
+ self.player.append (-1)
+
+ def answer4 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (9)
+ self.cont.append (-1)
+ self.player.append (13)
+ self.cont.append (8)
+ self.player.append (16)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer16 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (17)
+ self.cont.append (-1)
+ the_npc.set ("work_4_shair", 1)
+
+ self.player.append (19)
+ self.cont.append (11)
+ self.player.append (20)
+ self.cont.append (12)
+ if self.demo.get ("know_argument") != 0:
+
+ self.player.append (38)
+ self.cont.append (26)
+ self.player.append (-1)
+
+ def answer38 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (40)
+ self.cont.append (27)
+ self.player.append (-1)
+
+ def answer40 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (41)
+ self.cont.append (28)
+ self.player.append (-1)
+
+ def answer20 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (21)
+ self.cont.append (-1)
+ self.demo.set ("know_alek_eavesdrop", 1)
+
+ if self.demo.get ("know_argument") == 0:
+
+ self.player.append (22)
+ self.cont.append (13)
+ else:
+
+ self.player.append (42)
+ self.cont.append (29)
+ self.player.append (-1)
+
+ def answer42 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (32)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer32 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (24)
+ self.cont.append (15)
+ self.player.append (-1)
+
+ def answer22 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (32)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer19 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (23)
+ self.cont.append (14)
+ self.player.append (-1)
+
+ def answer23 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = characters["Imoen Silverhair"].get_color()
+ self.npc.append (24)
+ self.cont.append (15)
+ self.player.append (-1)
+
+ def answer13 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (18)
+ self.cont.append (-1)
+ the_npc.set ("work_4_shair", 1)
+
+ self.player.append (19)
+ self.cont.append (11)
+ if self.demo.get ("know_argument") != 0:
+
+ self.player.append (38)
+ self.cont.append (26)
+ self.player.append (-1)
+
+ def answer3 (self):
+ if self.demo.get ("work_4_shair") != 0:
+
+ self.color = the_npc.get_color()
+ self.npc.append (6)
+ self.cont.append (-1)
+ the_npc.set ("insulted", 1)
+
+ self.player.append (8)
+ self.cont.append (5)
+ self.player.append (-1)
+ else:
+
+ self.color = the_npc.get_color()
+ self.npc.append (5)
+ self.cont.append (-1)
+ self.player.append (7)
+ self.cont.append (4)
+ self.player.append (-1)
+
+ def answer7 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (10)
+ self.cont.append (-1)
+ self.player.append (12)
+ self.cont.append (7)
+ self.player.append (11)
+ self.cont.append (6)
+ self.player.append (-1)
+
+ def answer11 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (15)
+ self.cont.append (-1)
+ self.player.append (13)
+ self.cont.append (8)
+ self.player.append (16)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer12 (self):
+ the_npc.set ("insulted", 1)
+
+ self.color = 0
+ self.npc.append (14)
+ self.cont.append (9)
+ self.player.append (-1)
+
+ def answer14 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (23)
+ self.cont.append (14)
+ self.player.append (-1)
+
+ def answer8 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (9)
+ self.cont.append (-1)
+ self.player.append (13)
+ self.cont.append (8)
+ self.player.append (16)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer1 (self):
+ self.color = the_npc.get_color()
+ self.npc.append (2)
+ self.cont.append (-1)
+ self.player.append (3)
+ self.cont.append (2)
+ self.player.append (4)
+ self.cont.append (3)
+ self.player.append (-1)
diff --git a/scripts/dialogues/janesta_start.py
b/scripts/dialogues/janesta_start.py
new file mode 100755
index 0000000..2a9826f
--- /dev/null
+++ b/scripts/dialogues/janesta_start.py
@@ -0,0 +1,58 @@
+class janesta_start:
+ loop = []
+ strings = ["Oh, $name, we've been so worried for the Mistress. Can't you
do something to set her free?", "I will try, Janesta. But you must be brave.
This is a difficult time for Lady Silverhair, and she needs us all to help her
though.", "I will try. Thank you, $name.", "Perhaps. Do you know anything
about this dwarf, Fingolson?", "Nothing, I'm afraid. This is my first time
here, and I was brought straight to the Mistress' room to make it ready. This
room is so awful, I canno [...]
+
+ def set_name (self, new_name):
+ pass
+
+ def set_npc (self, new_npc):
+ pass
+
+ def set_portrait (self, new_portrait):
+ pass
+
+ def __init__(self):
+ self.dialogue = [self.start, self.answer1, self.answer3, self.answer5,
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 = characters["Janesta Skywind"].get_color()
+ self.npc.append (0)
+ self.cont.append (-1)
+ self.player.append (1)
+ self.cont.append (1)
+ self.player.append (3)
+ self.cont.append (2)
+ self.player.append (-1)
+
+ def answer3 (self):
+ self.color = characters["Janesta Skywind"].get_color()
+ self.npc.append (4)
+ self.cont.append (-1)
+ self.player.append (5)
+ self.cont.append (3)
+ self.player.append (-1)
+
+ def answer5 (self):
+ self.set_npc (the_npc.get_name())
+ self.color = the_npc.get_color()
+ self.npc.append (6)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer1 (self):
+ self.color = characters["Janesta Skywind"].get_color()
+ self.npc.append (2)
+ self.cont.append (-1)
+ self.player.append (-1)
diff --git a/scripts/dialogues/sarin_start.py b/scripts/dialogues/sarin_start.py
new file mode 100755
index 0000000..0501919
--- /dev/null
+++ b/scripts/dialogues/sarin_start.py
@@ -0,0 +1,81 @@
+class sarin_start:
+ loop = []
+ strings = ["What insolence! $name, do you believe the depths of what they
have done to our Lady? To accuse her of common theft, as if she was a human!
And to lock her away in this tiny, dirty room! I tell you, I cannot bear it.",
"I understand, Sarin, but we must bear this for now. At least until I have
been able to uncover the truth.", "The truth? The truth is that our Lady is
innocent and that, that Dwarf ruffian, he's a liar.", "Perhaps so. Hopefully,
we shall see whether h [...]
+
+ def set_name (self, new_name):
+ pass
+
+ def set_npc (self, new_npc):
+ pass
+
+ def set_portrait (self, new_portrait):
+ pass
+
+ def __init__(self):
+ self.dialogue = [self.start, self.answer1, self.answer3, self.answer5,
self.answer7, self.answer9, self.answer11, 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 = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (0)
+ self.cont.append (-1)
+ self.player.append (1)
+ self.cont.append (1)
+ self.player.append (-1)
+
+ def answer1 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (2)
+ self.cont.append (-1)
+ self.player.append (3)
+ self.cont.append (2)
+ self.player.append (11)
+ self.cont.append (6)
+ self.player.append (-1)
+
+ def answer11 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (12)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer3 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (4)
+ self.cont.append (-1)
+ self.player.append (5)
+ self.cont.append (3)
+ self.player.append (-1)
+
+ def answer5 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (6)
+ self.cont.append (-1)
+ self.player.append (7)
+ self.cont.append (4)
+ self.player.append (9)
+ self.cont.append (5)
+ self.player.append (-1)
+
+ def answer9 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (10)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer7 (self):
+ self.color = characters["Sarin Trailfollower"].get_color()
+ self.npc.append (8)
+ self.cont.append (-1)
+ self.player.append (-1)
diff --git a/scripts/init.py b/scripts/init.py
index 0c397fc..ddb47f0 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -470,6 +470,59 @@ if retval < 5:
orloth.stand_south ()
orloth.set_schedule ("orloth")
+ # erek = characters ["Erek Stonebreaker"]
+ # erek.set_dialogue ("dialogues/erek_start")
+ # erek.load ("erek.mchar")
+ # erek.set_map (map_engine.get_landmap ())
+ # erek.jump_to (1, 5, 5)
+ # erek.set_action ("action_talk")
+ # erek.stand_north ()
+
+ oliver = characters ["Oliver Redwyne"]
+ oliver.load ("oliver.mchar")
+ oliver.set_map (map_engine.get_landmap ())
+ oliver.jump_to (0, 25, 15)
+ oliver.set_action ("action_talk")
+ oliver.stand_west ()
+
+ frostbloom = characters ["Rhayne Frostbloom"]
+ frostbloom.load ("frostbloom.mchar")
+ frostbloom.set_map (map_engine.get_landmap ())
+ frostbloom.jump_to (0, 18, 22)
+ frostbloom.set_action ("action_talk")
+ frostbloom.stand_north ()
+
+ bjarn = characters ["Bjarn Fingolson"]
+ bjarn.set_dialogue ("dialogues/bjarn_start")
+ bjarn.load ("bjarn.mchar")
+ bjarn.set_map (map_engine.get_landmap ())
+ bjarn.jump_to (7, 3, 6)
+ bjarn.set_action ("action_talk")
+ bjarn.stand_west ()
+
+ silverhair = characters ["Imoen Silverhair"]
+ silverhair.load ("silverhair.mchar")
+ silverhair.set_map (map_engine.get_landmap ())
+ silverhair.jump_to (13, 4, 6)
+ silverhair.set_action ("action_talk")
+ silverhair.stand_north ()
+
+ sarin = characters ["Sarin Trailfollower"]
+ sarin.set_dialogue ("dialogues/sarin_start")
+ sarin.load ("servant2.mchar")
+ sarin.set_map (map_engine.get_landmap ())
+ sarin.jump_to (13, 7, 3)
+ sarin.set_action ("action_talk")
+ sarin.stand_east ()
+
+ janesta = characters ["Janesta Skywind"]
+ janesta.set_dialogue ("dialogues/janesta_start")
+ janesta.load ("servant1.mchar")
+ janesta.set_map (map_engine.get_landmap ())
+ janesta.jump_to (13, 1, 4)
+ janesta.set_action ("action_talk")
+ janesta.stand_west ()
+
# Once we want to generate the data context files,
# just call gamedata::save (1) and copy the .data files
# to the game's root directory.
diff --git a/scripts/modules/console.py b/scripts/modules/console.py
index 01ec9b5..13d9f4e 100755
--- a/scripts/modules/console.py
+++ b/scripts/modules/console.py
@@ -91,7 +91,7 @@ class console (win_container):
def on_update (self):
# -- quit
- if input_has_been_pushed (SDLK_ESCAPE):
+ if input_has_been_pushed (SDLK_TAB):
# print "Quitting ..."
self.quit = 0
@@ -120,7 +120,11 @@ class console (win_container):
dir = dir + "/history"
# -- try to open the file
- file = open (dir, 'r')
+ try:
+ file = open (dir, 'r')
+ except IOError:
+ return
+
if file != None:
self.history = file.readlines ()
self.hist_idx = len (self.history)
- [adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs!, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 0fbac81 017/237: Fixed last (?) severe bugs!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 065306d 021/237: Added some rooms to the map (Alex), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9112207 034/237: Fixed Lucia's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0e77bb6 032/237: ADDED dialogues of Oliver and Bjarn, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 46ff573 008/237: Oooops forgot these ones..., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9997e40 031/237: Implemented schedules of Silverhair, Frostbloom and Trailfollower, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eedeab6 040/237: FIXED jerky movement during the first second after the game starts up, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 66f584b 036/237: Implemented 'Open Bjarn's Door' puzzle, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 1dac4d8 019/237: Those are the most recent versions of those dialogues - the ones on the ftp are a lot older, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8b0c1e0 042/237: Slight fix to Alek's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d2a86c9 030/237: Added some more characters and dialogues,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 de03633 047/237: Commited my own files again! :/, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fe87ce5 041/237: Stupid kdevelop!!!, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 56fe2ff 046/237: Fixed Oliver's teleport bug., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 edbcb94 007/237: Added autoconf/automake support., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 89ba59b 024/237: Continued map rooms., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 78ff7bc 049/237: More schedules converted to the new pathfinding code, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a4f92b4 055/237: Ooppps! Fixed an error of my own, sorry., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c6dcf69 044/237: Using pathfinding methods for Talan schedule., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9cb9bdd 048/237: Converted Orloth to new pathfinding, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 22178ae 058/237: Map gets only updated if the main_menu or data_screen aren't displayed., Kai Sterker, 2016/07/25