cleanup

Author: frixaco

pufferlib/ocean/boss_fight/README.md

@@ -21,7 +21,7 @@ The boss cycles through:
 
 `IDLE (BOSS_IDLE_TICKS) -> WINDUP (BOSS_WINDUP_TICKS) -> ACTIVE (BOSS_ACTIVE_TICKS) -> RECOVERY (BOSS_RECOVERY_TICKS) -> ...`
 
-During **ACTIVE**, the boss deals damage if the player overlaps the AOE circle.
+During **ACTIVE**, the boss deals `BOSS_ATTACK_DMG` damage **every tick** the player overlaps the AOE circle (unless i-framed). Staying in the AOE for the full 5 ticks = 75 damage.
 
 ### Player mechanics
 

pufferlib/ocean/boss_fight/boss_fight.h

@@ -5,26 +5,26 @@
 
 #define ARENA_HALF_SIZE 500.0f
 #define MAX_HP 100.0f
-#define PLAYER_SPEED_PER_TICK 25.0f
+#define EPSILON 1e-6f
+
 #define PLAYER_SIZE 30.0f
-#define BOSS_SIZE 50.0f
+#define PLAYER_SPEED_PER_TICK 25.0f
 #define PLAYER_ATTACK_RADIUS 40.0f
 #define PLAYER_ATTACK_TICKS 3
+#define PLAYER_ATTACK_DMG 5.0f
 #define PLAYER_DODGE_TICKS 4
 #define PLAYER_IFRAME_TICKS 2
 #define PLAYER_DODGE_COOLDOWN 15
 #define PLAYER_DODGE_SPEED_PER_TICK 35.0f
-#define PLAYER_ATTACK_DMG 5.0f
+
+#define BOSS_SIZE 50.0f
 #define BOSS_ATTACK_DMG 15.0f
 #define BOSS_AOE_ATTACK_RADIUS 80.0f
 #define BOSS_IDLE_TICKS 7
 #define BOSS_WINDUP_TICKS 5
 #define BOSS_ACTIVE_TICKS 5
 #define BOSS_RECOVERY_TICKS 5
 
-#define HP_BAR_WIDTH 40
-#define HP_BAR_HEIGHT 5
-
 #define REWARD_APPROACH 0.7f
 #define REWARD_HIT_WALL -0.05f
 #define REWARD_PLAYER_HIT_BOSS 0.07f
@@ -36,12 +36,23 @@
 #define REWARD_TICK -0.01f
 #define EPISODE_LENGTH 600
 
-const Color PLAYER_COLOR = (Color){50, 100, 255, 255};
-const Color BOSS_COLOR = (Color){0, 187, 187, 255};
-const Color TEXT_COLOR = (Color){241, 241, 241, 255};
-const Color HITBOX_COLOR = (Color){241, 241, 241, 50};
-const Color BACKGROUND_COLOR = (Color){6, 24, 24, 255};
-const Color HP_COLOR = (Color){0, 255, 0, 255};
+#define WINDOW_SIZE 720
+#define TARGET_FPS 30
+#define HP_BAR_WIDTH 40
+#define HP_BAR_HEIGHT 5
+#define UI_MARGIN 20
+#define UI_RIGHT_X 580
+#define UI_BOTTOM_Y 680
+#define UI_HP_BAR_Y 700
+#define UI_FONT_SIZE 20
+#define UI_FONT_SIZE_SMALL 16
+
+static const Color PLAYER_COLOR = (Color){50, 100, 255, 255};
+static const Color BOSS_COLOR = (Color){0, 187, 187, 255};
+static const Color TEXT_COLOR = (Color){241, 241, 241, 255};
+static const Color HITBOX_COLOR = (Color){241, 241, 241, 50};
+static const Color BACKGROUND_COLOR = (Color){6, 24, 24, 255};
+static const Color HP_COLOR = (Color){0, 255, 0, 255};
 
 typedef enum { PLAYER_IDLING, PLAYER_DODGING, PLAYER_ATTACKING } PlayerState;
 
@@ -220,6 +231,7 @@ void c_step(BossFight *env) {
     else
       action = 0;
   }
+
   float dx = 0;
   float dy = 0;
 
@@ -260,12 +272,12 @@ void c_step(BossFight *env) {
     env->player_state = PLAYER_DODGING;
   }
 
