[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-1 770b604 235/237: REMOVED ^M's from end of line |
Date: |
Mon, 25 Jul 2016 18:15:16 +0000 (UTC) |
tag: Release_0-3-1
commit 770b604be0a29a734eccc88d897cda75ecc61d26
Author: adondev <adondev>
Commit: adondev <adondev>
REMOVED ^M's from end of line
---
scripts/dialogues/erek_start.py | 52 +++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/scripts/dialogues/erek_start.py b/scripts/dialogues/erek_start.py
index 7814cae..6af38cb 100755
--- a/scripts/dialogues/erek_start.py
+++ b/scripts/dialogues/erek_start.py
@@ -22,32 +22,32 @@ class erek_start:
def clear (self):
del self.dialogue
- # Returns whom the Player told about his connection
- # with Lady Silverhair
- def get_right_npc (self):
- if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") &
1 == 1:
- return "Master Orloth"
-
- elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair")
& 2 == 2:
- return "the mercenary"
-
- else:
- return "Tristan the merchant"
-
- # -- 'teleport' to Bjarn's room
- def __del__ (self):
- 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)
+ # Returns whom the Player told about his connection
+ # with Lady Silverhair
+ def get_right_npc (self):
+ if adonthell.gamedata_get_quest("demo").get_val ("work_4_shair") &
1 == 1:
+ return "Master Orloth"
+
+ elif adonthell.gamedata_get_quest("demo").get_val ("work_4_shair")
& 2 == 2:
+ return "the mercenary"
+
+ else:
+ return "Tristan the merchant"
+
+ # -- 'teleport' to Bjarn's room
+ def __del__ (self):
+ 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)
- [adonthell-wastesedge-commits] Release_0-3-1 f470b9c 198/237: CHANGED credits, (continued)
- [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, 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 <=
- [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
- [adonthell-wastesedge-commits] Release_0-3-1 ecf6760 220/237: ADDED Initial Game Data, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 623d0fc 190/237: *** empty log message ***, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 b27fa89 169/237: FIXED Erek's dialogue (I hope), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 4306c41 202/237: FIXED Running Alek, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 f286520 193/237: ADDED line about Frostbloom's noise, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 cfc73d0 039/237: ADDED Alek Endhelm, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-1 dfabd4e 205/237: REMIXED some of the tunes, Kai Sterker, 2016/07/25