[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 a447f09 156/237: FIXED some
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 a447f09 156/237: FIXED some small plot holes |
Date: |
Mon, 25 Jul 2016 18:15:08 +0000 (UTC) |
tag: Release_0-3-1
commit a447f09a42496ab20227b2cf199667f2bf9a5bc0
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED some small plot holes
---
scripts/dialogues/bjarn_start.py | 6 +-
scripts/dialogues/extro.py | 97 +++++++--
scripts/dialogues/jelom_2nd.py | 6 +-
scripts/dialogues/jelom_start.py | 2 +-
scripts/dialogues/orloth_start.py | 48 ++++-
scripts/dialogues/talan_start.py | 412 +++++++++++++++++++------------------
6 files changed, 343 insertions(+), 228 deletions(-)
diff --git a/scripts/dialogues/bjarn_start.py b/scripts/dialogues/bjarn_start.py
index 8c39df7..724ab80 100755
--- a/scripts/dialogues/bjarn_start.py
+++ b/scripts/dialogues/bjarn_start.py
@@ -2,7 +2,7 @@ import adonthell
class bjarn_start:
loop = []
- strings = ["You try the door, but find it locked. From within the room
you hear a deep voice.", "At the door to their room, Erek produces a key and
unlocks it.", "Maybe I should not be doing this, but I do want my master to get
his stones back.", "I do not wish to be disturbed right now, so please go away!
First I am burgled, and now I can get no peace with all the busybodies running
around, making my tragedy their business!", "Erek, who is this, and why have
you let him in?", "This is [...]
+ strings = ["You try the door, but find it locked. From within the room
you hear a deep voice.", "At the door to their room, Erek produces a key and
unlocks it.", "Maybe I should not be doing this, but I do want my master to get
his stones back.", "I do not wish to be disturbed right now, so please go away!
First I am burgled, and now I can get no peace with all the busybodies running
around, making my tragedy their business!", "Erek, who is this, and why have
you let him in?", "This is [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class bjarn_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer4, self.answer6, self.answer8, self.answer10,
self.answer11, self.answer12, self.answer14, self.answer15, self.answer16,
self.answer18, self.answer22, self.answer23, self.answer25, self.answer26,
self.answer29, self.answer30, self.answer33, self.answer34, self.answer35,
self.answer37, self.answer39, self.answer40, self.answer42, self.answer43,
self.answer46, self.answer47, self.answer102, None]
+ self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer4, self.answer6, self.answer8, self.answer10,
self.answer11, self.answer12, self.answer14, self.answer15, self.answer16,
self.answer18, self.answer22, self.answer23, self.answer25, self.answer26,
self.answer29, self.answer30, self.answer33, self.answer34, self.answer35,
self.answer37, self.answer39, self.answer40, self.answer42, self.answer43,
self.answer46, self.answer47, self.answer50, None]
def clear (self):
del self.dialogue
@@ -305,7 +305,7 @@ class bjarn_start:
self.cont.append (30)
self.player.append (-1)
- def answer102 (self):
+ def answer50 (self):
self.color = self.the_npc.get_color()
self.npc.append (41)
self.cont.append (-1)
diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
index 30baac2..ecd1291 100644
--- a/scripts/dialogues/extro.py
+++ b/scripts/dialogues/extro.py
@@ -2,7 +2,7 @@ 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. [...]
+ 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
@@ -17,7 +17,7 @@ class extro:
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]
+ self.dialogue = [self.start, self.answer0, self.answer1,
self.answer2, self.answer3, self.answer4, self.answer8, self.answer10,
self.answer11, self.answer12, self.answer13, self.answer14, self.answer15,
self.answer16, self.answer17, self.answer19, self.answer20, self.answer21,
self.answer23, self.answer56, self.answer58, self.answer63, self.answer69,
self.answer71, self.answer74, None]
def clear (self):
del self.dialogue
@@ -84,57 +84,57 @@ class extro:
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 (11)
+ self.cont.append (8)
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.cont.append (9)
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.cont.append (10)
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.cont.append (11)
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.cont.append (12)
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.cont.append (13)
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.cont.append (14)
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.cont.append (15)
self.player.append (-1)
def answer19 (self):
@@ -143,9 +143,9 @@ class extro:
self.npc.append (18)
self.cont.append (-1)
self.player.append (20)
- self.cont.append (-1)
+ self.cont.append (16)
self.player.append (21)
- self.cont.append (15)
+ self.cont.append (17)
self.player.append (-1)
def answer21 (self):
@@ -153,7 +153,7 @@ class extro:
self.npc.append (22)
self.cont.append (-1)
self.player.append (23)
- self.cont.append (16)
+ self.cont.append (18)
self.player.append (24)
self.cont.append (-1)
self.player.append (-1)
@@ -165,17 +165,78 @@ class extro:
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (25)
self.cont.append (-1)
- self.player.append (26)
+ self.player.append (-1)
+
+ def answer20 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (36)
+ self.cont.append (24)
+ self.player.append (-1)
+
+ def answer74 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (37)
+ self.cont.append (-1)
+ self.player.append (38)
self.cont.append (-1)
self.player.append (-1)
- def answer26 (self):
+ def answer78 (self):
pass
- def answer20 (self):
+ def answer10 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (26)
+ self.cont.append (-1)
+ self.player.append (27)
+ self.cont.append (-1)
+ self.player.append (28)
+ self.cont.append (19)
+ self.player.append (-1)
+
+ def answer56 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (29)
+ self.cont.append (20)
+ self.player.append (-1)
+
+ def answer58 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (30)
+ self.cont.append (-1)
+ self.player.append (20)
+ self.cont.append (16)
+ self.player.append (31)
+ self.cont.append (21)
+ self.player.append (-1)
+
+ def answer63 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (32)
+ self.cont.append (-1)
+ self.player.append (33)
+ self.cont.append (-1)
+ self.player.append (34)
+ self.cont.append (22)
+ self.player.append (-1)
+
+ def answer69 (self):
+ self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
+ self.npc.append (35)
+ self.cont.append (23)
+ self.player.append (-1)
+
+ def answer71 (self):
+ self.set_npc ("Erek Stonebreaker")
+ self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
+ self.npc.append (13)
+ self.cont.append (10)
+ self.player.append (-1)
+
+ def answer67 (self):
pass
- def answer10 (self):
+ def answer54 (self):
pass
def answer7 (self):
diff --git a/scripts/dialogues/jelom_2nd.py b/scripts/dialogues/jelom_2nd.py
index d1df0cf..f0c5cc7 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -2,7 +2,7 @@ import adonthell
class jelom_2nd:
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 = ["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 [...]
def set_name (self, new_name):
pass
@@ -120,14 +120,12 @@ class jelom_2nd:
self.player.append (-1)
def answer34 (self):
- self.set_npc ("Erek Stonebreaker")
- self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
+ self.color = self.the_npc.get_color()
self.npc.append (35)
self.cont.append (21)
self.player.append (-1)
def answer35 (self):
- self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (36)
self.cont.append (-1)
diff --git a/scripts/dialogues/jelom_start.py b/scripts/dialogues/jelom_start.py
index 7b7b740..bbb7dd3 100644
--- a/scripts/dialogues/jelom_start.py
+++ b/scripts/dialogues/jelom_start.py
@@ -2,7 +2,7 @@ import adonthell
class jelom_start:
loop = []
- strings = ["Halt there! No-one is allowed into the prisoner's room!",
"Stop right there, half-elf! You know that you are not allowed in there!",
"No-one is allowed into the prisoner's room, so please leave this hallway!",
"You again, half-elf? What do you want this time?", "Ah, you must be Jelom.
Talan told me that I could find you here.", "And just who are you to prevent me
from entering, sir?", "Nice to see you again, Jelom. Look, I have some more
questions for you.", "Look, Jelom, I [...]
+ strings = ["Halt there! No-one is allowed into the prisoner's room!",
"Stop right there, half-elf! You know that you are not allowed in there!",
"No-one is allowed into the prisoner's room, so please leave this hallway!",
"You again, half-elf? What do you want this time?", "Ah, you must be Jelom.
Talan told me that I could find you here.", "And just who are you to prevent me
from entering, sir?", "Nice to see you again, Jelom. Look, I have some more
questions for you.", "Look, Jelom, I [...]
def set_name (self, new_name):
pass
diff --git a/scripts/dialogues/orloth_start.py
b/scripts/dialogues/orloth_start.py
index ad200cd..aa157b1 100755
--- a/scripts/dialogues/orloth_start.py
+++ b/scripts/dialogues/orloth_start.py
@@ -2,7 +2,7 @@ import adonthell
class orloth_start:
loop = []
- strings = ["This is seemingly the Innkeeper and owner of the place. He
appears to be lost in thought and from his eyes you can see that he hasn't
slept much lately. His worried face brightens up though as you approach, and
his voice is warm and friendly:", "Welcome to Waste's Edge, traveller. Here you
shall find the pleasures of a hot meal and bath if you desire. And safe and
comfortable lodging. Although, I fear, this is no longer granted for sure.
You've chosen troublesome times for y [...]
+ strings = ["This is seemingly the Innkeeper and owner of the place. He
appears to be lost in thought and from his eyes you can see that he hasn't
slept much lately. His worried face brightens up as you approach, and his voice
is warm and friendly:", "Welcome to Waste's Edge, traveller. Here you shall
find the pleasures of a hot meal and bath if you desire. And safe and
comfortable lodging.", "But excuse me sir, I talk and talk and haven't even
introduced myself. Orloth's the name, sir. [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class orloth_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer0, self.answer1,
self.answer3, self.answer4, self.answer6, self.answer7, self.answer9,
self.answer10, self.answer11, self.answer13, self.answer15, self.answer16,
self.answer17, self.answer18, self.answer20, self.answer21, self.answer22,
self.answer24, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer35, self.answer37, self.answer38, self.answer40,
self.answer42, self.answer43, self.answer45, self.answer46, sel [...]
+ self.dialogue = [self.start, self.answer0, self.answer1,
self.answer3, self.answer4, self.answer6, self.answer7, self.answer9,
self.answer10, self.answer11, self.answer13, self.answer15, self.answer16,
self.answer17, self.answer18, self.answer20, self.answer21, self.answer22,
self.answer24, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer35, self.answer37, self.answer38, self.answer40,
self.answer42, self.answer43, self.answer45, self.answer46, sel [...]
def clear (self):
del self.dialogue
@@ -70,10 +70,18 @@ class orloth_start:
self.color = self.the_npc.get_color()
self.npc.append (31)
self.cont.append (-1)
- self.player.append (40)
- self.cont.append (27)
- self.player.append (81)
- self.cont.append (59)
+ if adonthell.gamedata_get_quest("demo").get_val
("silverhair_free") == 1:
+
+ self.player.append (118)
+ self.cont.append (88)
+ elif adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0:
+
+ self.player.append (40)
+ self.cont.append (27)
+ else:
+
+ self.player.append (81)
+ self.cont.append (59)
self.player.append (-1)
def answer81 (self):
@@ -738,6 +746,28 @@ class orloth_start:
self.cont.append (29)
self.player.append (-1)
+ def answer257 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (41)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val
("complain_about_wastesedge") == 1:
+
+ self.player.append (42)
+ self.cont.append (28)
+ if self.introduce_guests == 0:
+
+ self.player.append (46)
+ self.cont.append (31)
+ if self.the_npc.get_val ("explain_events") == 0:
+
+ self.player.append (45)
+ self.cont.append (30)
+ if self.the_npc.get_val ("explain_events") == 1 and
self.first_run != 1:
+
+ self.player.append (43)
+ self.cont.append (29)
+ self.player.append (-1)
+
def answer0 (self):
self.color = self.the_npc.get_color()
self.npc.append (1)
@@ -746,6 +776,12 @@ class orloth_start:
def answer1 (self):
self.color = self.the_npc.get_color()
+ self.npc.append (117)
+ self.cont.append (87)
+ self.player.append (-1)
+
+ def answer117 (self):
+ self.color = self.the_npc.get_color()
self.npc.append (2)
self.cont.append (-1)
self.player.append (3)
diff --git a/scripts/dialogues/talan_start.py b/scripts/dialogues/talan_start.py
index f25b044..3f67ecb 100755
--- a/scripts/dialogues/talan_start.py
+++ b/scripts/dialogues/talan_start.py
@@ -2,7 +2,7 @@ import adonthell
class talan_start:
loop = []
- strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about
that fuss at the gate. I hope you will not hold it against me.", "Please, my
good man, do not mention it again. I assure you that I hold no grudge against
you. Now, if we may go on to the business at hand?", "Oh... that. Yes, how may
I help you?", "Hello, Talan. Look, I have a couple questions about the theft.",
"Well, can you tell me what happened on the night of the theft?", "In the
morning, of course, I heard that [...]
+ strings = ["Oh, hullo again, $name.", "Listen, I really am sorry about
that fuss at the gate. I hope you will not hold it against me.", "Please do not
mention it again. I assure you that I hold no grudge against you.", "Oh...
that. Yes, how may I help you?", "Hello, Talan. Look, I have a couple more
questions about the theft.", "In the morning, of course, I heard that Master
Fingolson's gems had been stolen and that Lady Silverhair was suspected of the
theft.", "So you did not see or he [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class talan_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer2, self.answer4,
self.answer5, self.answer7, self.answer8, self.answer11, self.answer12,
self.answer14, self.answer16, self.answer19, self.answer21, self.answer24,
self.answer26, self.answer28, self.answer29, self.answer30, self.answer32,
self.answer33, self.answer36, self.answer37, self.answer40, self.answer45,
self.answer50, self.answer51, self.answer52, self.answer55, self.answer56,
self.answer57, self.answer58, self.answer59, self.answer61, s [...]
+ self.dialogue = [self.start, self.answer2, self.answer4,
self.answer6, self.answer7, self.answer10, self.answer11, self.answer13,
self.answer15, self.answer18, self.answer20, self.answer23, self.answer25,
self.answer27, self.answer28, self.answer29, self.answer31, self.answer32,
self.answer35, self.answer36, self.answer39, self.answer44, self.answer49,
self.answer50, self.answer51, self.answer54, self.answer55, self.answer56,
self.answer57, self.answer58, self.answer60, self.answer61, [...]
def clear (self):
del self.dialogue
@@ -32,12 +32,12 @@ class talan_start:
self.dialogue[answer]()
def start (self):
- if self.the_npc.get_val( "apologised" ) != 1:
+ if self.the_npc.get_val ("apologised") != 1:
self.color = self.the_npc.get_color()
self.npc.append (1)
self.cont.append (-1)
- self.the_npc.set_val( "apologised", 1 );
+ self.the_npc.set_val ("apologised" , 1)
self.player.append (2)
self.cont.append (1)
@@ -49,8 +49,8 @@ class talan_start:
self.cont.append (-1)
if adonthell.gamedata_get_quest("demo").get_val
("know_talan_singing") == 1 and self.the_npc.get_val ("heard_nothing") == 1:
- self.player.append (14)
- self.cont.append (8)
+ self.player.append (13)
+ self.cont.append (7)
else:
self.player.append (4)
@@ -59,42 +59,48 @@ class talan_start:
else:
self.color = self.the_npc.get_color()
- self.npc.append (44)
+ self.npc.append (43)
self.cont.append (-1)
- self.player.append (45)
- self.cont.append (22)
+ self.player.append (44)
+ self.cont.append (21)
self.player.append (-1)
- def answer45 (self):
+ def answer44 (self):
if adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") != 1:
self.color = self.the_npc.get_color()
- self.npc.append (46)
+ self.npc.append (45)
self.cont.append (-1)
- self.player.append (49)
+ self.player.append (48)
self.cont.append (-1)
- self.player.append (62)
- self.cont.append (32)
+ self.player.append (61)
+ self.cont.append (31)
self.player.append (-1)
else:
self.color = self.the_npc.get_color()
- self.npc.append (47)
+ self.npc.append (46)
self.cont.append (-1)
- self.player.append (48)
+ self.player.append (47)
self.cont.append (-1)
self.player.append (-1)
- def answer48 (self):
+ def answer47 (self):
pass
+ def answer61 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (62)
+ self.cont.append (32)
+ self.player.append (-1)
+
def answer62 (self):
self.color = self.the_npc.get_color()
- self.npc.append (63)
- self.cont.append (33)
+ self.npc.append (49)
+ self.cont.append (22)
self.player.append (-1)
- def answer63 (self):
+ def answer49 (self):
self.color = self.the_npc.get_color()
self.npc.append (50)
self.cont.append (23)
@@ -109,381 +115,395 @@ class talan_start:
def answer51 (self):
self.color = self.the_npc.get_color()
self.npc.append (52)
- self.cont.append (25)
- self.player.append (-1)
-
- def answer52 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (53)
self.cont.append (-1)
- self.player.append (54)
+ self.player.append (53)
self.cont.append (-1)
self.player.append (-1)
- def answer54 (self):
+ def answer53 (self):
pass
- def answer49 (self):
+ def answer48 (self):
pass
def answer4 (self):
self.color = self.the_npc.get_color()
self.npc.append (3)
self.cont.append (-1)
- self.player.append (5)
- self.cont.append (3)
+ self.player.append (76)
+ self.cont.append (41)
+ self.player.append (75)
+ self.cont.append (40)
if adonthell.gamedata_get_quest("demo").get_val
("know_alek_eavesdrop") == 1:
- self.player.append (11)
- self.cont.append (6)
+ self.player.append (10)
+ self.cont.append (5)
self.player.append (-1)
- def answer11 (self):
+ def answer10 (self):
self.color = self.the_npc.get_color()
- self.npc.append (12)
- self.cont.append (7)
+ self.npc.append (11)
+ self.cont.append (6)
self.player.append (-1)
- def answer12 (self):
+ def answer11 (self):
self.color = self.the_npc.get_color()
- self.npc.append (13)
+ self.npc.append (12)
self.cont.append (-1)
- self.player.append (10)
+ self.player.append (9)
self.cont.append (-1)
- self.player.append (5)
- self.cont.append (3)
+ self.player.append (75)
+ self.cont.append (40)
+ self.player.append (76)
+ self.cont.append (41)
self.player.append (-1)
- def answer10 (self):
+ def answer9 (self):
pass
- def answer5 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (73)
- self.cont.append (39)
- self.player.append (-1)
-
- def answer73 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (6)
- self.cont.append (-1)
- self.player.append (7)
- self.cont.append (4)
- self.player.append (24)
- self.cont.append (12)
- self.player.append (-1)
-
- def answer24 (self):
+ def answer162 (self):
self.color = self.the_npc.get_color()
- self.npc.append (25)
+ self.npc.append (24)
self.cont.append (-1)
- self.player.append (59)
- self.cont.append (30)
+ self.player.append (58)
+ self.cont.append (29)
if adonthell.gamedata_get_quest("demo").get_val
("know_low_quality") == 1:
- self.player.append (26)
- self.cont.append (13)
+ self.player.append (25)
+ self.cont.append (12)
self.player.append (-1)
- def answer26 (self):
+ def answer25 (self):
self.color = self.the_npc.get_color()
- self.npc.append (27)
+ self.npc.append (26)
self.cont.append (-1)
if adonthell.gamedata_get_quest("demo").get_val ("know_jelom")
!= 2:
- self.player.append (29)
- self.cont.append (15)
- else:
-
self.player.append (28)
self.cont.append (14)
+ else:
+
+ self.player.append (27)
+ self.cont.append (13)
self.player.append (-1)
- def answer28 (self):
+ def answer27 (self):
self.color = self.the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (30)
self.cont.append (-1)
- self.player.append (32)
- self.cont.append (17)
+ self.player.append (31)
+ self.cont.append (16)
self.player.append (-1)
- def answer32 (self):
+ def answer31 (self):
self.color = self.the_npc.get_color()
- self.npc.append (34)
+ self.npc.append (33)
self.cont.append (-1)
- self.player.append (56)
- self.cont.append (27)
+ self.player.append (55)
+ self.cont.append (26)
if adonthell.gamedata_get_quest("demo").get_val
("know_bjarns_insult") == 1:
- self.player.append (33)
- self.cont.append (18)
+ self.player.append (32)
+ self.cont.append (17)
self.player.append (-1)
- def answer33 (self):
+ def answer32 (self):
self.color = self.the_npc.get_color()
- self.npc.append (35)
+ self.npc.append (34)
self.cont.append (-1)
- self.player.append (58)
- self.cont.append (29)
- self.player.append (36)
- self.cont.append (19)
+ self.player.append (57)
+ self.cont.append (28)
+ self.player.append (35)
+ self.cont.append (18)
self.player.append (-1)
- def answer36 (self):
+ def answer35 (self):
self.color = self.the_npc.get_color()
- self.npc.append (57)
- self.cont.append (28)
+ self.npc.append (56)
+ self.cont.append (27)
self.player.append (-1)
- def answer57 (self):
+ def answer56 (self):
if adonthell.gamedata_get_quest("demo").get_val ("know_jelom")
!= 2:
self.color = self.the_npc.get_color()
- self.npc.append (38)
+ self.npc.append (37)
self.cont.append (-1)
- self.player.append (40)
- self.cont.append (21)
- self.player.append (43)
+ self.player.append (39)
+ self.cont.append (20)
+ self.player.append (42)
self.cont.append (-1)
self.player.append (-1)
else:
self.color = self.the_npc.get_color()
- self.npc.append (39)
+ self.npc.append (38)
self.cont.append (-1)
- self.player.append (41)
+ self.player.append (40)
self.cont.append (-1)
self.player.append (-1)
- def answer41 (self):
+ def answer40 (self):
pass
- def answer43 (self):
+ def answer42 (self):
pass
- def answer40 (self):
+ def answer39 (self):
self.color = self.the_npc.get_color()
- self.npc.append (42)
+ self.npc.append (41)
self.cont.append (-1)
- self.player.append (43)
+ self.player.append (42)
self.cont.append (-1)
self.player.append (-1)
- def answer58 (self):
+ def answer57 (self):
self.color = self.the_npc.get_color()
- self.npc.append (37)
- self.cont.append (20)
+ self.npc.append (36)
+ self.cont.append (19)
self.player.append (-1)
- def answer37 (self):
+ def answer36 (self):
if adonthell.gamedata_get_quest("demo").get_val ("know_jelom")
!= 2:
self.color = self.the_npc.get_color()
- self.npc.append (38)
+ self.npc.append (37)
self.cont.append (-1)
- self.player.append (40)
- self.cont.append (21)
- self.player.append (43)
+ self.player.append (39)
+ self.cont.append (20)
+ self.player.append (42)
self.cont.append (-1)
self.player.append (-1)
else:
self.color = self.the_npc.get_color()
- self.npc.append (39)
+ self.npc.append (38)
self.cont.append (-1)
- self.player.append (41)
+ self.player.append (40)
self.cont.append (-1)
self.player.append (-1)
- def answer56 (self):
+ def answer55 (self):
self.color = self.the_npc.get_color()
- self.npc.append (37)
- self.cont.append (20)
+ self.npc.append (36)
+ self.cont.append (19)
self.player.append (-1)
- def answer29 (self):
+ def answer28 (self):
self.color = self.the_npc.get_color()
- self.npc.append (30)
- self.cont.append (16)
+ self.npc.append (29)
+ self.cont.append (15)
adonthell.gamedata_get_quest("demo").set_val ("know_jelom" , 1)
self.player.append (-1)
- def answer30 (self):
+ def answer29 (self):
self.color = self.the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (30)
self.cont.append (-1)
- self.player.append (32)
- self.cont.append (17)
+ self.player.append (31)
+ self.cont.append (16)
self.player.append (-1)
- def answer59 (self):
+ def answer58 (self):
self.color = self.the_npc.get_color()
- self.npc.append (60)
+ self.npc.append (59)
self.cont.append (-1)
if adonthell.gamedata_get_quest("demo").get_val ("know_jelom")
!= 2:
- self.player.append (29)
- self.cont.append (15)
+ self.player.append (28)
+ self.cont.append (14)
else:
- self.player.append (61)
- self.cont.append (31)
+ self.player.append (60)
+ self.cont.append (30)
self.player.append (-1)
- def answer61 (self):
+ def answer60 (self):
self.color = self.the_npc.get_color()
- self.npc.append (31)
+ self.npc.append (30)
self.cont.append (-1)
- self.player.append (32)
- self.cont.append (17)
+ self.player.append (31)
+ self.cont.append (16)
self.player.append (-1)
- def answer7 (self):
+ def answer165 (self):
self.color = self.the_npc.get_color()
- self.npc.append (8)
- self.cont.append (5)
+ self.npc.append (7)
+ self.cont.append (4)
self.the_npc.set_val ("heard_nothing" , 1)
self.player.append (-1)
- def answer8 (self):
+ def answer7 (self):
self.color = self.the_npc.get_color()
- self.npc.append (9)
+ self.npc.append (8)
self.cont.append (-1)
- self.player.append (10)
+ self.player.append (9)
self.cont.append (-1)
- self.player.append (24)
- self.cont.append (12)
+ self.player.append (23)
+ self.cont.append (11)
if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
- self.player.append (68)
- self.cont.append (37)
+ self.player.append (67)
+ self.cont.append (36)
if adonthell.gamedata_get_quest("demo").get_val
("know_talan_singing") == 1 and adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") != 1:
- self.player.append (55)
- self.cont.append (26)
+ self.player.append (54)
+ self.cont.append (25)
if adonthell.gamedata_get_quest("demo").get_val
("know_alek_eavesdrop") == 1:
- self.player.append (11)
- self.cont.append (6)
+ self.player.append (10)
+ self.cont.append (5)
self.player.append (-1)
- def answer55 (self):
+ def answer54 (self):
self.color = self.the_npc.get_color()
- self.npc.append (15)
+ self.npc.append (14)
self.cont.append (-1)
- self.player.append (16)
- self.cont.append (9)
- self.player.append (64)
- self.cont.append (34)
+ self.player.append (15)
+ self.cont.append (8)
+ self.player.append (63)
+ self.cont.append (33)
self.player.append (-1)
- def answer64 (self):
+ def answer63 (self):
self.color = self.the_npc.get_color()
- self.npc.append (66)
+ self.npc.append (65)
self.cont.append (-1)
- self.player.append (67)
- self.cont.append (36)
+ self.player.append (66)
+ self.cont.append (35)
if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
- self.player.append (68)
- self.cont.append (37)
+ self.player.append (67)
+ self.cont.append (36)
self.player.append (-1)
- def answer67 (self):
+ def answer66 (self):
self.color = self.the_npc.get_color()
- self.npc.append (18)
+ self.npc.append (17)
self.cont.append (-1)
- self.player.append (19)
- self.cont.append (10)
+ self.player.append (18)
+ self.cont.append (9)
self.player.append (-1)
- def answer19 (self):
+ def answer18 (self):
self.color = self.the_npc.get_color()
- self.npc.append (20)
+ self.npc.append (19)
self.cont.append (-1)
- self.player.append (71)
- self.cont.append (38)
+ self.player.append (70)
+ self.cont.append (37)
self.player.append (-1)
- def answer71 (self):
+ def answer70 (self):
self.color = self.the_npc.get_color()
- self.npc.append (72)
+ self.npc.append (71)
self.cont.append (-1)
adonthell.gamedata_get_quest("demo").set_val
("know_talan_singing" , 2)
self.player.append (-1)
- def answer16 (self):
+ def answer15 (self):
self.color = self.the_npc.get_color()
- self.npc.append (17)
+ self.npc.append (16)
self.cont.append (-1)
- self.player.append (65)
- self.cont.append (35)
self.player.append (64)
self.cont.append (34)
+ self.player.append (63)
+ self.cont.append (33)
self.player.append (-1)
- def answer65 (self):
+ def answer64 (self):
self.color = self.the_npc.get_color()
- self.npc.append (18)
+ self.npc.append (17)
self.cont.append (-1)
- self.player.append (19)
- self.cont.append (10)
+ self.player.append (18)
+ self.cont.append (9)
self.player.append (-1)
- def answer68 (self):
+ def answer67 (self):
self.color = self.the_npc.get_color()
- self.npc.append (69)
+ self.npc.append (68)
self.cont.append (-1)
if adonthell.gamedata_get_quest("demo").get_val
("know_talan_singing") == 1:
- self.player.append (21)
- self.cont.append (11)
+ self.player.append (20)
+ self.cont.append (10)
else:
- self.player.append (70)
+ self.player.append (69)
self.cont.append (-1)
self.player.append (-1)
- def answer70 (self):
+ def answer69 (self):
pass
- def answer21 (self):
+ def answer20 (self):
self.color = self.the_npc.get_color()
- self.npc.append (22)
+ self.npc.append (21)
self.cont.append (-1)
- self.player.append (23)
+ self.player.append (22)
self.cont.append (-1)
self.player.append (-1)
- def answer23 (self):
+ def answer22 (self):
adonthell.gamedata_get_quest("demo").set_val
("know_talan_singing" , 2)
pass
- def answer14 (self):
+ def answer23 (self):
self.color = self.the_npc.get_color()
- self.npc.append (15)
+ self.npc.append (24)
self.cont.append (-1)
- self.player.append (16)
- self.cont.append (9)
- self.player.append (64)
- self.cont.append (34)
+ self.player.append (58)
+ self.cont.append (29)
+ if adonthell.gamedata_get_quest("demo").get_val
("know_low_quality") == 1:
+
+ self.player.append (25)
+ self.cont.append (12)
+ self.player.append (-1)
+
+ def answer13 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (14)
+ self.cont.append (-1)
+ self.player.append (15)
+ self.cont.append (8)
+ self.player.append (63)
+ self.cont.append (33)
self.player.append (-1)
def answer2 (self):
self.color = self.the_npc.get_color()
- self.npc.append (3)
+ self.npc.append (73)
+ self.cont.append (-1)
+ self.player.append (74)
+ self.cont.append (39)
+ self.player.append (-1)
+
+ def answer159 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (72)
+ self.cont.append (38)
+ self.player.append (-1)
+
+ def answer72 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (5)
self.cont.append (-1)
- self.player.append (5)
+ self.player.append (6)
self.cont.append (3)
- if adonthell.gamedata_get_quest("demo").get_val
("know_alek_eavesdrop") == 1:
+ self.player.append (23)
+ self.cont.append (11)
+ self.player.append (-1)
+
+ def answer6 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (7)
+ self.cont.append (4)
+ self.the_npc.set_val ("heard_nothing" , 1)
- self.player.append (11)
- self.cont.append (6)
self.player.append (-1)
- [adonthell-wastesedge-commits] Release_0-3-1 623d0fc 190/237: *** empty log message ***, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 623d0fc 190/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b27fa89 169/237: FIXED Erek's dialogue (I hope), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4306c41 202/237: FIXED Running Alek, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f286520 193/237: ADDED line about Frostbloom's noise, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cfc73d0 039/237: ADDED Alek Endhelm, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfabd4e 205/237: REMIXED some of the tunes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 6f37ab3 213/237: MADE Veranda fully walkable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5b397b2 207/237: Varanda is now walkable, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9b0ce0b 233/237: Fixed running alek animation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11fcf14 167/237: ADDED Searching of Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 a447f09 156/237: FIXED some small plot holes,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 b2d5538 216/237: ADDED two more action events, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 de63776 087/237: Experimental Python scripting, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5975389 197/237: Fixed a typo, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 95f5a33 223/237: FIXED some typos, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4d12cf8 222/237: FIXED error message at startup, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 397f0ce 209/237: Tuned the extro a bit, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3727a0b 224/237: ADDED final versions of the demo songs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a54bfe 200/237: RESTRUCTURED Jelom a little, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 049cceb 174/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 01380a3 221/237: Tuned intro & extro, Kai Sterker, 2016/07/25