 Jonathan
|
e5b2b8b8ab
|
Merge pull request 'Connect farming and fighting by making them codependent' (#44) from feature/farm_fight_loop into develop
Reviewed-on: #44
|
2025-12-16 20:44:26 +01:00 |
|
|
Jonathan
|
2fa8aa9fbc
|
Merge pull request 'Vesna resets to bed after death' (#47) from Vesna_resets_to_bed_after_dead into develop
Reviewed-on: #47
Reviewed-by: Jonathan <cblech@ymail.com>
|
2025-12-16 19:37:29 +01:00 |
|
|
Jonathan
|
6deb6e29fd
|
Merge pull request 'Made attack selection only select alive enemies' (#45) from bug/attack_dead_enemy into develop
Reviewed-on: #45
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:30:33 +01:00 |
|
|
Jonathan
|
edc133749f
|
Merge pull request 'Randomized who starts the fight' (#41) from randomise_fight_start into develop
Reviewed-on: #41
Reviewed-by: kziolkowski <katharina.ziolkowski@gmail.com>
|
2025-12-16 19:28:37 +01:00 |
|
 jonathan
|
5f75bde317
|
💄 Made heal button show how many beats are left
|
2025-12-16 19:24:20 +01:00 |
|
|
jonathan
|
7310bfbf6e
|
✨Added flying beet to the ui when used
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
fef8380a57
|
✨When beetroot is in inventory the player can heal
|
2025-12-16 19:09:03 +01:00 |
|
|
jonathan
|
f42c2c86b1
|
✨ Defeated enemygroups now drop a beet_seed
|
2025-12-16 19:09:03 +01:00 |
|
 jlink
|
2ed9dbbc52
|
Vesna resets to bed after death
|
2025-12-16 15:34:52 +01:00 |
|
|
jonathan
|
6375383373
|
🐛Made attack selection only select alive enemies
|
2025-12-11 18:49:51 +01:00 |
|
|
jonathan
|
a736adaafb
|
Randomized who starts the fight
|
2025-12-09 15:07:50 +01:00 |
|
|
jonathan
|
aad6c44567
|
Added randomnes into attack minigame
|
2025-12-04 18:00:20 +01:00 |
|
|
jonathan
|
3f4dfccbc6
|
🐛Make the FightWorld reset when sleeping in the bed
|
2025-11-25 18:43:48 +01:00 |
|
|
jonathan
|
3c370e30a0
|
✨Added end of night scene
|
2025-11-25 18:07:21 +01:00 |
|
|
jonathan
|
073a74bb22
|
🚸Rebalanded fight to make it more likely to win
|
2025-11-25 17:32:27 +01:00 |
|
|
jonathan
|
3bb4fcd129
|
✨Added damage fly number
|
2025-11-11 15:55:41 +01:00 |
|
|
jonathan
|
54bfc3c021
|
🐛 Fixed enemy groups show in different spots and even when all enemies are dead
|
2025-11-11 14:06:58 +01:00 |
|
|
Jonathan
|
e1a61fb1e2
|
Merge pull request 'made dead fighters shrink to telegraph to the player that they are dead' (#25) from feature/dead_squash into develop
Reviewed-on: #25
|
2025-11-11 10:20:44 +01:00 |
|
|
jonathan
|
edbd4a182b
|
🎨Removed comment
|
2025-11-11 10:19:37 +01:00 |
|
|
jonathan
|
f51275ccc0
|
✨ made dead fighters shrink to telegraph to the player that they are dead
|
2025-11-04 16:42:16 +01:00 |
|
|
jonathan
|
50b2c04cb4
|
🐛 Fixed fighters keep fighting at 0 hp
|
2025-11-04 13:55:37 +01:00 |
|
|
jonathan
|
21b361f9d7
|
🎨 Live review changes
|
2025-11-04 10:07:19 +01:00 |
|
|
jonathan
|
83dc6bfd56
|
♻️ Implemented FightersFormation to keep track of the fight entered state of the fighters
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
0de3bcae22
|
♻️Code cleanup
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
3326bde40c
|
🐛Exiting fight happening when one side wins
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
83c9dfc945
|
✨Added theme-based region colors
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
cd235248c6
|
✨Added minigame label for each region
|
2025-11-04 05:59:19 +01:00 |
|
|
jonathan
|
8bb1c22549
|
Added minigame to attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
8624e2aea8
|
Added minigame
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
fef1bcc3b6
|
cap health at minimum 0
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f4d8ed87e2
|
Added blob attack action
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
1f227f70a7
|
Added basic health bar
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
9bf25640f6
|
Added basic action animation
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
0e315396c9
|
Made fight fightable
|
2025-11-04 05:59:18 +01:00 |
|
|
jonathan
|
f27dd199b8
|
Fight happening base setup
|
2025-11-04 05:27:34 +01:00 |
|
|
jonathan
|
fd0e631b1f
|
Bootstrap fight system
- Fight World data structure
- Generating basic fight world
- Opening correct fight room
- Block paths in fight rooms
- Transition between rooms
|
2025-11-04 05:25:22 +01:00 |
|
 kziolkowski
|
0f246825fc
|
Added Wellbehaviour and fixed door interaction to offer outlines
|
2025-07-31 20:36:17 +02:00 |
|
|
kziolkowski
|
730c4999d7
|
Extracted FightAttack Enum in the hopes of fixing errors
|
2025-07-31 20:35:24 +02:00 |
|
 cblech
|
c0e002f783
|
made you win waiting time shorter
|
2025-07-11 03:01:49 +02:00 |
|
|
cblech
|
8bd2b09232
|
Added healing
|
2025-07-10 23:32:16 +02:00 |
|
|
cblech
|
4752002caf
|
Added action per round
|
2025-07-10 18:29:18 +02:00 |
|
|
cblech
|
0e028a2cb9
|
Renamed signal
|
2025-07-10 16:12:47 +02:00 |
|
|
cblech
|
92c3f5e054
|
Target only alive enemies
|
2025-07-10 15:25:11 +02:00 |
|
|
cblech
|
6727339e9a
|
Added audio to fight
|
2025-07-10 04:39:33 +02:00 |
|
|
cblech
|
b6fd6292e3
|
Basic fighting system
|
2025-07-10 03:38:48 +02:00 |
|