[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 fa549f8 159/237: FIXED bug
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 fa549f8 159/237: FIXED bug in Erek's dialogue |
Date: |
Mon, 25 Jul 2016 18:15:08 +0000 (UTC) |
tag: Release_0-3-1
commit fa549f811ce901184892b8b481444ba45927ebdc
Author: adondev <adondev>
Commit: adondev <adondev>
FIXED bug in Erek's dialogue
---
scripts/dialogues/erek_start.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index aa3836d..779268d 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -77,7 +77,7 @@ class erek_start:
self.player.append (43)
self.cont.append (30)
self.player.append (-1)
- elif self.the_npc.get_val ("apologie") == 0:
+ elif self.the_npc.get_val ("apologise") == 0 and
self.the_npc.get_val ("work_4_shair") != 0 and
adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") > 0:
self.color = 0
self.npc.append (45)
@@ -501,7 +501,7 @@ class erek_start:
self.player.append (-1)
def answer30 (self):
- self.set_npc (self.the_npc.get_name())
+ self.set_npc (self.the_npc.get_id())
self.color = self.the_npc.get_color()
self.npc.append (31)
self.cont.append (-1)
- [adonthell-wastesedge-commits] Release_0-3-1 de63776 087/237: Experimental Python scripting, (continued)
- [adonthell-wastesedge-commits] Release_0-3-1 de63776 087/237: Experimental Python scripting, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 5975389 197/237: Fixed a typo, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 95f5a33 223/237: FIXED some typos, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4d12cf8 222/237: FIXED error message at startup, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 397f0ce 209/237: Tuned the extro a bit, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 3727a0b 224/237: ADDED final versions of the demo songs, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 7a54bfe 200/237: RESTRUCTURED Jelom a little, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 049cceb 174/237: ADDED gem found in Silverhair's luggage, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 01380a3 221/237: Tuned intro & extro, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 0a4e9eb 236/237: REMOVED ^M's from end of line, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 fa549f8 159/237: FIXED bug in Erek's dialogue,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-1 d412018 189/237: ADDED .cvsignore, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 ba734bb 232/237: Fixed some in game problems, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 30df91a 158/237: FINISHED Tristan, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 e22605d 178/237: Added various stuff on the map, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 140e4c2 172/237: Deactivated the 'Options' option, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4defa7b 194/237: FIXED bug, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 d190e60 164/237: FIXED the mess I made with my last update :(, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 25cd3d4 153/237: Improved Eyes, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 bb956f2 196/237: ADDED shutdown, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 9a4da9a 234/237: ADDED ability to build RPM package, Kai Sterker, 2016/07/25