[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 bcd3b16 141/237: FIXED prev
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 bcd3b16 141/237: FIXED previous commit of old stuff |
Date: |
Mon, 25 Jul 2016 18:15:07 +0000 (UTC) |
tag: Release_0-3-1
commit bcd3b164d2d3105707474fc8bb9afad2fe1d22fb
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED previous commit of old stuff
---
scripts/dialogues/erek_start.py | 45 +++++++++++++-----
scripts/dialogues/jelom_2nd.py | 97 ++++++++++++++++++++++++++++++---------
2 files changed, 108 insertions(+), 34 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 111cf90..f032c6e 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,9 +39,16 @@ 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):
@@ -86,7 +93,7 @@ class erek_start:
self.color = 0
self.npc.append (112)
- self.cont.append (70)
+ self.cont.append (71)
self.the_npc.set_val ("apologize" , 0)
self.player.append (-1)
@@ -96,13 +103,13 @@ class erek_start:
self.npc.append (113)
self.cont.append (-1)
self.player.append (115)
- self.cont.append (72)
+ self.cont.append (73)
self.player.append (-1)
def answer115 (self):
self.color = self.the_npc.get_color()
self.npc.append (114)
- self.cont.append (71)
+ self.cont.append (72)
self.player.append (-1)
def answer114 (self):
@@ -129,13 +136,16 @@ class erek_start:
if adonthell.gamedata_get_quest("demo").get_val
("convince_jelom") == 1:
self.player.append (105)
- self.cont.append (-1)
+ self.cont.append (67)
self.player.append (-1)
def answer105 (self):
adonthell.gamedata_get_quest("demo").set_val ("convince_jelom"
, 2)
- pass
+ self.color = self.the_npc.get_color()
+ self.npc.append (117)
+ self.cont.append (-1)
+ self.player.append (-1)
def answer106 (self):
pass
@@ -263,11 +273,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 (-1)
+ self.cont.append (74)
if adonthell.gamedata_get_quest("demo").get_val ("have_gem") ==
1:
self.player.append (111)
- self.cont.append (69)
+ self.cont.append (70)
if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") == 1:
self.player.append (81)
@@ -404,9 +414,9 @@ class erek_start:
self.npc.append (107)
self.cont.append (-1)
self.player.append (108)
- self.cont.append (67)
- self.player.append (109)
self.cont.append (68)
+ self.player.append (109)
+ self.cont.append (69)
self.player.append (-1)
def answer109 (self):
@@ -424,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()
@@ -660,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 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 e4c42b5..fc4d786 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
@@ -17,11 +17,41 @@ 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.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, self.answer38, None]
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
@@ -65,8 +95,51 @@ class jelom_2nd:
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)
+ else:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (37)
+ self.cont.append (-1)
+ self.player.append (33)
+ self.cont.append (19)
+ if adonthell.gamedata_get_quest("demo").get_val
("bjarn_door_open") < 3:
+
+ self.player.append (38)
+ self.cont.append (22)
self.player.append (-1)
+ def answer38 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (39)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer33 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (34)
+ 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)
+ self.cont.append (21)
+ self.player.append (-1)
+
+ def answer35 (self):
+ self.set_npc (self.the_npc.get_name())
+ 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 answer23 (self):
self.set_npc ("Erek Stonebreaker")
self.color = adonthell.gamedata_get_character("Erek
Stonebreaker").get_color()
@@ -95,26 +168,6 @@ class jelom_2nd:
self.cont.append (19)
self.player.append (-1)
- def answer33 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (34)
- 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)
- self.cont.append (21)
- self.player.append (-1)
-
- def answer35 (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 (-1)
-
def answer31 (self):
self.color = self.the_npc.get_color()
self.npc.append (32)
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 a681af9 028/237: Modularized event scripts, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 18d2266 131/237: FIXED installation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7b028da 127/237: UPDATED intro sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 290bfde 086/237: ADDED portraits of Talan and Player, Kai Sterker, 2016/07/25
- [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 <=
- [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, 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