[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 148aeb5 129/237: Small corr
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 148aeb5 129/237: Small corrections |
|
Date: |
Mon, 25 Jul 2016 18:15:06 +0000 (UTC) |
tag: Release_0-3-1
commit 148aeb546757ee46cd139a8cc72ff2bad86eec35
Author: adondev <adondev>
Commit: adondev <adondev>
Small corrections
---
scripts/dialogues/erek_start.py | 19 +-
scripts/dialogues/jelom_2nd.py | 777 ++++++++++++++++++++++++++++++++-------
2 files changed, 651 insertions(+), 145 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index f4760bf..a00224e 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
@@ -273,7 +273,7 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1 and adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") >= 2:
self.player.append (116)
- self.cont.append (-1)
+ self.cont.append (74)
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (111)
@@ -434,7 +434,12 @@ class erek_start:
self.player.append (-1)
def answer116 (self):
- pass
+ self.color = self.the_npc.get_color()
+ self.npc.append (119)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
+
+ self.player.append (-1)
def answer47 (self):
self.color = self.the_npc.get_color()
@@ -670,6 +675,12 @@ class erek_start:
self.player.append (-1)
def answer23 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (118)
+ self.cont.append (75)
+ self.player.append (-1)
+
+ def answer242 (self):
self.set_npc ("Imoen Silverhair")
self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
self.npc.append (24)
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index 1ca7e1d..a00224e 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -1,8 +1,8 @@
import adonthell
-class jelom_2nd:
+class erek_start:
loop = []
- strings = ["Back again, Half-Elf? Have you learned anything of
importance from your mistress?", "Nothing you'd be interested in, Jelom.", "It
seems that Fingolson's gems are worthless to her.", "Really? I imagine you have
some sort of proof for this, then?", "I have this Chrysoberyl. Apparently it is
no Catseye, so why should Lady Silverhair have stolen it?", "You mean this is
one of the stolen gems? How in hell did you come across that? And where are the
others?", "I don't know where t [...]
+ 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,39 +17,38 @@ class jelom_2nd:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer2, self.answer4,
self.answer6, self.answer7, self.answer8, self.answer10, self.answer12,
self.answer14, self.answer16, self.answer17, self.answer19, self.answer20,
self.answer23, self.answer24, self.answer26, self.answer27, self.answer29,
self.answer31, self.answer33, self.answer34, self.answer35, None]
+ 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
- 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)
+ # Returns whom the Player told about his connection
+ # with Lady Silverhair
+ def get_right_npc (self):
+ if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") &
1 == 1:
+ return "Master Orloth"
- 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_active (1)
- 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)
+ elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair")
& 2 == 2:
+ return "the mercenary"
+ else:
+ return "Tristan the merchant"
+
+ # -- 'teleport' to Bjarn's room
+ def __del__ (self):
+ if adonthell.gamedata_get_quest("demo").get_val ("bjarn_door_open")
== 2:
+ erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+ from events import switch_submap
+ erek.set_val ("goto", erek.submap ())
+ switch_submap (self.the_player, 7, 1, 6, 3)
+ switch_submap (erek, 7, 2, 7, 0)
+
+ if adonthell.gamedata_get_quest("demo").get_val ("convince_jelom")
== 2:
+ erek = adonthell.gamedata_get_character ("Erek Stonebreaker")
+ erek.set_schedule_active (0)
+ from events import switch_submap
+ switch_submap (self.the_player, 9, 1, 3, 3)
+ switch_submap (erek, 9, 2, 4, 0)
def __getattr__ (self, name):
@@ -62,220 +61,716 @@ class jelom_2nd:
self.dialogue[answer]()
def start (self):
- if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 0:
+ if self.the_npc.get_val ("talked_to") == 0:
- self.color = self.the_npc.get_color()
+ self.color = 0
self.npc.append (0)
self.cont.append (-1)
- self.player.append (1)
- self.cont.append (-1)
- if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") > 0:
+ self.the_npc.set_val ("talked_to", 1)
+
+ if adonthell.gamedata_get_quest("demo").get_val
("know_erek") == 1:
- self.player.append (2)
+ self.player.append (1)
self.cont.append (1)
- self.player.append (-1)
- elif adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
+ else:
- self.color = self.the_npc.get_color()
- self.npc.append (21)
- self.cont.append (-1)
- self.player.append (22)
- self.cont.append (-1)
- if adonthell.gamedata_get_quest("demo").get_val
("have_gem") == 1:
+ self.player.append (43)
+ self.cont.append (30)
+ self.player.append (-1)
+ elif self.the_npc.get_val ("apologize") == 0:
- self.player.append (4)
- self.cont.append (2)
- if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+ self.color = 0
+ self.npc.append (45)
+ self.cont.append (31)
+ self.player.append (-1)
+ elif self.the_npc.get_val ("work_4_shair") == 0 and
adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") > 0:
- self.player.append (12)
- self.cont.append (7)
+ self.color = 0
+ self.npc.append (49)
+ self.cont.append (34)
self.player.append (-1)
else:
- self.color = self.the_npc.get_color()
- self.npc.append (23)
- self.cont.append (13)
- adonthell.gamedata_get_quest("demo").set_val
("convince_jelom" , 3)
+ self.color = 0
+ self.npc.append (112)
+ self.cont.append (71)
+ self.the_npc.set_val ("apologize" , 0)
self.player.append (-1)
- def answer23 (self):
- self.set_npc ("Erek Stonebreaker")
- self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
- self.npc.append (24)
- self.cont.append (14)
+ def answer112 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (113)
+ self.cont.append (-1)
+ self.player.append (115)
+ self.cont.append (73)
self.player.append (-1)
- def answer24 (self):
- self.set_npc (self.the_npc.get_name())
+ def answer115 (self):
self.color = self.the_npc.get_color()
- self.npc.append (25)
+ self.npc.append (114)
+ self.cont.append (72)
+ self.player.append (-1)
+
+ def answer114 (self):
+ self.color = 0
+ self.npc.append (102)
+ self.cont.append (65)
+ self.player.append (-1)
+
+ def answer102 (self):
+ self.color = 0
+ self.npc.append (103)
+ self.cont.append (66)
+ self.player.append (-1)
+
+ def answer103 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (104)
self.cont.append (-1)
- self.player.append (26)
- self.cont.append (15)
- self.player.append (29)
- self.cont.append (17)
+ if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") < 2:
+ adonthell.gamedata_get_quest("demo").set_val
("gem_worthless" , adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") + 2)
+
+ self.player.append (106)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
+
+ self.player.append (105)
+ self.cont.append (67)
self.player.append (-1)
- def answer29 (self):
+ def answer105 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
+
self.color = self.the_npc.get_color()
- self.npc.append (30)
+ self.npc.append (117)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer106 (self):
+ pass
+
+ def answer49 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (50)
+ self.cont.append (-1)
+ self.player.append (51)
+ self.cont.append (35)
+ self.player.append (52)
+ self.cont.append (36)
+ self.player.append (-1)
+
+ def answer52 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (54)
+ self.cont.append (-1)
+ self.player.append (55)
+ self.cont.append (37)
+ self.player.append (56)
+ self.cont.append (38)
+ self.player.append (-1)
+
+ def answer56 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (57)
+ self.cont.append (39)
+ self.player.append (-1)
+
+ def answer57 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (58)
+ self.cont.append (-1)
+ self.player.append (59)
+ self.cont.append (40)
+ self.player.append (63)
+ self.cont.append (43)
+ self.player.append (-1)
+
+ def answer63 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (64)
+ self.cont.append (-1)
+ self.player.append (65)
+ self.cont.append (44)
+ self.player.append (-1)
+
+ def answer65 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (66)
+ self.cont.append (45)
+ self.player.append (-1)
+
+ def answer66 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (67)
+ self.cont.append (-1)
+ self.player.append (68)
+ self.cont.append (46)
+ self.player.append (-1)
+
+ def answer68 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (69)
+ self.cont.append (47)
+ self.player.append (-1)
+
+ def answer69 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (70)
+ self.cont.append (48)
+ self.player.append (-1)
+
+ def answer70 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (61)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer59 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (60)
+ self.cont.append (41)
+ self.player.append (-1)
+
+ def answer60 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (61)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer55 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (62)
+ self.cont.append (42)
+ self.player.append (-1)
+
+ def answer62 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (58)
+ self.cont.append (-1)
+ self.player.append (59)
+ self.cont.append (40)
+ self.player.append (63)
+ self.cont.append (43)
+ self.player.append (-1)
+
+ def answer51 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (53)
+ self.cont.append (-1)
+ self.player.append (55)
+ self.cont.append (37)
+ self.player.append (-1)
+
+ def answer45 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (46)
+ self.cont.append (-1)
+ self.player.append (71)
+ self.cont.append (-1)
+ self.player.append (47)
+ self.cont.append (32)
+ if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1 and adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") >= 2:
+
+ self.player.append (116)
+ self.cont.append (74)
+ if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
+
+ self.player.append (111)
+ self.cont.append (70)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
+
+ self.player.append (81)
+ self.cont.append (53)
+ if adonthell.gamedata_get_quest("demo").get_val
("ask_packed_gems") == 1:
+
+ self.player.append (91)
+ self.cont.append (58)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
+
+ self.player.append (48)
+ self.cont.append (33)
+ self.player.append (-1)
+
+ def answer48 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (72)
+ self.cont.append (49)
+ self.player.append (-1)
+
+ def answer72 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (73)
+ self.cont.append (50)
+ self.player.append (-1)
+
+ def answer73 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (74)
+ self.cont.append (-1)
+ self.player.append (75)
+ self.cont.append (-1)
+ self.player.append (47)
+ self.cont.append (32)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
+
+ self.player.append (81)
+ self.cont.append (53)
+ self.player.append (-1)
+
+ def answer75 (self):
+ pass
+
+ def answer91 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (92)
+ self.cont.append (-1)
+ self.player.append (93)
+ self.cont.append (59)
+ self.player.append (-1)
+
+ def answer93 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (94)
+ self.cont.append (-1)
+ self.player.append (95)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer95 (self):
+ pass
+
+ def answer81 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (82)
+ self.cont.append (-1)
+ self.player.append (84)
+ self.cont.append (-1)
+ self.player.append (85)
+ self.cont.append (54)
+ self.player.append (-1)
+
+ def answer85 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (83)
+ self.cont.append (-1)
+ self.player.append (87)
+ self.cont.append (56)
+ self.player.append (86)
+ self.cont.append (55)
+ self.player.append (-1)
+
+ def answer86 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (88)
+ self.cont.append (57)
+ self.player.append (-1)
+
+ def answer88 (self):
+ self.color = 0
+ self.npc.append (89)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val ("bjarn_door_open"
, 2)
+
+ self.player.append (-1)
+
+ def answer87 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (90)
+ self.cont.append (-1)
+ self.player.append (84)
+ self.cont.append (-1)
+ self.player.append (86)
+ self.cont.append (55)
+ self.player.append (-1)
+
+ def answer84 (self):
+ pass
+
+ def answer111 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (98)
+ self.cont.append (-1)
+ self.player.append (99)
+ self.cont.append (62)
+ self.player.append (100)
+ self.cont.append (63)
+ self.player.append (-1)
+
+ def answer100 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (101)
+ self.cont.append (64)
+ self.player.append (-1)
+
+ def answer101 (self):
+ self.color = 0
+ self.npc.append (102)
+ self.cont.append (65)
+ self.player.append (-1)
+
+ def answer99 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (107)
+ self.cont.append (-1)
+ self.player.append (108)
+ self.cont.append (68)
+ self.player.append (109)
+ self.cont.append (69)
+ self.player.append (-1)
+
+ def answer109 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (110)
+ self.cont.append (-1)
+ self.the_npc.set_val ("apologize" , 1)
+
+ self.player.append (-1)
+
+ def answer108 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (101)
+ self.cont.append (64)
+ self.player.append (-1)
+
+ def answer116 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (119)
self.cont.append (-1)
- self.player.append (31)
+ adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
+
+ self.player.append (-1)
+
+ def answer47 (self):
+ self.color = self.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 = adonthell.gamedata_get_character("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 = adonthell.gamedata_get_character("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 = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
+ self.npc.append (26)
+ self.cont.append (17)
+ adonthell.gamedata_get_quest("demo").set_val
("know_low_quality" , 1)
+
+ self.player.append (-1)
+
+ def answer26 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (27)
self.cont.append (18)
- self.player.append (33)
+ self.player.append (-1)
+
+ def answer27 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
+ self.npc.append (28)
self.cont.append (19)
self.player.append (-1)
- def answer33 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (34)
+ def answer28 (self):
+ self.set_npc ("Bjarn Fingolson")
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (29)
self.cont.append (20)
self.player.append (-1)
- def answer34 (self):
- self.set_npc ("Erek Stonebreaker")
- self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
- self.npc.append (35)
+ def answer29 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
+ self.npc.append (30)
self.cont.append (21)
self.player.append (-1)
- def answer35 (self):
+ def answer30 (self):
self.set_npc (self.the_npc.get_name())
self.color = self.the_npc.get_color()
- self.npc.append (36)
+ 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 (76)
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 answer76 (self):
+ pass
+ def answer34 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (35)
+ self.cont.append (-1)
+ self.player.append (76)
+ self.cont.append (-1)
+ self.player.append (77)
+ self.cont.append (51)
self.player.append (-1)
- def answer31 (self):
+ def answer77 (self):
self.color = self.the_npc.get_color()
- self.npc.append (32)
+ self.npc.append (78)
self.cont.append (-1)
+ self.player.append (79)
+ self.cont.append (52)
self.player.append (-1)
- def answer26 (self):
+ def answer79 (self):
self.color = self.the_npc.get_color()
- self.npc.append (27)
- self.cont.append (16)
+ self.npc.append (80)
+ self.cont.append (-1)
+ self.player.append (76)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
+
+ self.player.append (97)
+ self.cont.append (61)
self.player.append (-1)
- def answer27 (self):
+ def answer97 (self):
self.color = self.the_npc.get_color()
- self.npc.append (28)
+ self.npc.append (98)
self.cont.append (-1)
- self.player.append (31)
- self.cont.append (18)
- self.player.append (33)
- self.cont.append (19)
+ self.player.append (99)
+ self.cont.append (62)
+ self.player.append (100)
+ self.cont.append (63)
self.player.append (-1)
- def answer12 (self):
+ def answer33 (self):
self.color = self.the_npc.get_color()
- self.npc.append (13)
+ self.npc.append (36)
+ self.cont.append (-1)
+ self.player.append (37)
+ self.cont.append (25)
+ self.player.append (76)
self.cont.append (-1)
- self.player.append (14)
- self.cont.append (8)
- self.player.append (17)
- self.cont.append (10)
self.player.append (-1)
- def answer17 (self):
+ def answer37 (self):
self.color = self.the_npc.get_color()
- self.npc.append (18)
+ self.npc.append (35)
+ self.cont.append (-1)
+ self.player.append (76)
self.cont.append (-1)
- adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+ self.player.append (77)
+ self.cont.append (51)
+ self.player.append (-1)
+
+ def answer71 (self):
+ pass
+ def answer43 (self):
+ self.color = self.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 answer14 (self):
+ def answer4 (self):
self.color = self.the_npc.get_color()
- self.npc.append (15)
+ self.npc.append (9)
self.cont.append (-1)
+ self.player.append (13)
+ self.cont.append (8)
self.player.append (16)
- self.cont.append (9)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer16 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (17)
+ self.cont.append (-1)
+ self.the_npc.set_val ("work_4_shair", 1)
+
self.player.append (19)
self.cont.append (11)
+ self.player.append (20)
+ self.cont.append (12)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_argument") != 0:
+
+ self.player.append (38)
+ self.cont.append (26)
self.player.append (-1)
- def answer19 (self):
+ def answer38 (self):
self.color = self.the_npc.get_color()
- self.npc.append (20)
- self.cont.append (12)
+ 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 = self.the_npc.get_color()
+ self.npc.append (41)
+ self.cont.append (28)
self.player.append (-1)
def answer20 (self):
self.color = self.the_npc.get_color()
- self.npc.append (9)
+ self.npc.append (96)
+ self.cont.append (60)
+ self.player.append (-1)
+
+ def answer96 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (21)
self.cont.append (-1)
- adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+ adonthell.gamedata_get_quest("demo").set_val
("know_alek_eavesdrop" , 1)
+
+ if adonthell.gamedata_get_quest("demo").get_val
("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 answer16 (self):
+ def answer42 (self):
self.color = self.the_npc.get_color()
- self.npc.append (7)
- self.cont.append (4)
+ self.npc.append (32)
+ self.cont.append (22)
self.player.append (-1)
- def answer7 (self):
+ def answer32 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
+ self.npc.append (24)
+ self.cont.append (15)
+ self.player.append (-1)
+
+ def answer22 (self):
self.color = self.the_npc.get_color()
- self.npc.append (8)
- self.cont.append (5)
+ self.npc.append (32)
+ self.cont.append (22)
self.player.append (-1)
- def answer8 (self):
+ def answer19 (self):
self.color = self.the_npc.get_color()
- self.npc.append (9)
- self.cont.append (-1)
- adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 1)
+ self.npc.append (23)
+ self.cont.append (14)
+ self.player.append (-1)
+
+ def answer23 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (118)
+ self.cont.append (75)
+ self.player.append (-1)
+ def answer242 (self):
+ self.set_npc ("Imoen Silverhair")
+ self.color = adonthell.gamedata_get_character("Imoen
Silverhair").get_color()
+ self.npc.append (24)
+ self.cont.append (15)
self.player.append (-1)
- def answer4 (self):
+ def answer13 (self):
self.color = self.the_npc.get_color()
- self.npc.append (5)
+ self.npc.append (18)
self.cont.append (-1)
- self.player.append (6)
- self.cont.append (3)
+ self.the_npc.set_val ("work_4_shair", 1)
+
self.player.append (19)
self.cont.append (11)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_argument") != 0:
+
+ self.player.append (38)
+ self.cont.append (26)
self.player.append (-1)
- def answer6 (self):
+ def answer3 (self):
+ if adonthell.gamedata_get_quest("demo").get_val
("work_4_shair") != 0:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (6)
+ self.cont.append (-1)
+ self.the_npc.set_val ("insulted", 1)
+
+ self.player.append (8)
+ self.cont.append (5)
+ self.player.append (-1)
+ else:
+
+ self.color = self.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 = self.the_npc.get_color()
- self.npc.append (7)
- self.cont.append (4)
+ 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 answer22 (self):
- pass
-
- def answer2 (self):
+ def answer11 (self):
self.color = self.the_npc.get_color()
- self.npc.append (3)
+ self.npc.append (15)
self.cont.append (-1)
- if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 2 == 2:
+ self.player.append (13)
+ self.cont.append (8)
+ self.player.append (16)
+ self.cont.append (10)
+ self.player.append (-1)
- self.player.append (12)
- self.cont.append (7)
- if adonthell.gamedata_get_quest("demo").get_val
("gem_worthless") & 1 == 1:
+ def answer12 (self):
+ self.the_npc.set_val ("insulted", 1)
- self.player.append (10)
- self.cont.append (6)
- if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
+ self.color = 0
+ self.npc.append (14)
+ self.cont.append (9)
+ self.player.append (-1)
- self.player.append (4)
- self.cont.append (2)
+ def answer14 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (23)
+ self.cont.append (14)
self.player.append (-1)
- def answer10 (self):
+ def answer8 (self):
self.color = self.the_npc.get_color()
- self.npc.append (11)
+ 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):
- pass
+ self.color = self.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)
- [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 c0d92f8 138/237: Further cleaning up of dialogues, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a1e51e2 061/237: ADDED Jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8dd4ff 133/237: Finished map forest., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bcd3b16 141/237: FIXED previous commit of old stuff, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e167248 062/237: Fixed a bug in displaying bubbles, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 8e16709 166/237: ADDED some Barn <-> Silverhair teleport magic :), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 793fc3f 150/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 238ff56 140/237: FIXED spelling in init.py, Kai Sterker, 2016/07/25
- [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, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9bab4a2 103/237: REMOVED files that were no longer needed, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 148aeb5 129/237: Small corrections,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 eda8c0a 179/237: Added vine, and some events, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb9a718 182/237: ADDED extro cutscene, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a8dd0e9 117/237: More spelling fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 81fc2b9 109/237: Fixed some pink noise, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 32721fb 173/237: Spellchecked extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4f7fafa 208/237: Removed useless stuff, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 2affe60 115/237: Oops! Forgot that one..., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 365c99f 100/237: Added Alek and Jelom, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f5cbecf 142/237: FIXED spelling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 662757a 091/237: FIXED a small bug in the python console, Kai Sterker, 2016/07/25