[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-4 474606c 09/22: FIXED can't
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-4 474606c 09/22: FIXED can't leave through door when coming through window and S. is free (thanks Leif Thande) |
Date: |
Mon, 25 Jul 2016 18:15:49 +0000 (UTC) |
tag: Release_0-3-4
commit 474606c35603d8e9b489658a47834421c16dca78
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED can't leave through door when coming through window and S. is free
(thanks Leif Thande)
---
scripts/game_events/silverhair_to_fst.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/game_events/silverhair_to_fst.py
b/scripts/game_events/silverhair_to_fst.py
index 9a024d0..0b594d5 100644
--- a/scripts/game_events/silverhair_to_fst.py
+++ b/scripts/game_events/silverhair_to_fst.py
@@ -32,9 +32,10 @@ class silverhair_to_fst:
def run (self, submap, x, y, dir, name):
p = adonthell.gamedata_get_character (name)
-
+ free = adonthell.gamedata_get_quest ("demo").get_val("silverhair_free")
+
# -- Jelom not convinced of Silverhair's innocence
- if p.get_val ("came_from_barn") == 1:
+ if p.get_val ("came_from_barn") == 1 and not free:
p.stand ()
p.go_south ()
p.speak (_("I better leave the way I came."))
- [adonthell-wastesedge-commits] tag Release_0-3-4 created (now 184650b), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 44a6e77 02/22: FIXED output of autogen.sh (s/Adonthell/Waste's Edge/ - copy & paste is evil!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 b083ac4 16/22: ADDED icons for OS X, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 9ef5c12 21/22: FIXED 'make dist', Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 30906a2 17/22: IMPROVED speed of end sequence, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 c0f10e1 05/22: FIXED extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 f3faace 04/22: ADDED a few files used by the binary distribution for BeOS 5, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 93d678d 14/22: FIXED freezing of game right near the end, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 474606c 09/22: FIXED can't leave through door when coming through window and S. is free (thanks Leif Thande),
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-4 e47f051 07/22: ADDED installation instructions, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 dd04699 13/22: FIXED autogen.sh to use newest versions of autotools, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 50eddcb 20/22: UPDATED ReadMe.html for italian translation, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 ed9afe1 01/22: FIXED autogen.sh (no longer deletes intl/Makefile.in), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 4fe3fa2 19/22: UPDATED stuff for v0.3.4, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 d26087e 08/22: FIXED missing option in Jalom's dialogue, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 184650b 22/22: FIXED (really???) end sequence bug (thanks Avanger), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 edb0cfd 10/22: Fixed a typo in Oliver's dialog (thanks Leif!), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 14dbaef 11/22: UPDATED to GNU gettext 0.13, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-4 c7a937a 06/22: ADDED files for MacOS X package, Kai Sterker, 2016/07/25