[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues |
|
Date: |
Mon, 25 Jul 2016 18:15:12 +0000 (UTC) |
tag: Release_0-3-1
commit c5443011833e74b5c8e8cfca0a0aa2c6f5ca2c32
Author: adondev <adondev>
Commit: adondev <adondev>
Some fixes to some dialogues
---
scripts/dialogues/extro.py | 1 -
scripts/dialogues/frostbloom_start.py | 87 ++++++++++++++++++++-------------
scripts/dialogues/lucia_start.py | 28 ++++++-----
3 files changed, 69 insertions(+), 47 deletions(-)
diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
index 3af0229..4a4d550 100644
--- a/scripts/dialogues/extro.py
+++ b/scripts/dialogues/extro.py
@@ -43,7 +43,6 @@ class extro:
self.player.append (-1)
def answer0 (self):
- if 1 == 0:
self.set_npc ("Jelom Rasgar")
self.color = adonthell.gamedata_get_character("Jelom
Rasgar").get_color()
self.npc.append (1)
diff --git a/scripts/dialogues/frostbloom_start.py
b/scripts/dialogues/frostbloom_start.py
index 5e845a6..5c21806 100755
--- a/scripts/dialogues/frostbloom_start.py
+++ b/scripts/dialogues/frostbloom_start.py
@@ -2,7 +2,7 @@ import adonthell
class frostbloom_start:
loop = []
- strings = ["Hm? What do you want?", "I am a servant of Lady Imoen
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care
what you wish to ask. Now go away. The Yeti of my soul must have silence.",
"You again? I thought I told you to leave me alone.", "But lady, I must ask
you about the theft...", "The theft? You mean your theft of my precious time,
when I could be receiving inspiration? I've lost enough of that already, thank
you. Now be gone, silly servant, [...]
+ strings = ["Hm? What do you want?", "I am a servant of Lady Imoen
Silverhair, and I'd like to ask ...", "I know who you are, and I do not care
what you wish to ask. Now go away. The Yeti of my soul must have silence.",
"You again? I thought I told you to leave me alone.", "But lady, I must ask
you about the theft...", "The theft? You mean your theft of my precious time,
when I could be receiving inspiration? I've lost enough of that already, thank
you. Now be gone, silly servant, [...]
def set_name (self, new_name):
pass
@@ -17,7 +17,7 @@ class frostbloom_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer1, self.answer4,
self.answer6, self.answer8, self.answer9, self.answer12, self.answer14,
self.answer16, self.answer18, self.answer19, self.answer21, self.answer23,
self.answer24, self.answer26, self.answer27, self.answer32, self.answer33,
self.answer34, self.answer37, self.answer38, self.answer41, self.answer44, None]
+ self.dialogue = [self.start, self.answer1, self.answer4,
self.answer6, self.answer8, self.answer9, self.answer12, self.answer14,
self.answer16, self.answer18, self.answer19, self.answer21, self.answer23,
self.answer24, self.answer26, self.answer27, self.answer28, self.answer32,
self.answer33, self.answer34, self.answer37, self.answer38, self.answer41,
self.answer44, None]
def clear (self):
del self.dialogue
@@ -34,6 +34,7 @@ class frostbloom_start:
def start (self):
if self.the_npc.get_val ("flattered") == 1:
+ self.set_npc ("Rhayne Frostbloom")
self.color = adonthell.gamedata_get_character("Rhayne
Frostbloom").get_color()
self.npc.append (35)
self.cont.append (-1)
@@ -42,22 +43,24 @@ class frostbloom_start:
self.player.append (27)
self.cont.append (15)
self.player.append (44)
- self.cont.append (22)
+ self.cont.append (23)
self.player.append (-1)
if self.the_npc.get_val ("flattered") == 2:
+ self.set_npc ("Rhayne Frostbloom")
self.color = adonthell.gamedata_get_character("Rhayne
Frostbloom").get_color()
self.npc.append (31)
self.cont.append (-1)
self.player.append (32)
- self.cont.append (16)
- self.player.append (33)
self.cont.append (17)
- self.player.append (34)
+ self.player.append (33)
self.cont.append (18)
+ self.player.append (34)
+ self.cont.append (19)
self.player.append (-1)
if adonthell.gamedata_get_quest("demo").get_val
("talked_about_yeti") == 1 and self.the_npc.get_val ("flattered") == 0:
+ self.set_npc ("Rhayne Frostbloom")
self.color = adonthell.gamedata_get_character("Rhayne
Frostbloom").get_color()
self.npc.append (11)
self.cont.append (-1)
@@ -66,6 +69,7 @@ class frostbloom_start:
self.player.append (-1)
if self.the_npc.get_val ("talked_to") == 1 and
adonthell.gamedata_get_quest("demo").get_val ("talked_about_yeti") == 0:
+ self.set_npc ("Rhayne Frostbloom")
self.color = adonthell.gamedata_get_character("Rhayne
Frostbloom").get_color()
self.npc.append (3)
self.cont.append (-1)
@@ -74,6 +78,7 @@ class frostbloom_start:
self.player.append (-1)
if self.the_npc.get_val ("talked_to") == 0:
+ self.set_npc ("Rhayne Frostbloom")
self.color = adonthell.gamedata_get_character("Rhayne
Frostbloom").get_color()
self.npc.append (0)
self.cont.append (-1)
@@ -101,7 +106,7 @@ class frostbloom_start:
self.player.append (-1)
def answer8 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = 0
self.npc.append (9)
self.cont.append (5)
@@ -141,7 +146,7 @@ class frostbloom_start:
self.player.append (-1)
def answer23 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = 0
self.npc.append (24)
self.cont.append (13)
@@ -156,11 +161,11 @@ class frostbloom_start:
self.player.append (27)
self.cont.append (15)
self.player.append (44)
- self.cont.append (22)
+ self.cont.append (23)
self.player.append (-1)
def answer18 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (30)
self.cont.append (-1)
@@ -175,7 +180,7 @@ class frostbloom_start:
self.player.append (-1)
def answer19 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (20)
self.cont.append (-1)
@@ -190,10 +195,10 @@ class frostbloom_start:
self.player.append (-1)
def answer34 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (41)
- self.cont.append (21)
+ self.cont.append (22)
self.player.append (-1)
def answer41 (self):
@@ -203,30 +208,36 @@ class frostbloom_start:
self.player.append (-1)
def answer33 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (40)
self.cont.append (-1)
self.player.append (-1)
def answer32 (self):
- self.set_npc (self.the_npc.get_name())
- self.color = self.the_npc.get_color()
- self.npc.append (36)
- self.cont.append (-1)
- self.player.append (37)
- self.cont.append (19)
- self.player.append (-1)
- self.set_npc (self.the_npc.get_name())
- self.color = self.the_npc.get_color()
- self.npc.append (39)
- self.cont.append (-1)
- self.player.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val ("know_noise")
!= 0:
+
+ self.set_npc (self.the_npc.get_id())
+ self.color = self.the_npc.get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (-1)
+ else:
+
+ self.set_npc (self.the_npc.get_id())
+ self.color = self.the_npc.get_color()
+ self.npc.append (36)
+ self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val
("know_noise" , adonthell.gamedata_get_quest("demo").get_val ("know_noise") | 2)
+
+ self.player.append (37)
+ self.cont.append (20)
+ self.player.append (-1)
def answer37 (self):
self.color = self.the_npc.get_color()
self.npc.append (38)
- self.cont.append (20)
+ self.cont.append (21)
self.player.append (-1)
def answer38 (self):
@@ -236,34 +247,40 @@ class frostbloom_start:
self.player.append (-1)
def answer44 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (28)
- self.cont.append (-1)
+ self.cont.append (16)
self.the_npc.set_val ("flattered" , 1)
self.player.append (-1)
+ def answer28 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (45)
+ self.cont.append (-1)
+ self.player.append (-1)
+
def answer27 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (29)
self.cont.append (-1)
self.the_npc.set_val ("flattered" , 2)
self.player.append (32)
- self.cont.append (16)
- self.player.append (33)
self.cont.append (17)
- self.player.append (34)
+ self.player.append (33)
self.cont.append (18)
+ self.player.append (34)
+ self.cont.append (19)
self.player.append (-1)
def answer26 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (28)
- self.cont.append (-1)
+ self.cont.append (16)
self.the_npc.set_val ("flattered" , 1)
self.player.append (-1)
diff --git a/scripts/dialogues/lucia_start.py b/scripts/dialogues/lucia_start.py
index 4bff6d3..645ee6f 100755
--- a/scripts/dialogues/lucia_start.py
+++ b/scripts/dialogues/lucia_start.py
@@ -2,7 +2,7 @@ import adonthell
class lucia_start:
loop = []
- strings = ["There is little doubt that this busy-looking woman is the
unchallenged mistress of the Redwyne household. As she spots you, a look of
resignation flashes across her face.", "You young people never learn to keep
out of my kitchen, do you?", "Sorry madam, I did not mean to trespass, but I
need to talk to you.", "I have no time for this, woman! I have some questions
for you.", "What questions? Don't you see I'm busy? Who's going to put the food
on the table, if I'm going to cha [...]
+ strings = ["There is little doubt that this busy-looking woman is the
unchallenged mistress of the Redwyne household. As she spots you, a look of
resignation flashes across her face.", "You young people never learn to keep
out of my kitchen, do you?", "Sorry madam, I did not mean to trespass, but I
need to talk to you.", "I have no time for this, woman! I have some questions
for you.", "What questions? Don't you see I'm busy? Who's going to put the food
on the table, if I'm going to cha [...]
def set_name (self, new_name):
pass
@@ -102,6 +102,7 @@ class lucia_start:
self.npc.append (90)
self.cont.append (55)
self.talked_about_fingolson = 1
+ self.asked_about_noise = 1
self.player.append (-1)
@@ -117,11 +118,11 @@ class lucia_start:
self.cont.append (-1)
self.player.append (18)
self.cont.append (11)
- if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0 and self.asked_about_noise == 1:
self.player.append (84)
self.cont.append (51)
- if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1 and self.asked_about_noise == 1:
self.player.append (67)
self.cont.append (42)
@@ -379,6 +380,7 @@ class lucia_start:
self.color = self.the_npc.get_color()
self.npc.append (54)
self.cont.append (35)
+ self.asked_about_noise = 1
self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
@@ -389,11 +391,11 @@ class lucia_start:
self.cont.append (-1)
self.player.append (56)
self.cont.append (36)
- if adonthell.gamedata_get_quest("demo").get_val ("know_noise")
!= 0:
+ if adonthell.gamedata_get_quest("demo").get_val ("know_noise")
!= 0 and self.asked_about_noise == 1:
self.player.append (84)
self.cont.append (51)
- if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1 and self.asked_about_noise == 1:
self.player.append (67)
self.cont.append (42)
@@ -479,11 +481,11 @@ class lucia_start:
self.cont.append (-1)
self.player.append (65)
self.cont.append (41)
- if adonthell.gamedata_get_quest("demo").get_val ("know_noise")
!= 0:
+ if adonthell.gamedata_get_quest("demo").get_val ("know_noise")
!= 0 and self.asked_about_noise == 1:
self.player.append (84)
self.cont.append (51)
- if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1 and self.asked_about_noise == 1:
self.player.append (67)
self.cont.append (42)
@@ -494,6 +496,7 @@ class lucia_start:
self.npc.append (16)
self.cont.append (10)
self.talked_about_fingolson = 1
+ self.asked_about_noise = 1
self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
@@ -510,11 +513,11 @@ class lucia_start:
self.cont.append (-1)
self.player.append (18)
self.cont.append (11)
- if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0 and self.asked_about_noise == 1:
self.player.append (84)
self.cont.append (51)
- if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1 and self.asked_about_noise == 1:
self.player.append (67)
self.cont.append (42)
@@ -687,6 +690,7 @@ class lucia_start:
self.color = self.the_npc.get_color()
self.npc.append (54)
self.cont.append (35)
+ self.asked_about_noise = 1
self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
@@ -715,11 +719,11 @@ class lucia_start:
self.cont.append (-1)
self.player.append (18)
self.cont.append (11)
- if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_noise") != 0 and self.asked_about_noise == 1:
self.player.append (84)
self.cont.append (51)
- if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("know_olivers_noise") == 1 and self.asked_about_noise == 1:
self.player.append (67)
self.cont.append (42)
@@ -738,6 +742,7 @@ class lucia_start:
self.npc.append (16)
self.cont.append (10)
self.talked_about_fingolson = 1
+ self.asked_about_noise = 1
self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
@@ -809,6 +814,7 @@ class lucia_start:
self.npc.append (16)
self.cont.append (10)
self.talked_about_fingolson = 1
+ self.asked_about_noise = 1
self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
- [adonthell-wastesedge-commits] Release_0-3-1 d62b800 105/237: FIXED bug in Talan's dialogue, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 d62b800 105/237: FIXED bug in Talan's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 16bc2fa 181/237: Added Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b2cc71d 135/237: Schregneugneu., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dcb7646 212/237: Continued veranda, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 919bce7 162/237: ADDED a few 'gimmicks' :), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 11da725 225/237: FIXED slight bug in Talan's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 219b786 155/237: UPDATED font colors a little, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 23c7a5b 120/237: FIXED wording, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 acd90d5 104/237: ADDED Tristan and Fellnir, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3bc0ac3 230/237: FIXED a little bug in Sarin's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 f47e582 148/237: FIXED start of new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b4a0e9c 073/237: Others furnitures added, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cdc0455 199/237: ADDED Ryan O'Neil to credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 12bc098 195/237: ADDED credits to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b770dc8 111/237: ADDED 'name your character' dialog that pops up when starting a new game, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5f31f05 215/237: Small fixes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c49550c 161/237: IMPROVED Erek slightly, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 06c1205 149/237: FIXED Python console, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray!, Kai Sterker, 2016/07/25