aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornathan <nathansmith@disroot.org>2026-01-19 11:32:08 +0000
committernathan <nathansmith@disroot.org>2026-01-19 11:32:08 +0000
commit8823db2da13322b006f36081901c48fe9419649c (patch)
tree1a602b129c0d6d070f28f4004f988253425f7099
parentb3e4498e525a41df13ab22d3ad209ed4f71c7a86 (diff)
downloadFindThings-8823db2da13322b006f36081901c48fe9419649c.tar.gz
FindThings-8823db2da13322b006f36081901c48fe9419649c.tar.bz2
FindThings-8823db2da13322b006f36081901c48fe9419649c.zip
idk what i did
-rw-r--r--design/design.org4
-rw-r--r--src/entities/oldMint.c1
-rw-r--r--src/entities/stickyNickel.c1
-rw-r--r--src/entity.h2
-rw-r--r--src/ui.h1
5 files changed, 7 insertions, 2 deletions
diff --git a/design/design.org b/design/design.org
index 3988bab..feead54 100644
--- a/design/design.org
+++ b/design/design.org
@@ -157,12 +157,12 @@ generated first than rest of the world will be based around it.
+ [X] Places
+ [ ] Roads
-* TODO Check list [1/8]
+* TODO Check list [2/8]
+ [ ] World generation completed
+ [ ] Menu and UI
+ [X] Interaction system
+ [ ] Inventory
-+ [ ] Mad libs system
++ [X] Mad libs system
+ [ ] All characters added
+ [ ] All items added
+ [ ] All levels added
diff --git a/src/entities/oldMint.c b/src/entities/oldMint.c
index be90ed6..1c95902 100644
--- a/src/entities/oldMint.c
+++ b/src/entities/oldMint.c
@@ -16,6 +16,7 @@ InteractionCommand interactWithOldMint(Entity* entity, Game* game,
{
InventoryItem item = (InventoryItem){
.id = OLD_MINT,
+ .parent = entity,
.textureId = MINT_TEXTURE,
.count = 1
};
diff --git a/src/entities/stickyNickel.c b/src/entities/stickyNickel.c
index 87d3687..00b7da1 100644
--- a/src/entities/stickyNickel.c
+++ b/src/entities/stickyNickel.c
@@ -18,6 +18,7 @@ InteractionCommand interactWithStickyNickel(Entity* entity, Game* game,
{
InventoryItem item = (InventoryItem){
.id = STICKY_NICKEL,
+ .parent = entity,
.textureId = NICKEL_TEXTURE,
.count = 1
};
diff --git a/src/entity.h b/src/entity.h
index 45036d4..41ca8c0 100644
--- a/src/entity.h
+++ b/src/entity.h
@@ -54,6 +54,7 @@ enum InteractionCommand {
INTERACTION_TALK,
INTERACTION_SHOW_MENU,
INTERACTION_TALK_AND_SHOW_MENU,
+ INTERACTION_KILL_ITEM,
INTERACTION_DO_NOTHING
};
@@ -61,6 +62,7 @@ enum Selection {
SELECTION_NONE = -1,
SELECTION_INTERACT,
SELECTION_NEXT_MESSAGE,
+ SELECTION_USE,
SELECTION_MENU_ITEM, // +x to select any given menu entry
SELECTION_LEAVE = SELECTION_MENU_ITEM + INTERACTION_MENU_MAX
};
diff --git a/src/ui.h b/src/ui.h
index 14845d4..2892fe9 100644
--- a/src/ui.h
+++ b/src/ui.h
@@ -36,6 +36,7 @@ typedef struct {
typedef struct {
EntityId id;
+ Entity* parent;
AssetId textureId;
int count;
} InventoryItem;