projects
/
naja.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tweaked spacing on win and lose screens
[naja.git]
/
naja
/
widgets
/
info_area.py
diff --git
a/naja/widgets/info_area.py
b/naja/widgets/info_area.py
index a25d5bfdf5b5add97ae79da46c7729adf9a01e51..34bbec746df01e9756ae092e31d1a9811922b96c 100644
(file)
--- a/
naja/widgets/info_area.py
+++ b/
naja/widgets/info_area.py
@@
-22,14
+22,14
@@
from naja.widgets.text import TextBoxWidget, TextWidget
HINTS = {
ACT: ("Choose an action using the Up/Down keys.\n"
"Press Return to execute the action."),
HINTS = {
ACT: ("Choose an action using the Up/Down keys.\n"
"Press Return to execute the action."),
- EXAMINE: "Select a
card
to examine using the arrow keys.",
+ EXAMINE: "Select a
tile
to examine using the arrow keys.",
}
}
-HINT_LEGAL_MOVE = "\nPress Return to move to this
card
."
+HINT_LEGAL_MOVE = "\nPress Return to move to this
tile
."
TITLES = {
ACT: "Choose an Action",
TITLES = {
ACT: "Choose an Action",
- EXAMINE: "Select a
Card
",
+ EXAMINE: "Select a
Tile
",
}
}
@@
-94,7
+94,7
@@
class InfoAreaWidget(Widget):
# Game mode (puzzle, easy, standard, hard, etc ...)
game_mode = TextBoxWidget(
# Game mode (puzzle, easy, standard, hard, etc ...)
game_mode = TextBoxWidget(
- (0, 0),
"UNKNOWN"
, padding=4, centre=True,
+ (0, 0),
self.mode_hint()
, padding=4, centre=True,
colour=PALETTE.WHITE, border=2,
bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE,
box_width=box_width)
colour=PALETTE.WHITE, border=2,
bg_colour=PALETTE.BLACK, border_colour=PALETTE.BLUE,
box_width=box_width)
@@
-103,6
+103,16
@@
class InfoAreaWidget(Widget):
y_offset = (INFO_SIZE[1] - BIT_SIZE[1] + 12)
self.surface.blit(game_mode.surface, pos())
y_offset = (INFO_SIZE[1] - BIT_SIZE[1] + 12)
self.surface.blit(game_mode.surface, pos())
+ def mode_hint(self):
+ gameboard = self.state.gameboard
+ if gameboard.puzzle:
+ return "PUZZLE"
+ return {
+ 0: "DEATH", 1: "LUDICROUS",
+ 2: "RAMBO", 3: "HARD",
+ 4: "STANDARD", 5: "EASY",
+ }.get(gameboard.max_health, "UNKNOWN")
+
def prepare_action(self, choice, action, y_offset, box_width):
x_offset = INFO_LEFT_PADDING
glyphs_x_offset = 0
def prepare_action(self, choice, action, y_offset, box_width):
x_offset = INFO_LEFT_PADDING
glyphs_x_offset = 0
@@
-128,7
+138,7
@@
class InfoAreaWidget(Widget):
[(x_offset, y_offset), (right, y_offset),
(right, bottom), (x_offset, bottom)], 4)
[(x_offset, y_offset), (right, y_offset),
(right, bottom), (x_offset, bottom)], 4)
- if action.required_bits:
+ if action.required_bits
in BIT_MAP
:
img_name = BIT_MAP[action.required_bits].replace(
'.png', '_small.png')
img = resources.get_image(img_name,
img_name = BIT_MAP[action.required_bits].replace(
'.png', '_small.png')
img = resources.get_image(img_name,
@@
-138,14
+148,14
@@
class InfoAreaWidget(Widget):
else:
glyphs_x_offset = INFO_LEFT_PADDING
else:
glyphs_x_offset = INFO_LEFT_PADDING
- for glyph in action.
GLYPHS
:
+ for glyph in action.
get_glyphs()
:
img = resources.get_image(
glyph, transforms=(EIGHT_BIT, blender(PALETTE.GREY)))
self.surface.blit(img, (glyphs_x_offset, glyphs_y_offset - 4))
glyphs_x_offset += img.get_width()
img = resources.get_image(
glyph, transforms=(EIGHT_BIT, blender(PALETTE.GREY)))
self.surface.blit(img, (glyphs_x_offset, glyphs_y_offset - 4))
glyphs_x_offset += img.get_width()
- if action.
MSB_GLYPH
is not None:
+ if action.
get_msb_glyph()
is not None:
img = resources.get_image(
img = resources.get_image(
- action.
MSB_GLYPH
,
+ action.
get_msb_glyph()
,
transforms=(EIGHT_BIT, blender(PALETTE.LIGHT_VIOLET)))
self.surface.blit(img, (glyphs_x_offset, glyphs_y_offset - 4))
transforms=(EIGHT_BIT, blender(PALETTE.LIGHT_VIOLET)))
self.surface.blit(img, (glyphs_x_offset, glyphs_y_offset - 4))