[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 238ff56 140/237: FIXED spel
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 238ff56 140/237: FIXED spelling in init.py |
Date: |
Mon, 25 Jul 2016 18:15:07 +0000 (UTC) |
tag: Release_0-3-1
commit 238ff5665f05dccdcc85bd4b974f9d8004d236bb
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED spelling in init.py
Small UPDATES to the dialogues
---
scripts/dialogues/alek_start.py | 2 +-
scripts/dialogues/erek_start.py | 45 ++++++++++----------------------------
scripts/dialogues/jelom_2nd.py | 37 +------------------------------
scripts/dialogues/lucia_start.py | 28 +++++++++++++++++++++---
scripts/init.py | 6 ++---
5 files changed, 42 insertions(+), 76 deletions(-)
diff --git a/scripts/dialogues/alek_start.py b/scripts/dialogues/alek_start.py
index 93009ea..5291e24 100755
--- a/scripts/dialogues/alek_start.py
+++ b/scripts/dialogues/alek_start.py
@@ -2,7 +2,7 @@ import adonthell
class alek_start:
loop = []
- strings = ["And who do we have here? A damn freak Half-Elf I say!",
"That's $name, you ass! I'm working for Lady Silverhair.", "For Lady
Silverhair, eh? Now that scares the shit out of me, Half-Elf. Go and bother
somebody else!", "I'll be damned if that's not our freakish Half-Elf! Still
pokin' your nose in other peoples business?", "Listen! Need we really go
through all this crap again?", "You're getting on my nerves, Half-Elf. Go ahead
then, ask your stupid questions.", "I don't like [...]
+ strings = ["And who do we have here? A damn freak Half-Elf I say!",
"That's $name, you ass! I'm working for Lady Silverhair.", "For Lady
Silverhair, eh? Now that scares the shit out of me, Half-Elf. Go and bother
somebody else!", "I'll be damned if that's not our freakish Half-Elf! Still
pokin' your nose in other peoples business?", "Listen! Need we really go
through all this crap again?", "You're getting on my nerves, Half-Elf. Go ahead
then, ask your stupid questions.", "I don't like [...]
def set_name (self, new_name):
pass
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index f032c6e..111cf90 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
@@ -39,16 +39,9 @@ class erek_start:
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):
@@ -93,7 +86,7 @@ class erek_start:
self.color = 0
self.npc.append (112)
- self.cont.append (71)
+ self.cont.append (70)
self.the_npc.set_val ("apologize" , 0)
self.player.append (-1)
@@ -103,13 +96,13 @@ class erek_start:
self.npc.append (113)
self.cont.append (-1)
self.player.append (115)
- self.cont.append (73)
+ self.cont.append (72)
self.player.append (-1)
def answer115 (self):
self.color = self.the_npc.get_color()
self.npc.append (114)
- self.cont.append (72)
+ self.cont.append (71)
self.player.append (-1)
def answer114 (self):
@@ -136,16 +129,13 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
self.player.append (105)
- self.cont.append (67)
+ self.cont.append (-1)
self.player.append (-1)
def answer105 (self):
adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
- self.color = self.the_npc.get_color()
- self.npc.append (117)
- self.cont.append (-1)
- self.player.append (-1)
+ pass
def answer106 (self):
pass
@@ -273,11 +263,11 @@ 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 (74)
+ self.cont.append (-1)
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (111)
- self.cont.append (70)
+ self.cont.append (69)
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
@@ -414,9 +404,9 @@ class erek_start:
self.npc.append (107)
self.cont.append (-1)
self.player.append (108)
- self.cont.append (68)
+ self.cont.append (67)
self.player.append (109)
- self.cont.append (69)
+ self.cont.append (68)
self.player.append (-1)
def answer109 (self):
@@ -434,12 +424,7 @@ class erek_start:
self.player.append (-1)
def answer116 (self):
- 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)
+ pass
def answer47 (self):
self.color = self.the_npc.get_color()
@@ -675,12 +660,6 @@ 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 answer118 (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..e4c42b5 100644
--- a/scripts/dialogues/jelom_2nd.py
+++ b/scripts/dialogues/jelom_2nd.py
@@ -22,36 +22,6 @@ class jelom_2nd:
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)
-
- 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)
-
-
-
def __getattr__ (self, name):
return 0
@@ -90,13 +60,11 @@ class jelom_2nd:
self.player.append (12)
self.cont.append (7)
self.player.append (-1)
- else:
+ elif adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 2:
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.player.append (-1)
def answer23 (self):
@@ -145,9 +113,6 @@ class jelom_2nd:
self.color = self.the_npc.get_color()
self.npc.append (36)
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 answer31 (self):
diff --git a/scripts/dialogues/lucia_start.py b/scripts/dialogues/lucia_start.py
index 29329ed..255e64e 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
@@ -17,7 +17,7 @@ class lucia_start:
self.the_player = p
self.the_npc = n
- self.dialogue = [self.start, self.answer0, self.answer2,
self.answer3, self.answer6, self.answer8, self.answer10, self.answer11,
self.answer13, self.answer15, self.answer16, self.answer18, self.answer19,
self.answer21, self.answer22, self.answer23, self.answer24, self.answer25,
self.answer27, self.answer29, self.answer30, self.answer32, self.answer33,
self.answer35, self.answer36, self.answer38, self.answer40, self.answer41,
self.answer42, self.answer44, self.answer46, self.answer48, s [...]
+ self.dialogue = [self.start, self.answer0, self.answer2,
self.answer3, self.answer6, self.answer8, self.answer10, self.answer11,
self.answer13, self.answer15, self.answer16, self.answer18, self.answer19,
self.answer21, self.answer22, self.answer23, self.answer24, self.answer25,
self.answer27, self.answer29, self.answer30, self.answer32, self.answer33,
self.answer35, self.answer36, self.answer38, self.answer40, self.answer41,
self.answer42, self.answer44, self.answer46, self.answer48, s [...]
def clear (self):
del self.dialogue
@@ -261,9 +261,21 @@ class lucia_start:
self.cont.append (-1)
self.player.append (38)
self.cont.append (25)
+ if adonthell.gamedata_get_character("Alek Endhelm").get_val
("talked_to") == 0:
+
+ self.player.append (99)
+ self.cont.append (61)
self.player.append (-1)
- def answer38 (self):
+ def answer205 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (100)
+ self.cont.append (-1)
+ self.player.append (101)
+ self.cont.append (62)
+ self.player.append (-1)
+
+ def answer209 (self):
self.color = self.the_npc.get_color()
self.npc.append (43)
self.cont.append (-1)
@@ -288,6 +300,16 @@ class lucia_start:
self.cont.append (-1)
self.player.append (-1)
+ def answer38 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (43)
+ self.cont.append (-1)
+ self.player.append (44)
+ self.cont.append (29)
+ self.player.append (45)
+ self.cont.append (-1)
+ self.player.append (-1)
+
def answer21 (self):
self.color = self.the_npc.get_color()
self.npc.append (23)
diff --git a/scripts/init.py b/scripts/init.py
index 2a822c9..3d44900 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -796,7 +796,7 @@ class title_screen:
ev.y = 17
ev.dir = STAND_WEST
ev.set_script ("character_speak", (the_player.get_name (), \
- "Closed. We are all emprisonned
here..."))
+ "Closed. We are all imprisoned
here..."))
lm.add_event (ev)
ev = action_event ()
@@ -806,7 +806,7 @@ class title_screen:
ev.y = 18
ev.dir = STAND_WEST
ev.set_script ("character_speak", (the_player.get_name (), \
- "Closed. We are all emprisonned
here..."))
+ "Closed. We are all imprisoned
here..."))
lm.add_event (ev)
ev = action_event ()
@@ -816,7 +816,7 @@ class title_screen:
ev.y = 19
ev.dir = STAND_WEST
ev.set_script ("character_speak", (the_player.get_name (), \
- "Closed. We are all emprisonned
here..."))
+ "Closed. We are all imprisoned
here..."))
lm.add_event (ev)
ev = action_event ()
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 f3b822a 070/237: Furniturized the houses., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfdc8cc 035/237: Finished Orloth's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 398bec8 143/237: IMPROVED Bjarn's dialogue and text bubbles, Kai Sterker, 2016/07/25
- [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 <=
- [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, 2016/07/25
- [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