Merge branch 'main' of yibble.dev:bulmanator/ld58

code/game/aabb.h

@@ -14,5 +14,6 @@ function bool AABB_Collide(AABB a, AABB b);
 function bool AABB_Point(AABB a, V2f v);
 function bool AABB_Slab(V2f origin, V2f point, AABB a);
 function V2f AABB_Centre(AABB a);
+function bool AABB_Circle(F32 rad, V2f radOrigin, AABB a);
 
 #endif // LD_GAME_AABB_H_

code/game/bandit.h

@@ -2,11 +2,13 @@
 #define LD_GAME_BANDIT_H_
 
 typedef enum BANDIT_ACTION BANDIT_ACTION;
-enum BANDIT_ACTION {
+enum BANDIT_ACTION
+{
   BANDIT_WAITING,
   BANDIT_WALKING,
   BANDIT_RUNNING,
   BANDIT_SHOOTING,
+  BANDIT_SHOOTOUT,
 };
 
 typedef struct Bandit Bandit;
@@ -50,12 +52,18 @@ struct Bandit {
   F32 shootDelay;
   // After each shot this is set to shootDelay;
   F32 shootCooldownTimer;
+  // Countdown to shootout
+  F32 shootoutTimer;
   // How long it takes them to reload.
   F32 reloadTime;
+  // When gun is empty this is set to reloadTime.
+  F32 reloadTimer;
   // Accuracy, their shots can vary between this angle either side (rads)
   F32 accuracyRange;
   // A the circle around the bandit where they will trigger the quicktime reaction scene
   F32 agroRadius;
 };
 
+function V2f shootTowards(Bandit* bandit, V2f target, Random* r);
+
 #endif  // LD_GAME_BANDIT_H_

code/game/impl/aabb.c

@@ -38,3 +38,11 @@ bool AABB_Slab(V2f origin, V2f point, AABB a)
 V2f AABB_Centre(AABB a) {
   return V2F(a.pos.x + a.size.x/2, a.pos.y + a.size.y/2);
 }
+
+bool AABB_Circle(F32 rad, V2f radOrigin, AABB a)
+{
+  V2f aCentre = AABB_Centre(a);
+  F32 xSq = (Abs(aCentre.x) - Abs(radOrigin.x)) * (Abs(aCentre.x) - Abs(radOrigin.x));
+  F32 ySq = (Abs(aCentre.y) - Abs(radOrigin.y)) * (Abs(aCentre.y) - Abs(radOrigin.y));
+  return SDL_sqrt(xSq + ySq) < rad;
+}

code/game/impl/bandit.c

@@ -1,13 +1,27 @@
 #include "game/world.h"
 #include "game/bandit.h"
 
+V2f shootTowards(Bandit *bandit, V2f target, Random* r)
+{
+  V2f shooterV2 = bandit->collision.pos;
+  F32 randX = Random_F32(r, -bandit->accuracyRange, bandit->accuracyRange);
+  F32 randY = Random_F32(r, -bandit->accuracyRange, bandit->accuracyRange);
+  return V2F(shooterV2.x + (target.x - shooterV2.x) * (1 + randX), shooterV2.x + (target.y - shooterV2.y) * (1 + randY));
+}
+
 void UpdateBandit(F32 delta, Bandit *bandit, World *world) {
   if (
-      world->player.controls.shot && AABB_Slab(world->player.pos, world->player.shotPos, bandit->collision) && bandit->currentArea == world->player.currentArea)
+      world->player.controls.shot && AABB_Slab(world->player.collision.pos, world->player.shotPos, bandit->collision) && bandit->currentArea == world->player.currentArea)
   {
     printf("You shot the bandit %*.s\n", Sv(bandit->name));
     bandit->health--;
   }
+  if (AABB_Circle(bandit->agroRadius, AABB_Centre(bandit->collision), world->player.collision) && !(bandit->mode == BANDIT_SHOOTING || bandit->mode == BANDIT_SHOOTOUT))
+  {
+    printf("begin shootout");
+    // shootout time o.o
+    bandit->mode = BANDIT_SHOOTOUT;
+  }
   switch (bandit->mode) {
     case BANDIT_WAITING:
       bandit->waitTime+=delta;
@@ -41,7 +55,33 @@ void UpdateBandit(F32 delta, Bandit *bandit, World *world) {
       bandit->collision.pos.x = cNav.pos.x * (1 - bandit->walkTimer/NPC_SPEED) + tNav.pos.x * bandit->walkTimer/NPC_SPEED;
       bandit->collision.pos.y = cNav.pos.y * (1 - bandit->walkTimer/NPC_SPEED) + tNav.pos.y * bandit->walkTimer/NPC_SPEED;
     break;
-      // TODO Shooting
+    case BANDIT_SHOOTOUT:
+      bandit->shootoutTimer-=delta; 
+      if(bandit->shootoutTimer < 0){
+        bandit->mode=BANDIT_SHOOTING;
+      }
+    break;
+    case BANDIT_SHOOTING:
+      bandit->shootCooldownTimer -= delta;
+      bandit->reloadTimer -= delta;
+      if (bandit->shootCooldownTimer < 0 && bandit->reloadTimer < 0)
+      {
+        printf("shoot at player");
+        bandit->bullets--;
+        bandit->shootCooldownTimer = bandit->shootDelay;
+        V2f banditShot = shootTowards(bandit, world->player.collision.pos, &world->random);
+        if(AABB_Slab(bandit->collision.pos, banditShot, world->player.collision)){
+          // gets shot lmao
+          printf("hit");
+          world->player.health--;
+        }
+        if(bandit->bullets == 0){
+          printf("enemy reload");
+          bandit->bullets = 6;
+          bandit->reloadTimer = bandit->reloadTime;
+        }
+      }
+    break;
       // TODO Running away
   }
 }

code/game/impl/player.c

@@ -48,8 +48,13 @@ void PlayerInit(G_State *game, Player *player) {
 	World *world  = game->world;
 	player->world = world;
 
-	world->player.bulletsLoaded = PLAYER_BULLET_COUNT;
-	world->player.currentArea = WORLD_AREA_OUTSIDE;
+	player->bulletsLoaded = PLAYER_BULLET_COUNT;
+	player->currentArea   = WORLD_AREA_OUTSIDE;
+
+	player->health = 3;
+
+	player->collision.size.x = 1;
+	player->collision.size.x = 2;
 
 	G_Outfit *outfit = &player->outfit;
 
@@ -122,6 +127,10 @@ void PlayerInput(SDL_Event *event, Player *player)
 void PlayerUpdate(F32 delta, Player *player) {
   player->controls.shot = false;
   V2f dir = V2F(0, 0);
+  if(player->health == 0){
+    printf("dead :(");
+    player->health = 3;
+  }
   if(player->controls.upDown) {
     dir.y -= 1;
 		player->outfit.dir = G_OUTFIT_DIR_BACK;
@@ -154,8 +163,8 @@ void PlayerUpdate(F32 delta, Player *player) {
     }
   }
   dir = V2f_Scale(NormaliseV2F(dir), PLAYER_SPEED*delta);
-  player->pos.x += dir.x;
-  player->pos.y += dir.y;
+  player->collision.pos.x += dir.x;
+  player->collision.pos.y += dir.y;
 }
 
 void PlayerDraw(D_Context *draw, Player *player) {
@@ -170,7 +179,7 @@ void PlayerDraw(D_Context *draw, Player *player) {
 		U32 tid = outfit->e[dir].e[it];
 		if (tid != 0) {
 			U32 flags = D_RECT_UV_ASPECT | (flipped ? D_RECT_FLIP_X : 0);
-			D_Rect(draw, player->pos.x, player->pos.y, .texture = tid, .uv = pframe, .flags = flags);
+			D_Rect(draw, player->collision.pos.x, player->collision.pos.y, .texture = tid, .uv = pframe, .flags = flags);
 		}
 	}
 }

code/game/impl/world.c

@@ -9,6 +9,9 @@
 
 void UpdateWorld(F32 delta, World *world)
 {
+  if(world->bandit.mode == BANDIT_SHOOTOUT){
+    delta = delta/4;
+  }
   UpdateBandit(delta, &world->bandit, world);
   UpdateNPCs(delta, world);
   PlayerUpdate(delta, &world->player);
@@ -21,7 +24,7 @@ void UpdateNPCs(F32 delta, World *world)
     NPC *npc = &world->npcs[i];
     UpdateNPC(delta, npc, world);
     if (
-        world->player.controls.shot && AABB_Slab(world->player.pos, world->player.shotPos, npc->collision) && npc->currentArea == world->player.currentArea)
+        world->player.controls.shot && AABB_Slab(world->player.collision.pos, world->player.shotPos, npc->collision) && npc->currentArea == world->player.currentArea)
     {
       printf("You shot %*.s\n", Sv(world->npcs[i].name));
     }

code/game/player.h

@@ -5,6 +5,7 @@
 #include "../core/macros.h"
 
 #include <SDL3/SDL_events.h>
+#include "aabb.h"
 
 #define PLAYER_SPEED 10.0f
 #define PLAYER_RELOAD_TIME 1.5f
@@ -23,7 +24,7 @@ typedef struct Player Player;
 struct Player
 {
     World *world;
-    V2f pos;
+    AABB collision;
     World_Area currentArea;
     U32 bulletsLoaded;
     ControlState controls;
@@ -31,6 +32,7 @@ struct Player
 
 		G_Outfit outfit;
 
+    U32 health;
     F32 reloadTimer;
 };