[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[adonthell-wastesedge-commits] Release_0-3-3 b2d3419 21/50: FIXED proble
From: |
Kai Sterker |
Subject: |
[adonthell-wastesedge-commits] Release_0-3-3 b2d3419 21/50: FIXED problem of NPCs not reaching cellar due to temporarily blocked path |
Date: |
Mon, 25 Jul 2016 18:15:31 +0000 (UTC) |
tag: Release_0-3-3
commit b2d3419c79c42f1e34c5f43ec099e26405353448
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>
FIXED problem of NPCs not reaching cellar due to temporarily blocked path
---
scripts/schedules/mapcharacters/to_cellar.py | 61 +-------------------------
1 file changed, 2 insertions(+), 59 deletions(-)
diff --git a/scripts/schedules/mapcharacters/to_cellar.py
b/scripts/schedules/mapcharacters/to_cellar.py
index 9ef8788..fff4fbf 100644
--- a/scripts/schedules/mapcharacters/to_cellar.py
+++ b/scripts/schedules/mapcharacters/to_cellar.py
@@ -68,7 +68,8 @@ class to_cellar:
if y - (x + 3) > 0: dir = adonthell.STAND_NORTH
else: dir = adonthell.STAND_WEST
- self.myself.set_goal (x, y, dir)
+ if not self.myself.set_goal (x, y, dir):
+ self.myself.time_callback ("1t", self.walk)
# -- reached Bjarn's room
def goal_reached (self):
@@ -80,61 +81,3 @@ class to_cellar:
else:
self.myself.pause ()
-
-
- def run_old (self):
- myself = self.myself
- todo = myself.get_val ("todo")
-
- # -- waiting
- if todo == 0:
- delay = myself.get_val ("delay")
-
- # If standing delay expired, move around next time
- if delay == 0:
- myself.set_val ("todo", 1)
- else:
- myself.set_val ("delay", delay - 1)
-
- # -- get movement target
- elif todo == 1:
- x, y, dir = self.exits[myself.submap ()]
-
- # -- in Bjarn's room
- if x == -1:
- submap = myself.mymap ().get_submap (myself.submap ())
- x = random.randint (1, 4)
- y = random.randint (5, 9)
-
- while not submap.get_square (x, y).is_free () or (y == 5 and x
> 2):
- x = random.randint (1, 4)
- y = random.randint (5, 9)
-
- # -- calculate direction
- # -- north-western area
- if x + y < 10:
- if x + 3 > y: dir = adonthell.STAND_SOUTH
- else: dir = adonthell.STAND_EAST
- # -- south-east corner
- else:
- if y - (x + 3) > 0: dir = adonthell.STAND_NORTH
- else: dir = adonthell.STAND_WEST
-
- myself.set_goal (x, y, dir)
- myself.set_val ("todo", 2)
-
- # -- move
- elif todo == 2:
- if myself.follow_path () == 1:
- # -- reached our final destination
- myself.set_val ("todo", 0)
-
- if myself.submap () == 7 and myself.posx () != 1:
- if myself.get_name () == adonthell.gamedata_player
().get_name ():
- myself.set_schedule ("keyboard_control")
- bjarn = adonthell.gamedata_get_character ("Bjarn
Fingolson")
- bjarn.set_dialogue ("dialogues.extro")
- bjarn.launch_action (myself)
-
- else:
- myself.set_schedule_active (0)
- [adonthell-wastesedge-commits] Release_0-3-3 ed0aa91 07/50: IMPROVED wording, (continued)
- [adonthell-wastesedge-commits] Release_0-3-3 ed0aa91 07/50: IMPROVED wording, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 922c53a 17/50: UPDATED gettext to version 0.11.5, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 332eee6 31/50: Prepend to install-exec-local and uninstall-local targets, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 1643ad2 13/50: UPDATED schedules to support callback saving/restoring, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 b0e4a2d 33/50: Add new Debian packaging files to EXTRA_DIST, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 f526fd9 09/50: MADE character speech event-driven, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 4694f04 26/50: Some compilation fixes for the upcoming release., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 48ce33c 12/50: UPDATED schedules once again for new event system - still not all done though, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 7ac71b6 32/50: Add missing Debian-files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 0c77716 29/50: UPDATED docs for wastesedge 0.3.3, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 b2d3419 21/50: FIXED problem of NPCs not reaching cellar due to temporarily blocked path,
Kai Sterker <=
- [adonthell-wastesedge-commits] Release_0-3-3 5a5fe13 45/50: FIXED speech of Janesta, which was accidently marked as player text, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 5ab2c22 25/50: FIXED installation of .mo files., Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 a229355 10/50: CHANGED most schedules to use event-based walking; disabled the rest for now, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 02aec5d 08/50: UPDATED to work with new event system, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 a9e2395 23/50: FIXED Bjarn walking around after he starts crying, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 1d9d842 47/50: FIXED memleak (main_munu wasn't deleted at exit), Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 04514cb 30/50: New Debian packaging files, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 9705cbd 02/50: ADDED quick-load feature, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 6eee5ec 11/50: UPDATED mapengine.data to latest version, Kai Sterker, 2016/07/25
- [adonthell-wastesedge-commits] Release_0-3-3 3d365be 41/50: ADDED icons for use under Linux, Kai Sterker, 2016/07/25