From f70c2fe047b23587af732accbc19e450f05e1d14 Mon Sep 17 00:00:00 2001
From: Cameron Reikes <cameronreikes@gmail.com>
Date: Mon, 1 May 2023 00:59:12 -0700
Subject: [PATCH] Gold coin to be traded for the chalice

---
 assets.mdesk          |   4 ++
 assets/gold_coin.png  | Bin 0 -> 945 bytes
 assets/new_level.json |  23 +++++++-
 character_info.h      | 129 +++++++++++++++++++++++-------------------
 main.c                |   4 ++
 makeprompt.h          |   2 +-
 6 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 assets/gold_coin.png

diff --git a/assets.mdesk b/assets.mdesk
index b245001..07a15b9 100644
--- a/assets.mdesk
+++ b/assets.mdesk
@@ -30,6 +30,10 @@
 {
  filepath: "chalice_of_gold.png",
 }
+@image gold_coin:
+{
+ filepath: "gold_coin.png",
+}
 @image new_knight_idle:
 {
  filepath: "copyrighted/knight_idle.png",
diff --git a/assets/gold_coin.png b/assets/gold_coin.png
new file mode 100644
index 0000000000000000000000000000000000000000..d17ef2f8eccd4179cd78e9224d167e85f94f0ae4
GIT binary patch
literal 945
zcmV;i15W&jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004nX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmP!xqvQ%glF4t5Z6$WWauh!$~_Di*;)X)CnqVDi#GXws0R
zxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOi<Ed@QfLw5g~$6i@1DbZ_W?q)%2cyw5>PeE
zNGIZAF25=UUlD*0e#Fo(F;h=w7PIiIuY2mHx{LBG@4i24Kq;6E@QK88OgAjz4dR(i
zOXs{#9A;%nAwDObFzABBk6f2se&bwnSm2pqBb%Nl4ik%|E|$BPl?|0RMjTO8jq-(@
z%L?Z$&T6&J+V|uy3>CDM4A*ImB7r3&k%9;rbyQG=g(&SBDJIf%9{2E%IQ|s5WO7x&
z$gzMLR7j2={11N5)+|m>xk;fo5O}fek1-&)3$z-x{e5iPtrNii3|wg)f2|43ev;nk
zXptjea2vR|?r8EJaJd5vKk1SoIg+22P%HxPXY@^ZVCWX;TXW~uKF8?;kfm8I-v9@P
zz<7zW*FE0d+da2`d)o8+0Y#5;mCeK#YybcN24YJ`L;(K){{a7>y{D4^000SaNLh0L
z04^f{04^f|c%?sf00007bV*G`2j>L=1~&%EAP_tN000?uMObu0Z*6U5Zgc=ca%Ew3
zWn>_CX>@2HM@dakSAh-}0004qNkl<Zc-rlou@S;B3`HXyH6=9_+b|AOFb>;LQB$%2
z^c+WQ=}VSk{gUIX{O2zx4rW<OrBZ2Pk!P{n_3-}w?0k9BW&!*%ye4lT6vg-`5ERY0
zHxSBT-Vy|5F>VEdGMYz1NDTl1g1n5Mj{DW`+#fG@2xMu##WWIz1Oi(`@^sv*%uC0R
zBy)!>pf&w(Oig=0T402EX<PKP0wZV1TCH_@T7k6#dYQMX#~Ef`Qnxh)jEqx8akkk<
zr+}Bq#S(&}XCHYTm4K}qTw4ctMC>B90nd8-t2LkiOafqSXIKd+00p1`bS)lM@8+b^
zUQZ=p=3Af`K$JE>TnB3jPTK;bQ-G?^h(5~N|LR3>R0@!FAwP|Iz9eZeZ}QXFzd^l{
zU{Qx7Uz}w8-ZjhQfCRE7dce9IkZ37#f4tO*K#b9%omXr(b4IAA6{6kqp#UO*7z$uC
z1nrY*n#0mokLd8{d=Ci7{fXH|#{z`K#>{-D7yZu@?pxg!ATzv(DV0j4QUrYf<<Z1i
T26v5700000NkvXXu0mjf|3;HY

literal 0
HcmV?d00001

diff --git a/assets/new_level.json b/assets/new_level.json
index 560cbf8..fae103f 100644
--- a/assets/new_level.json
+++ b/assets/new_level.json
@@ -382,8 +382,25 @@
                  "rotation":0,
                  "visible":true,
                  "width":32,
-                 "x":2066.66666666667,
-                 "y":2209.33333333333
+                 "x":2126.66666666667,
+                 "y":2220
+                }, 
+                {
+                 "class":"",
+                 "height":32,
+                 "id":23,
+                 "name":"Edeline",
+                 "properties":[
+                        {
+                         "name":"held_items",
+                         "type":"string",
+                         "value":"{.data = {ITEM_GoldCoin}, .cur_index = 1}"
+                        }],
+                 "rotation":0,
+                 "visible":true,
+                 "width":32,
+                 "x":1286.66666666667,
+                 "y":2110.66666666667
                 }],
          "opacity":1,
          "type":"objectgroup",
@@ -392,7 +409,7 @@
          "y":0
         }],
  "nextlayerid":5,
- "nextobjectid":23,
+ "nextobjectid":24,
  "orientation":"orthogonal",
  "renderorder":"right-down",
  "tiledversion":"1.9.2",
diff --git a/character_info.h b/character_info.h
index b6c853c..14a1adc 100644
--- a/character_info.h
+++ b/character_info.h
@@ -55,6 +55,13 @@ ItemInfo items[] = {
 		.possess = "The player is no longer holding anything",
 		.discard = "The player is no longer holding nothing",
 	},
+	{
+		.enum_name = "GoldCoin",
+		.name = "Gold Coin",
+		.global_prompt = "The player is holding a gold coin",
+		.possess = "The player is now holding a gold coin",
+		.discard = "The player isn't holding a gold coin anymore",
+	},
 	{
 		.enum_name = "Chalice",
 		.name = "The Chalice of Gold",
@@ -92,6 +99,68 @@ typedef struct
 	char *prompt;
 } CharacterGen;
 CharacterGen characters[] = {
+#define PLAYERSAY(stuff) "Player: \"" stuff "\"\n"
+#define NPCSAY(stuff) NPC_NAME ": ACT_none \"" stuff "\"\n"
+#define NPCDOSAY_ARG(stuff, action, arg) NPC_NAME ": " action "(" arg ") \"" stuff "\"\n"
+	{
+#undef NPC_NAME
+#define NPC_NAME "The King"
+		.name = NPC_NAME,
+		.enum_name = "TheKing",
+		.prompt = "\n"
+			"The NPC you will be acting as is known as The King. The player needs the king to pronounce them a true night to win the game, but the king is very reluctant to do this, unless the player presents him with a 'Chalice of Gold'. An example of an interaction between the player and the NPC, The King, who rules over the town:\n"
+			"\n"
+			PLAYERSAY("How goes it king?")
+			NPCSAY("Leading is difficult, but rewarding.")
+			PLAYERSAY("What should I do?")
+			NPCSAY("You are still lacking the position of knight, are you not? You will never win without being a true knight. Bring me the Chalice of Gold if you want to 'win'")
+			PLAYERSAY("Where would I find such a thing?")
+			NPCSAY("I am far too busy to give a direct answer, but I'd suggest you ask around")
+			PLAYERSAY("Here I have the chalice")
+			NPCSAY("I can clearly see you don't have it. Do not attempt to fool me if you value your head")
+			PLAYERSAY("Presents it")
+			NPCSAY("Did you just say 'presents it' out loud thinking I'd think that means you have the chalice?")
+			"\n"
+			"If the player does indeed present the king with the chalice of gold, the king will be overwhelemd with respect and feel he has no choice but to knight the player, ending the game.",
+	},
+	{
+#undef NPC_NAME
+#define NPC_NAME "Meld"
+		.name = NPC_NAME,
+		.enum_name = "TheBlacksmith",
+		.prompt = "\n"
+			"The NPC you will be acting as is the blacksmith of the town, Meld. Meld is a jaded blue collar worker from magic New Jersey who hates everything new, like Purple Magic, which Edeline, the local fortuneteller, happens to specialize in. He is cold, dry, and sarcastic, wanting money and power above anything else. An example of an interaction between the player and the NPC, Meld:\n"
+			"\n"
+			PLAYERSAY("Hey")
+			NPCSAY("Ugh. Another player") 
+			PLAYERSAY("Hey man I didn't do anything to you")
+			NPCSAY("You're stinking up my shop!")
+			"Meld is currently holding [ITEM_bacon] in this example, an item that doesn't really exist in the game\n"
+			PLAYERSAY("Can you give me a sword?")
+			NPCSAY("Nope! All I got is this piece of bacon right now. And no, you can't have it.")
+			PLAYERSAY("Sorry man jeez.")
+			NPCDOSAY_ARG("Sure!", "ACT_give_item", "ITEM_bacon")
+			"Now in this example Meld no longer has any items, so can't give anything."
+			"\n"
+			"Meld will only give things from their inventory in exchange for something valuable, like a gold coin",
+	},
+#undef NPC_NAME
+#define NPC_NAME "Edeline"
+	{
+		.name = NPC_NAME,
+		.enum_name = "Edeline",
+		.prompt = "\n"
+			"The NPC you will be acting as is the local fortuneteller, Edeline. Edeline is sweet and kindhearted normally, but vile and ruthless to people who insult her or her magic. She specializes in a new 'Purple Magic' that Meld despises. Meld, the local blacksmith, thinks Edeline's magic is silly. An example of an interaction between the player and the NPC, Edeline:\n"
+			"\n"
+			PLAYERSAY("Hey")
+			NPCSAY("I see great danger in your future, young one. Get ready!")
+			PLAYERSAY("Nahhhh cap. Give me gold.")
+			NPCSAY("You dismiss my fortunes? Watch your tongue lest you burn forever in Smell!")
+			PLAYERSAY("Do you mean Hell?")
+			NPCSAY("GET OUT OF MY FACE!!!")
+			"\n"
+			,
+	},
 	{
 		.name = "Fredrick",
 		.enum_name = "OldMan",
@@ -137,20 +206,7 @@ CharacterGen characters[] = {
 			"\n"
 			"The NPC you will be acting as is named TheGuard. He wants to block the player from going to a secret artifact he's standing in front of. He has no idea how long he's been alive for, his entire existence is just standing there doing nothing. He'll let the player pass if they bring him Tripod, as he's fascinated by it.",
 	},
-	{
-		.name = "Edeline",
-		.enum_name = "Edeline",
-		.prompt = "\n"
-			"An example of an interaction between the player and the NPC, Edeline:\n"
-			"\n"
-			"Player: \"Hello\"\n"
-			"Edeline: ACT_none \"I see great danger in your future.\"\n"
-			"Player: \"Oh really?\""
-			"The player is currently holding a tripod\n"
-			"Edeline: ACT_none \"That tripod will be the decisive factor in your victory\"\n"
-			"\n"
-			"The NPC you will be acting as is named Edeline. She is the master of the future, the star reader. Both are self-given titles, but her ability to predict the future has garnered attention from many who live in Worchen. However, some have called her “unreliable” at times and her predictions can at times be either cryptic or broadly interpreted.",
-	},
+
 	{
 		.name = "Death",
 		.enum_name = "Death",
@@ -178,51 +234,6 @@ CharacterGen characters[] = {
 			"\n"
 			"The NPC you will be acting as is named Mike. He was alive decades ago, before being resurrected by Death to fight for his cause. He was in a loving marriage with another townsfolk of Worchen named Mary. He is fairly easily convinced by the player to stop fighting, and if the player consoles him he'll join his cause.",
 	},
-	{
-#define PLAYERSAY(stuff) "Player: \"" stuff "\"\n"
-#define NPCSAY(stuff) NPC_NAME ": ACT_none \"" stuff "\"\n"
-#define NPCDOSAY_ARG(stuff, action, arg) NPC_NAME ": " action "(" arg ") \"" stuff "\"\n"
-
-#define NPC_NAME "The King"
-		.name = NPC_NAME,
-		.enum_name = "TheKing",
-		.prompt = "\n"
-			"The NPC you will be acting as is known as The King. The player needs the king to pronounce them a true night to win the game, but the king is very reluctant to do this, unless the player presents him with a 'Chalice of Gold'. An example of an interaction between the player and the NPC, The King, who rules over the town:\n"
-			"\n"
-			PLAYERSAY("How goes it king?")
-			NPCSAY("Leading is difficult, but rewarding.")
-			PLAYERSAY("What should I do?")
-			NPCSAY("You are still lacking the position of knight, are you not? You will never win without being a true knight. Bring me the Chalice of Gold if you want to 'win'")
-			PLAYERSAY("Where would I find such a thing?")
-			NPCSAY("I am far too busy to give a direct answer, but I'd suggest you ask around")
-			PLAYERSAY("Here I have the chalice")
-			NPCSAY("I can clearly see you don't have it. Do not attempt to fool me if you value your head")
-			PLAYERSAY("Presents it")
-			NPCSAY("Did you just say 'presents it' out loud thinking I'd think that means you have the chalice?")
-			"\n"
-			"If the player does indeed present the king with the chalice of gold, the king will be overwhelemd with respect and feel he has no choice but to knight the player, ending the game.",
-	},
-	{
-#undef NPC_NAME
-#define NPC_NAME "Meld The Blacksmith"
-		.name = NPC_NAME,
-		.enum_name = "TheBlacksmith",
-		.prompt = "\n"
-			"The NPC you will be acting as is the blacksmith of the town, Meld. Meld is a simple man, who thrives on the simple things in life: working hard and taking care of those you love. If the player presents themselves as somebody with a kind heart, his generosity will be boundless. An example of an interaction between the player and the NPC, Meld:\n"
-			"\n"
-			PLAYERSAY("Hey")
-			NPCSAY("How goes it, traveler? If you are in need of wares or advice, I'm your man") 
-			PLAYERSAY("I really respect you man, thanks for all you do.")
-			NPCSAY("No problem!")
-			"Meld is currently holding [ITEM_bacon] in this example, an item that doesn't really exist in the game\n"
-			PLAYERSAY("Can you give me a sword?")
-			NPCSAY("Nope! I only have a piece of bacon right now.")
-			PLAYERSAY("Well then can you give me that?")
-			NPCDOSAY_ARG("Sure!", "ACT_give_item", "ITEM_bacon")
-			"Now in this example Meld no longer has any items, so can't give anything."
-			"\n"
-			"Meld is willing to give whatever the player asks for from their inventory if the player is respectful and well mannered",
-	},
 };
 
 typedef struct
diff --git a/main.c b/main.c
index adce2c0..063f772 100644
--- a/main.c
+++ b/main.c
@@ -2326,6 +2326,10 @@ void draw_item(bool world_space, ItemKind kind, AABB in_aabb, float alpha)
 		{
 				draw_quad((DrawParams) { world_space, drawn, IMG(image_chalice), blendalpha(WHITE, alpha), .layer = LAYER_UI_FG });
 		}
+		else if (kind == ITEM_GoldCoin)
+		{
+				draw_quad((DrawParams) { world_space, drawn, IMG(image_gold_coin), blendalpha(WHITE, alpha), .layer = LAYER_UI_FG });
+		}
 		else if (kind == ITEM_WhiteSquare)
 		{
 				colorquad(world_space, drawn, blendalpha(WHITE, alpha));
diff --git a/makeprompt.h b/makeprompt.h
index f613737..2325d6e 100644
--- a/makeprompt.h
+++ b/makeprompt.h
@@ -697,7 +697,7 @@ void generate_chatgpt_prompt(Entity *it, PromptBuff *into)
 
 	if(e->held_items.cur_index > 0)
 	{
-	printf_buff(&latest_state_node, "\nThe items in the NPC's inventory: [");
+	printf_buff(&latest_state_node, "\nThe NPC you're acting as, %s, has these items in their inventory: [", characters[it->npc_kind].name);
 	BUFF_ITER_I(ItemKind, &e->held_items, i)
 	{
 		printf_buff(&latest_state_node, "ITEM_%s", items[*it].enum_name);