-  // Dodge = multi-tick movement out of the AOE (no i-frames)
+  // Dodge: multi-tick movement away from boss, with i-frames at start
   if (env->player_state == PLAYER_DODGING) {
     float away_x = env->player_x - env->boss_x;
     float away_y = env->player_y - env->boss_y;
     float away_norm = sqrtf(away_x * away_x + away_y * away_y);
-    if (away_norm > 1e-6f) {
+    if (away_norm > EPSILON) {
       env->player_x += (away_x / away_norm) * PLAYER_DODGE_SPEED_PER_TICK;
       env->player_y += (away_y / away_norm) * PLAYER_DODGE_SPEED_PER_TICK;
     }
@@ -290,7 +302,7 @@ void c_step(BossFight *env) {
   env->dist_to_boss = dist;
 
   // Push player out if clipping into boss
-  if (dist < BOSS_SIZE + PLAYER_SIZE && dist > 1e-6f) {
+  if (dist < BOSS_SIZE + PLAYER_SIZE && dist > EPSILON) {
     float overlap = BOSS_SIZE + PLAYER_SIZE - dist;
     float dx = env->player_x - env->boss_x;
     float dy = env->player_y - env->boss_y;
@@ -313,8 +325,7 @@ void c_step(BossFight *env) {
       env->player_state == PLAYER_DODGING &&
       env->player_state_ticks > (PLAYER_DODGE_TICKS - PLAYER_IFRAME_TICKS);
 
-  // AOE persists longer than the i-frame window
-  // If player is still in the hitbox after i-frames, you get hit.
+  // Boss deals damage every tick while player in AOE (unless i-framed)
   bool boss_can_hit = in_aoe_attack && !player_iframed;
   bool boss_can_damage = env->boss_state == BOSS_ATTACKING && boss_can_hit;
   if (boss_can_damage) {
@@ -399,17 +410,17 @@ void c_step(BossFight *env) {
 
 int world_to_screen(float world_coord) {
   return (int)((world_coord + ARENA_HALF_SIZE) / (2 * ARENA_HALF_SIZE) *
-               720.0f);
+               (float)WINDOW_SIZE);
 }
 
 float radius_to_screen(float world_radius) {
-  return world_radius / (2 * ARENA_HALF_SIZE) * 720.0f;
+  return world_radius / (2 * ARENA_HALF_SIZE) * (float)WINDOW_SIZE;
 }
 
 void c_render(BossFight *env) {
   if (!IsWindowReady()) {
-    InitWindow(720, 720, "BossFight");
-    SetTargetFPS(30);
+    InitWindow(WINDOW_SIZE, WINDOW_SIZE, "BossFight");
+    SetTargetFPS(TARGET_FPS);
   }
 
   if (IsKeyDown(KEY_ESCAPE)) {
@@ -419,19 +430,19 @@ void c_render(BossFight *env) {
   BeginDrawing();
 
   ClearBackground(BACKGROUND_COLOR);
-  DrawText("Beat the boss!", 20, 20, 20, TEXT_COLOR);
+  DrawText("Beat the boss!", UI_MARGIN, UI_MARGIN, UI_FONT_SIZE, TEXT_COLOR);
 
   // Stats top-right
   char stats[64];
   snprintf(stats, sizeof(stats), "W:%d L:%d T:%d", env->player_wins,
            env->boss_wins, env->timeouts);
-  DrawText(stats, 580, 20, 20, TEXT_COLOR);
+  DrawText(stats, UI_RIGHT_X, UI_MARGIN, UI_FONT_SIZE, TEXT_COLOR);
 
   // Player
   int player_sx = world_to_screen(env->player_x);
   int player_sy = world_to_screen(env->player_y);
-  int player_hp_bar_y = player_sy + (int)radius_to_screen(PLAYER_SIZE) + 5;
-  int player_hp_width = (int)((float)env->player_hp / MAX_HP * HP_BAR_WIDTH);
+  float player_hp_ratio = fmaxf(0.0f, fminf(1.0f, env->player_hp / MAX_HP));
+  int player_hp_width = (int)(player_hp_ratio * HP_BAR_WIDTH);
 
   Color player_color = env->player_hp <= 0 ? RED : PLAYER_COLOR;
   DrawCircle(player_sx, player_sy,
@@ -442,8 +453,8 @@ void c_render(BossFight *env) {
   // Boss
   int boss_sx = world_to_screen(env->boss_x);
   int boss_sy = world_to_screen(env->boss_y);
-  int boss_hp_bar_y = boss_sy + (int)radius_to_screen(BOSS_SIZE) + 5;
-  int boss_hp_width = (int)((float)env->boss_hp / MAX_HP * HP_BAR_WIDTH);
+  float boss_hp_ratio = fmaxf(0.0f, fminf(1.0f, env->boss_hp / MAX_HP));
+  int boss_hp_width = (int)(boss_hp_ratio * HP_BAR_WIDTH);
 
   Color boss_color = env->boss_hp <= 0 ? RED : BOSS_COLOR;
   DrawCircle(boss_sx, boss_sy,
@@ -452,14 +463,18 @@ void c_render(BossFight *env) {
   DrawCircle(boss_sx, boss_sy, radius_to_screen(BOSS_SIZE), boss_color);
 
   // Player HP bar - bottom left
-  DrawText("Player", 20, 680, 16, TEXT_COLOR);
-  DrawRectangle(20, 700, HP_BAR_WIDTH * 3, HP_BAR_HEIGHT, DARKGRAY);
-  DrawRectangle(20, 700, player_hp_width * 3, HP_BAR_HEIGHT, HP_COLOR);
+  DrawText("Player", UI_MARGIN, UI_BOTTOM_Y, UI_FONT_SIZE_SMALL, TEXT_COLOR);
+  DrawRectangle(UI_MARGIN, UI_HP_BAR_Y, HP_BAR_WIDTH * 3, HP_BAR_HEIGHT,
+                DARKGRAY);
+  DrawRectangle(UI_MARGIN, UI_HP_BAR_Y, player_hp_width * 3, HP_BAR_HEIGHT,
+                HP_COLOR);
 
   // Boss HP bar - bottom right
-  DrawText("Boss", 580, 680, 16, TEXT_COLOR);
-  DrawRectangle(580, 700, HP_BAR_WIDTH * 3, HP_BAR_HEIGHT, DARKGRAY);
-  DrawRectangle(580, 700, boss_hp_width * 3, HP_BAR_HEIGHT, HP_COLOR);
+  DrawText("Boss", UI_RIGHT_X, UI_BOTTOM_Y, UI_FONT_SIZE_SMALL, TEXT_COLOR);
+  DrawRectangle(UI_RIGHT_X, UI_HP_BAR_Y, HP_BAR_WIDTH * 3, HP_BAR_HEIGHT,
+                DARKGRAY);
+  DrawRectangle(UI_RIGHT_X, UI_HP_BAR_Y, boss_hp_width * 3, HP_BAR_HEIGHT,
+                HP_COLOR);
 
   EndDrawing();
 }