[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED st
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry |
Date: |
Mon, 25 Jul 2016 18:15:11 +0000 (UTC) |
tag: Release_0-3-1
commit 20e2b04d6731b8bc661b196fb07407eb8cb24957
Author: adondev <adondev>
Commit: adondev <adondev>
CHANGED stables to pantry
---
scripts/dialogues/bjarn_start.py | 2 +-
scripts/dialogues/erek_start.py | 2 +-
scripts/dialogues/extro.py | 3 ++-
scripts/init.py | 21 +++++++++++++++++++++
4 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/scripts/dialogues/bjarn_start.py b/scripts/dialogues/bjarn_start.py
index d85ff21..3ce834e 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
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 56b449b..3b2811b 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 humour as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolson's 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 [...]
+ 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 humour as he watches you expectantly.", "You are Erek Stonebreaker,
aren't you?", "That I am. Erek Stonebreaker, aspirant to the trading business
and Master Fingolson's 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 [...]
def set_name (self, new_name):
pass
diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
index eea556b..343d4b4 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
@@ -36,6 +36,7 @@ class extro:
self.dialogue[answer]()
def start (self):
+ self.set_npc ("Bjarn Fingolson")
self.color = adonthell.gamedata_get_character("Bjarn
Fingolson").get_color()
self.npc.append (0)
self.cont.append (1)
diff --git a/scripts/init.py b/scripts/init.py
index af59c59..5f4b4a8 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -1215,6 +1215,27 @@ class title_screen:
ev.x = 1
ev.y = 6
ev.dir = STAND_WEST
+ ev.set_script ("character_speak", (player.get_id (), \
+ "An old, dusty chest."))
+ lm.add_event (ev)
+
+ # -- pantry
+ ev = action_event ()
+ ev.thisown = C
+ ev.submap = 8
+ ev.x = 3
+ ev.y = 5
+ ev.dir = STAND_NORTH
+ ev.set_script ("character_speak", (player.get_id (), \
+ "The Lady's luggage, but not what I am looking for."))
+ lm.add_event (ev)
+
+ ev = action_event ()
+ ev.thisown = C
+ ev.submap = 8
+ ev.x = 4
+ ev.y = 5
+ ev.dir = STAND_NORTH
ev.set_script ("search_chest", (player.get_id (),))
lm.add_event (ev)
- [adonthell-wastesedge-commits] Release_0-3-1 f47e582 148/237: FIXED start of new game, (continued)
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 20e2b04 188/237: CHANGED stables to pantry,
Kai Sterker <=
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 148ae8b 012/237: This module has nothing to do here and may crash everything! (Alex), Kai Sterker, 2016/07/25