feat/spellbook #12

Merged
3002102 merged 3 commits from feat/spellbook into main 2026-04-21 17:17:36 +02:00

3 Commits (main)

Author SHA1 Message Date
3002102 45c0c15d79 Merge main into feat/spellbook, keep HP/damage system
Resolved conflicts in enemy_base.gd and slime.gd by keeping the
feat/spellbook HP system (max_hp/hp/take_damage) over main's
hits_remaining approach.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-04-21 17:16:04 +02:00
3002102 1dc4f16313 added a new perk in form of a spellbook 2026-04-21 17:10:41 +02:00
Jaro dfcf65ede2 added an actual hp/damage system to the witch and enemies game over screen is still missing the game just restarts 2026-04-21 13:14:10 +02:00