From 0b58b30d11e58be1babd34802756c74db810d874 Mon Sep 17 00:00:00 2001
From: Anonymus Raccoon
Date: Sat, 2 May 2020 15:06:49 +0200
Subject: [PATCH] Adding a chest for the water jet
---
include/setup.h | 2 ++
prefabs/game.gcprefab | 12 ++++++++++++
src/game_loader.c | 1 +
src/npc/fisherman.c | 22 ++++++++++++++++++++++
src/npc/smith.c | 4 ++--
5 files changed, 39 insertions(+), 2 deletions(-)
diff --git a/include/setup.h b/include/setup.h
index 63be7e1..c2955e5 100644
--- a/include/setup.h
+++ b/include/setup.h
@@ -75,6 +75,8 @@ gc_vector2 pos, enum gc_mousekeys key);
void fisherman_setup(gc_engine *engine);
bool fisherman_next(gc_engine *engine, gc_entity *entity, \
gc_vector2 pos, enum gc_mousekeys key);
+bool fisherman_chest(gc_engine *engine, gc_entity *entity, \
+gc_vector2 pos, enum gc_mousekeys key);
bool lumberjack_yes(gc_engine *engine, gc_entity *entity, \
gc_vector2 pos, enum gc_mousekeys key);
diff --git a/prefabs/game.gcprefab b/prefabs/game.gcprefab
index 9c6f6b4..5e9110d 100644
--- a/prefabs/game.gcprefab
+++ b/prefabs/game.gcprefab
@@ -264,6 +264,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/game_loader.c b/src/game_loader.c
index 8c9fb6d..13217b6 100644
--- a/src/game_loader.c
+++ b/src/game_loader.c
@@ -60,6 +60,7 @@ const struct gc_data game_data[] = {
{"dialog_callback", "mia_setup", &mia_setup, NULL},
{"input", "fisherman_next", &fisherman_next, NULL},
{"dialog_callback", "fisherman_setup", &fisherman_setup, NULL},
+ {"dialog_callback", "fisherman_chest", &fisherman_chest, NULL},
{"input", "lumberjack_yes", &lumberjack_yes, NULL},
{"dialog_callback", "smith_chest", &smith_chest, NULL},
{NULL, NULL, NULL, NULL}
diff --git a/src/npc/fisherman.c b/src/npc/fisherman.c
index 949ce0b..ebf3805 100644
--- a/src/npc/fisherman.c
+++ b/src/npc/fisherman.c
@@ -7,6 +7,7 @@
#include "components/dialog_holder.h"
#include "systems/game_manager_system.h"
+#include "components/player_component.h"
#include "engine.h"
@@ -37,4 +38,25 @@ that I will show up at...", NULL);
dialog_add_line(dialog, "Fisherman", "her house for dinner tonight.", NULL);
GETSYS(engine, game_manager_system)->has_message = true;
return (true);
+}
+
+bool fisherman_chest(gc_engine *engine, gc_entity *entity, \
+gc_vector2 pos, enum gc_mousekeys key)
+{
+ struct dialog_holder *dialog = dialog_get_current(engine);
+ gc_entity *player = engine->scene->get_entity(engine->scene, 50);
+ struct player_component *inv;
+
+ if (!player)
+ return (false);
+ inv = GETCMP(player, player_component);
+ if (!inv)
+ return (false);
+ dialog->text[1] = NULL;
+ if (inv->inventory_upgrades[1])
+ dialog_add_line(dialog, NULL, "This chest is empty.", NULL);
+ else
+ dialog_add_line(dialog, "", "You found the water jet upgrade!", NULL);
+ inv->inventory_upgrades[1] = true;
+ return (true);
}
\ No newline at end of file
diff --git a/src/npc/smith.c b/src/npc/smith.c
index 6cc5fca..1ae9c2e 100644
--- a/src/npc/smith.c
+++ b/src/npc/smith.c
@@ -5,8 +5,8 @@
** smith.c
*/
-#include
-#include
+#include "components/player_component.h"
+#include "components/dialog_holder.h"
#include "engine.h"
bool smith_chest(gc_engine *engine, gc_entity *entity, \