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

code/game/impl/player.c

@@ -2,47 +2,9 @@
 #include <SDL3/SDL_events.h>
 #include <SDL3/SDL_keycode.h>
 #include <stdio.h>
+#include "../outfit.h"
+#include "../npc.h"
 
-// @Todo: move/extern these so the npc/bandit can use them
-//
-#define G_OUTFIT_COMPONENT_COUNT 8
-
-global_var Str8 __outfit_names[] = {
-	Sl("npc_%s_base_%d"),
-	Sl("npc_%s_eyes_%d"),
-	Sl("npc_%s_face_%d"),
-	Sl("npc_%s_hair_%d"),
-	Sl("npc_%s_hat_%d"),
-	Sl("npc_%s_shirt_%d"),
-	Sl("npc_%s_shoes_%d"),
-	Sl("npc_%s_trousers_%d")
-};
-
-global_var U32 __outfit_counts[] = {
-	2, // base
-	3, // eyes
-	5, // face
-	4, // hair
-	3, // hat
-	2, // shirt
-	1, // shoes
-	2  // trousers
-};
-
-global_var U32 __outfit_back_counts[] = {
-	2, // base
-	0, // eyes
-	3, // face
-	4, // hair
-	3, // hat
-	2, // shirt
-	1, // shoes
-	2  // trousers
-};
-
-StaticAssert(ArraySize(__outfit_names) == ArraySize(__outfit_counts));
-
-#define OUTFIT_IMG(dir, n) D_ImageHandle(&game->draw, Sf(temp.arena, (const char *) __outfit_names[it].data, #dir, n))
 
 void PlayerInit(G_State *game, Player *player) {
 	World *world  = game->world;
@@ -105,6 +67,16 @@ void PlayerInput(SDL_Event *event, Player *player)
         player->controls.downDown = val;
         break;
       }
+      case SDLK_E:
+      {
+        for(int i = 0; player->world->npcCount; i++){
+          NPC *npc = &player->world->npcs[i];
+          if(AABB_Circle(npc->interationRadius, npc->collision.pos, player->collision) && !npc->infoGiven){
+            npc->infoGiven=true;
+            player->knownDetails[player->detailCount] = player->world->bandit.outfitChoices[player->detailCount];
+          }
+        }
+      }
     }
   }
   if (