Commit Graph
24 Commits
Author SHA1 Message Date
Lukas Kammerhofer cf6af54eb1 fused settings 2026-05-08 18:49:47 +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 4a7e754771 Merge remote-tracking branch 'origin/main' into feat/items 2026-05-08 16:04:36 +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
Kevin Baumgartner b98528fd37 Merge branch 'main' into feat/endscreen 2026-05-08 15:39:27 +02:00
Haiden Niklas acd1593ec2 Merge branch 'main' into 'feat/game_loop' 2026-05-08 13:34:15 +00:00
Kevin Baumgartner 58d887689e feat(endscreen): get font from settings 2026-05-08 15:33:15 +02:00
Niklas Haiden 20e106cb01 feat: implement gameloop
Implement a basic game loop that draws the startscreen, and the map after you hit the right button
2026-05-08 15:32:58 +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 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
Kevin Baumgartner 7a5d063de6 feat(endscreen): implement init for endscreen 2026-05-08 14:52:23 +02:00
Haiden Niklas 91d02e073b Merge branch 'main' into 'feat/walking-players' 2026-05-08 12:35:02 +00:00
Kevin Baumgartner 011cb867b3 Merge branch 'main' into feat/startscreen
# Conflicts:
#	src/settings.py
2026-05-08 13:54:57 +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
Kevin Baumgartner 0194438b38 Merge branch 'main' into feat/startscreen
# Conflicts:
#	src/settings.py
2026-05-07 22:21:02 +02:00
Kevin Baumgartner b15c5b5e28 feat(text_input): switch color definitions to settings file 2026-05-07 22:18:10 +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
Niklas Haiden 7a47237e09 Merge branch 'refs/heads/main' into feat/walking-players
# Conflicts:
#	src/settings.py
2026-05-07 21:21:07 +02:00
Niklas Haiden 74b0af92fd add some settings for the sprite assets 2026-05-07 21:19:26 +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
Haiden Niklas 9fc7a2cbda feature: desk basic mechanic 2026-05-07 18:37:12 +00:00