commit 91c8d8a461ce9713583cfa7918eef28870db0bcd
parent f259afbd29eec78b1d0db11502c3f48a9872b6f6
Author: Erik Letson <hmagellan@hmagellan.com>
Date: Mon, 28 Dec 2020 17:28:17 -0600
notes and made tile cursor invisible during dialog
Diffstat:
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/main.py b/main.py
@@ -16,6 +16,11 @@ from src import game
# by the custom_flags vals. There should be a universal method for creating overlay entities, which you pass values to to determine their
# custom_flags and images, as well as a universal method for fetching entities from the overlay list. Functionally, moving and attacking are
# the same as far as the BoardManager and its overlay, so generalizing this method will probably be very useful when implementing tactics.
+# 9. Need to redo the directory and file structure for boards. Boards should have all of their files (json and all) in an entry under the 'boards'
+# dir, and the files should be named "map.tmx", "dialogs.json" and "entities.json" (any other files that should be common across all boards can
+# be added later). The game can use the board directory name to find these files, since it now needs to be shared across multiple managers (the
+# boardmanager and the turnmanager right now, but others likely in the future). This perhaps hints at the need for a data directory overhaul,
+# which would benefit images and jsons as well. jsons in particular are very jumbled right now.
# Initialization of pygame and submodules
pygame.mixer.pre_init(44100, -16, 4, 1024)
diff --git a/src/piece.py b/src/piece.py
@@ -259,7 +259,8 @@ class PieceManager(manager.Manager):
"""
if surface != None:
self.pieces.update(surface)
- self.tile_cursor.update(surface)
+ if self.game.control_mode != CTRL_MODES.Battle_Dialog:
+ self.tile_cursor.update(surface)
self.center_plumb_bob()
if self.game.control_mode in (CTRL_MODES.Turn_Normal, CTRL_MODES.Turn_Select_Move, CTRL_MODES.Turn_Select_Attack):
self.plumb_bob.update(surface)
diff --git a/src/turn.py b/src/turn.py
@@ -50,7 +50,9 @@ class TurnManager(manager.Manager):
also sets up persistent parts of the turn UI
such as the trays and action buttons.
"""
+ # TODO: Doing this here is not my favorite, at all...
with open(os.path.join(BOARD_PATH, boardname, "events.json")) as b: self.board_events = json.load(b)
+ #
sheets = self.bus.fetch("sheet_manager", "sheets")
anims = self.bus.fetch("sheet_manager", "animations")
self.in_play_pieces = pieces
