Commit Graph
28 Commits
Author SHA1 Message Date
Berger Lena 8d8a2b10aa fix: remove merge conflict marker in settings.py
- remove stray `=======` marker
- clean up excess blank lines
2026-05-08 19:12:25 +02:00
Berger Lena daf2de0e73 feat: tower sound effects
- integrate sound_manager into Tower class
- add sfx for buy success/fail, tower shoot, and monster hit
2026-05-08 18:57:20 +02:00
Berger Lena 20c47e5d55 Merge remote-tracking branch 'origin/main' into feat/sound 2026-05-08 18:46:10 +02:00
Berger Lena bd1ee01e90 Merge branch 'main' into feat/sound
# Conflicts:
#	src/settings.py
2026-05-08 18:34:51 +02:00
Berger Lena 16b8f26361 feat: sound
- add SoundManager class to handle bgm and sfx
- add script to generate wav sound assets
- integrate sfx for shop purchases and player transform
- add dynamic bgm switching based on player state
- add sound file paths and volume configurations to settings
2026-05-08 18:34:18 +02:00
Berger Lena 337f11b431 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/settings.py
2026-05-08 16:29:47 +02:00
Berger Lena a9209bb261 chore:cleanup settings.py structure and formatting
- remove HP bar colors
- fix double parentheses in start and end screen background colors
- add section headers for PLAYER and SPRITE
- improve spacing and structure between sections
2026-05-08 16:28:40 +02:00
Berger Lena f52ef23e6c feat: item
- Add logic to spawn items at random intervals
- Add mechanic to collect items with 'E' key
- Refactor _random_position to a  function
2026-05-08 16:23:02 +02:00
Berger Lena 4a7e754771 Merge remote-tracking branch 'origin/main' into feat/items 2026-05-08 16:04:36 +02:00
Berger Lena c0a5c12d4e feature: item
- add draw method to Item class with fallback colors
- fix ItemManager class name typo and missing self parameter in _random_position
- add draw and clear methods to ItemManager
- rename ITEM_SPAWN_INTERVAL to ITEM_SHOPPING_TIMER in is_expired
2026-05-08 16:03:42 +02:00
Berger Lena 99d095c761 Merge branch 'main' into feat/items
# Conflicts:
#	src/settings.py
2026-05-08 16:02:33 +02:00
Berger Lena 2a6c93998b refactor: create ItemManger class
- add itemManager class and moved randomPosition and update into it
- add is_expired to check if time ran out to buy spawned item
2026-05-08 15:47:29 +02:00
Berger Lena 3ca2ef1332 feature: item
- add Item base class with collision rect, spawn timer, and sprite loading
2026-05-08 15:25:06 +02:00
Berger Lena bd2152ac3b feat: HUD
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
- add _draw_status_bar to handle dynamic HP rendering
- add _format_time for MM:SS display
2026-05-08 15:17:07 +02:00
Berger Lena f6beb533d6 feat: HUD
- add HUD class with font initialization
- add status bars for doors and zombie hp
- add ECTS balance and generation rate display
- add game timer
2026-05-08 15:16:28 +02:00
Berger Lena 96571641a2 feat: HUD
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
- add _draw_status_bar to handle dynamic HP rendering
- add _format_time for MM:SS display
2026-05-08 15:16:28 +02:00
Berger Lena 32525ccdbb feat: item
- Add function for finding a random item spawn position
2026-05-08 15:13:31 +02:00
Berger Lena 11ece2ee54 feat: item
- Create item.py
- Add update to remove expired items
- Add item settings for spawn interval, despawn timer, and size
2026-05-08 15:03:41 +02:00
Berger Lena cb5f40dbc4 feat: HUD & SETTINGS
- add tower constants including cost, projectile stats, and duration
- add item buying timer for shop items
2026-05-07 22:22:18 +02:00
Berger Lena 2788d352d0 feature: HUD
- create new hud.py file
- add zombie difficulty stats (easy, medium, hard) to settings
- add coffee item stats (cost and heal value) to settings
- add HUD configuration (font, colors, dimensions) to settings
- reorganize HP bar colors into the new HUD settings section
2026-05-07 22:14:52 +02:00
Berger Lena 8bb05de946 feature: ECTS upgrade mechanic
- add upgrade_rate method to increase ECTS/per second
2026-05-07 21:23:56 +02:00
Berger Lena ad7e18c024 feature: ects upgrade mechanic
- add upgrade_rate method to increase ects/per second
2026-05-07 21:23:27 +02:00
Berger Lena 7c576806b2 feature: ECTS generation
- add update method to increase ECTS balance over time when player is at desk
2026-05-07 21:19:55 +02:00
Berger Lena 342c086852 feature: ECTS basic mechanic
- add ECTS class to track balance and generation rate
- add ECTS and beer constants to settings
2026-05-07 21:12:48 +02:00
Berger Lena 9b74401b08 feature: door basic mechanic
- Move hardcoded door size and colors to settings.py
- Update Door class to use constants for drawing
2026-05-07 20:47:42 +02:00
Berger Lena 6f3439045c feature: door basic mechanic
- add door color and border color
- add draw method to render the door
- add take_damage method to handle health reduction and door breaking
2026-05-07 19:39:09 +02:00
Berger Lena 7723f5b17e Merge remote-tracking branch 'origin/main' 2026-05-07 19:36:41 +02:00
Berger Lena a830ba8565 feature: door basic mechanic
- add Door base class
2026-05-07 19:17:09 +02:00