[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more
|
From: |
Kai Sterker |
|
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 07b6477 176/237: ADDED more gameplay, hooray! |
|
Date: |
Mon, 25 Jul 2016 18:15:10 +0000 (UTC) |
tag: Release_0-3-1
commit 07b6477fb1bcfb199fd23dc54239a76d91db5993
Author: adondev <adondev>
Commit: adondev <adondev>
ADDED more gameplay, hooray!
---
scripts/dialogues/alek_start.py | 2 +-
scripts/dialogues/lucia_start.py | 148 +++++++++++++++++++++++++++++++------
scripts/dialogues/orloth_start.py | 78 ++++++++++++++++++-
scripts/dialogues/talan_start.py | 4 +-
scripts/events/Makefile.am | 3 +-
scripts/events/to_storage.py | 43 +++++++++++
scripts/init.py | 4 +-
7 files changed, 250 insertions(+), 32 deletions(-)
diff --git a/scripts/dialogues/alek_start.py b/scripts/dialogues/alek_start.py
index fb7d9c7..5bb6b0a 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/lucia_start.py b/scripts/dialogues/lucia_start.py
index 12bde89..4bff6d3 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
@@ -48,13 +48,23 @@ class lucia_start:
self.npc.append (0)
self.cont.append (1)
self.player.append (-1)
- elif adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") == 1:
+ elif adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") == 1 or adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") == 2:
self.color = 0
self.npc.append (91)
self.cont.append (-1)
- self.player.append (92)
- self.cont.append (56)
+ if adonthell.gamedata_get_quest("demo").get_val
("soothe_lucia") == 1 and adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") == 2:
+
+ self.player.append (116)
+ self.cont.append (73)
+ elif adonthell.gamedata_get_quest("demo").get_val
("get_item") == 1 and adonthell.gamedata_get_quest("demo").get_val
("pantry_locked") == 1:
+
+ self.player.append (108)
+ self.cont.append (67)
+ else:
+
+ self.player.append (92)
+ self.cont.append (56)
self.player.append (-1)
else:
@@ -67,26 +77,35 @@ class lucia_start:
self.color = self.the_npc.get_color()
self.npc.append (87)
self.cont.append (-1)
+ if adonthell.gamedata_get_quest("demo").get_val ("get_item") ==
1 and adonthell.gamedata_get_quest("demo").get_val ("pantry_locked") == 1:
+
+ self.player.append (103)
+ self.cont.append (64)
+ if self.the_npc.get_val ("talked_about_theft") != 1:
+
+ self.player.append (97)
+ self.cont.append (59)
if self.the_npc.get_val ("talked_about_theft") == 1:
self.player.append (88)
self.cont.append (53)
- else:
+ self.player.append (-1)
- self.player.append (97)
- self.cont.append (59)
+ def answer88 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (89)
+ self.cont.append (54)
self.player.append (-1)
- def answer97 (self):
+ def answer89 (self):
self.color = self.the_npc.get_color()
- self.npc.append (16)
- self.cont.append (10)
+ self.npc.append (90)
+ self.cont.append (55)
self.talked_about_fingolson = 1
- self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
- def answer16 (self):
+ def answer90 (self):
self.color = self.the_npc.get_color()
self.npc.append (40)
self.cont.append (26)
@@ -414,7 +433,7 @@ class lucia_start:
self.cont.append (63)
self.player.append (-1)
- def answer211 (self):
+ def answer102 (self):
self.color = self.the_npc.get_color()
self.npc.append (62)
self.cont.append (40)
@@ -470,21 +489,16 @@ class lucia_start:
self.cont.append (42)
self.player.append (-1)
- def answer88 (self):
- self.color = self.the_npc.get_color()
- self.npc.append (89)
- self.cont.append (54)
- self.player.append (-1)
-
- def answer89 (self):
+ def answer97 (self):
self.color = self.the_npc.get_color()
- self.npc.append (90)
- self.cont.append (55)
+ self.npc.append (16)
+ self.cont.append (10)
self.talked_about_fingolson = 1
+ self.the_npc.set_val ("talked_about_theft", 1)
self.player.append (-1)
- def answer90 (self):
+ def answer16 (self):
self.color = self.the_npc.get_color()
self.npc.append (40)
self.cont.append (26)
@@ -506,6 +520,28 @@ class lucia_start:
self.cont.append (42)
self.player.append (-1)
+ def answer103 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("pantry_locked" ,
2)
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (104)
+ self.cont.append (-1)
+ self.player.append (105)
+ self.cont.append (65)
+ self.player.append (-1)
+
+ def answer105 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (106)
+ self.cont.append (66)
+ self.player.append (-1)
+
+ def answer106 (self):
+ self.color = 0
+ self.npc.append (107)
+ self.cont.append (-1)
+ self.player.append (-1)
+
def answer92 (self):
self.color = self.the_npc.get_color()
self.npc.append (93)
@@ -526,6 +562,70 @@ class lucia_start:
self.cont.append (-1)
self.player.append (-1)
+ def answer108 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (109)
+ self.cont.append (-1)
+ self.the_npc.set_val ("refuses_key" , 1)
+
+ self.player.append (94)
+ self.cont.append (57)
+ self.player.append (110)
+ self.cont.append (68)
+ self.player.append (-1)
+
+ def answer110 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (111)
+ self.cont.append (-1)
+ self.player.append (112)
+ self.cont.append (69)
+ self.player.append (114)
+ self.cont.append (71)
+ self.player.append (-1)
+
+ def answer114 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (115)
+ self.cont.append (72)
+ self.player.append (-1)
+
+ def answer115 (self):
+ self.color = 0
+ self.npc.append (96)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer112 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (113)
+ self.cont.append (70)
+ self.player.append (-1)
+
+ def answer113 (self):
+ self.color = 0
+ self.npc.append (96)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer116 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (117)
+ self.cont.append (-1)
+ self.player.append (118)
+ self.cont.append (74)
+ self.player.append (-1)
+
+ def answer118 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("soothe_lucia" ,
0)
+ adonthell.gamedata_get_quest("demo").set_val ("told_on_talan" ,
3)
+ adonthell.gamedata_get_quest("demo").set_val ("pantry_locked" ,
2)
+
+ self.color = 0
+ self.npc.append (119)
+ self.cont.append (-1)
+ self.player.append (-1)
+
def answer0 (self):
self.color = self.the_npc.get_color()
self.npc.append (1)
diff --git a/scripts/dialogues/orloth_start.py
b/scripts/dialogues/orloth_start.py
index 35eab82..15b2be2 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 appears to be the Innkeeper and owner of the place. He
seems lost in thought and it looks as if he hasn't slept much lately. His
worried face brightens up as you approach though, 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. Orloth Redwyne, [...]
+ strings = ["This appears to be the Innkeeper and owner of the place. He
seems lost in thought and it looks as if he hasn't slept much lately. His
worried face brightens up as you approach though, 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. Orloth Redwyne, [...]
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
@@ -65,6 +65,18 @@ class orloth_start:
self.first_run = 1
self.player.append (-1)
+ elif adonthell.gamedata_get_quest("demo").get_val ("get_item")
== 1 and adonthell.gamedata_get_quest("demo").get_val ("pantry_locked") == 1:
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (120)
+ self.cont.append (-1)
+ self.player.append (122)
+ self.cont.append (91)
+ if adonthell.gamedata_get_character("Lucia
Redwyne").get_val ("refuses_key") == 1:
+
+ self.player.append (121)
+ self.cont.append (90)
+ self.player.append (-1)
else:
self.color = self.the_npc.get_color()
@@ -704,7 +716,7 @@ class orloth_start:
self.cont.append (89)
self.player.append (-1)
- def answer262 (self):
+ def answer119 (self):
self.color = self.the_npc.get_color()
self.npc.append (74)
self.cont.append (55)
@@ -774,6 +786,66 @@ class orloth_start:
self.cont.append (29)
self.player.append (-1)
+ def answer266 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (124)
+ self.cont.append (-1)
+ self.player.append (126)
+ self.cont.append (93)
+ self.player.append (-1)
+
+ def answer276 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (127)
+ self.cont.append (-1)
+ self.player.append (128)
+ self.cont.append (94)
+ self.player.append (130)
+ self.cont.append (96)
+ self.player.append (-1)
+
+ def answer284 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("soothe_lucia" ,
1)
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (132)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer280 (self):
+ adonthell.gamedata_get_quest("demo").set_val ("soothe_lucia" ,
1)
+
+ self.color = self.the_npc.get_color()
+ self.npc.append (129)
+ self.cont.append (95)
+ self.player.append (-1)
+
+ def answer282 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (133)
+ self.cont.append (-1)
+ self.player.append (-1)
+
+ def answer268 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (123)
+ self.cont.append (-1)
+ if adonthell.gamedata_get_character("Lucia Redwyne").get_val
("refuses_key") == 1:
+
+ self.player.append (125)
+ self.cont.append (92)
+ self.player.append (-1)
+
+ def answer274 (self):
+ self.color = self.the_npc.get_color()
+ self.npc.append (131)
+ self.cont.append (-1)
+ self.player.append (128)
+ self.cont.append (94)
+ self.player.append (130)
+ self.cont.append (96)
+ self.player.append (-1)
+
def answer0 (self):
self.color = self.the_npc.get_color()
self.npc.append (1)
diff --git a/scripts/dialogues/talan_start.py b/scripts/dialogues/talan_start.py
index ec99c12..8845a33 100755
--- a/scripts/dialogues/talan_start.py
+++ b/scripts/dialogues/talan_start.py
@@ -66,7 +66,7 @@ class talan_start:
self.player.append (-1)
def answer44 (self):
- if adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") != 1:
+ if adonthell.gamedata_get_quest("demo").get_val
("told_on_talan") < 1:
self.color = self.the_npc.get_color()
self.npc.append (45)
@@ -81,6 +81,8 @@ class talan_start:
self.color = self.the_npc.get_color()
self.npc.append (46)
self.cont.append (-1)
+ adonthell.gamedata_get_quest("demo").set_val
("told_on_talan" , 2)
+
self.player.append (47)
self.cont.append (-1)
self.player.append (-1)
diff --git a/scripts/events/Makefile.am b/scripts/events/Makefile.am
index e169e8b..bdf5c8b 100755
--- a/scripts/events/Makefile.am
+++ b/scripts/events/Makefile.am
@@ -4,7 +4,8 @@ pkgdata_DATA = *.pyc
EXTRA_DIST = teleport.py cellar_to_bjarn.py fst_to_silverhair.py \
character_speak.py open_inn_door.py silverhair_to_fst.py \
- silverhair_to_brn.py brn_to_silverhair.py search_chest.py
+ silverhair_to_brn.py brn_to_silverhair.py search_chest.py \
+ to_storage.py
all:
$(adonthell_binary) -c
diff --git a/scripts/events/to_storage.py b/scripts/events/to_storage.py
new file mode 100644
index 0000000..e87f623
--- /dev/null
+++ b/scripts/events/to_storage.py
@@ -0,0 +1,43 @@
+#
+# (C) Copyright 2001 Kai Sterker <address@hidden>
+# Part of the Adonthell Project http://adonthell.linuxgames.com
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY.
+#
+# See the COPYING file for more details
+#
+
+# -- Map Event to teleport the player into the storageroom, if he has the
+# key.
+
+import adonthell
+import events
+
+class to_storage:
+
+ # Parameters:
+ # smdest: destination submap
+ # xdest: X position on smdest
+ # ydest: Y position on smdest
+ # destdir: direction where to look at after the teleport
+ def __init__ (self, eventinstance, smdest, xdest, ydest, destdir):
+ self.smdest = smdest
+ self.xdest = xdest
+ self.ydest = ydest
+ self.destdir = destdir
+
+ def run (self, submap, x, y, dir, name):
+ p = adonthell.gamedata_get_character (name)
+
+ # -- pantry door closed?
+ locked = adonthell.gamedata_get_quest ("demo").get_val("pantry_locked")
+ if locked == 0 or locked == 1:
+ adonthell.gamedata_get_quest ("demo").set_val("pantry_locked", 1)
+ p.stand ()
+ p.go_east ()
+ p.speak ("The door to the pantry is locked.")
+ else:
+ events.switch_submap (p, self.smdest, self.xdest, self.ydest,
self.destdir)
diff --git a/scripts/init.py b/scripts/init.py
index 61fa9f3..cbec643 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -383,14 +383,14 @@ class title_screen:
ev.submap = 4
ev.x = 0
ev.y = 9
- ev.set_script ("teleport", (8, 6, 3, STAND_WEST))
+ ev.set_script ("to_storage", (8, 6, 3, STAND_WEST))
lm.add_event (ev)
ev = enter_event ()
ev.thisown = C
ev.submap = 4
ev.x = 0
ev.y = 10
- ev.set_script ("teleport", (8, 6, 4, STAND_WEST))
+ ev.set_script ("to_storage", (8, 6, 4, STAND_WEST))
lm.add_event (ev)
# From storage to cellar
- [adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 c544301 203/237: Some fixes to some dialogues, Kai Sterker, 2016/07/25
- [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 <=
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c8fca18 186/237: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa60e79 139/237: Building now creates byte-compiled script files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 c2af165 106/237: Added the final mapcharacters., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bfb1042 180/237: IMPROVED chest-owners, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b239465 152/237: CHANGED scripts to new character handling, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 eb644d3 229/237: FIXED Audio should now be in sync with the extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4c2c7ff 214/237: Finished entrance for veranda effect., Kai Sterker, 2016/07/25