Merge branch 'main' into feat/items

# Conflicts:
#	src/settings.py
This commit is contained in:
Berger Lena
2026-05-08 16:02:33 +02:00
5 changed files with 227 additions and 10 deletions
+15 -2
View File
@@ -1,6 +1,8 @@
# --- DESK ---
from typing import Mapping, Literal, Tuple
from src.map import tile_size
DESK_WIDTH = 70
DESK_HEIGHT = 40
@@ -12,7 +14,8 @@ DOOR_BORDER_WIDTH = 3
COLOR_DOOR_BEIGE = (245, 245, 220)
COLOR_DOOR_BORDER = (100, 90, 80)
COLOR_HP_BAR_GREEN = (0, 255, 0)
COLOR_HP_BAR_BG = (50, 50, 50)
# Players Constants / Settings
# Valid movement/animation directions.
@@ -33,7 +36,6 @@ DIRECTION_FRAMES: Mapping[Direction, Tuple[int, int, int]] = {
DEFAULT_SPRITE_HEIGHT: int = 138
DEFAULT_FRAME_TIME: float = 0.16
# --- ECTS ---
START_ECTS_VALUE = 1 # how many ECTS are generated at the beginning
ECTS_UPDATE_INTERVAL = 1000 # time in ms (1000 = 1 sec)
@@ -98,3 +100,14 @@ COLOR_HP_BAR_YELLOW = (255, 255, 0)
HUD_BAR_WIDTH = 100
HUD_BAR_HEIGHT = 15
PLAYER_SPEED = 180.0
DEMO_ACTOR_HEIGHT = tile_size * 3
FPS = 60
HUD_X_OFFSET = 20 # left startpoint for texts
HUD_BAR_X = 150 # left startpoint for hp bars
HUD_Y_DOOR = 20
HUD_Y_ZOMBIE = 50
HUD_Y_ECTS = 85