From 95b82ccf05a2e093f146746b00b1611ab81860c6 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sun, 18 Jun 2023 22:46:01 -0700 Subject: [PATCH] Use name not enum_name for items, scroll name --- character_info.h | 17 +++++++++++++++++ makeprompt.h | 2 +- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/character_info.h b/character_info.h index 000ffcd..aa827a3 100644 --- a/character_info.h +++ b/character_info.h @@ -101,16 +101,20 @@ ItemInfo items[] = { .description = "A powerful sword with heft, it inspires a fundamental glory", }, #define SCROLL_DESCRIPTION "An ancient, valuable scroll that says to 'use it' on the outside, but I'm not sure what that means. Who knows what secrets it contains?" +#define SCROLL_NAME "Ancient Scroll" { .enum_name = "Scroll1", + .name = SCROLL_NAME, .description = SCROLL_DESCRIPTION, }, { .enum_name = "Scroll2", + .name = SCROLL_NAME, .description = SCROLL_DESCRIPTION, }, { .enum_name = "Scroll3", + .name = SCROLL_NAME, .description = SCROLL_DESCRIPTION, }, }; @@ -228,6 +232,19 @@ CharacterGen characters[] = { #define NPC_NAME "The King" .name = NPC_NAME, .enum_name = "TheKing", + .prompt = "He is a calm, honorable, eccentric ruler, who does the best he can to do good by his people, even if they can be a little crazy at times. Behind him stands an ancient door he has no idea how to open.", + .writing_style = { + "Here ye, here ye! I am the king of all that is naughty AND nice.", + "Hm? That door? Not sure what it is, but it is creepy!", + "I'll do what I can.", + "There's not much to do around here.", + }, + }, + { +#undef NPC_NAME +#define NPC_NAME "Arrow" + .name = NPC_NAME, + .enum_name = "Arrow", .prompt = "He is a calm, honorable ruler, who does the best he can to do good by his people, even if they can be a little crazy at times.", }, { diff --git a/makeprompt.h b/makeprompt.h index 66d668c..ced6d2f 100644 --- a/makeprompt.h +++ b/makeprompt.h @@ -606,7 +606,7 @@ MD_String8 generate_chatgpt_prompt(MD_Arena *arena, Entity *e, CanTalkTo can_tal PushWithLint(scratch.arena, &latest_state, "You have these items in their inventory: [\n"); BUFF_ITER(ItemKind, &e->held_items) { - PushWithLint(scratch.arena, &latest_state, "%s - %s,\n", items[*it].enum_name, items[*it].description); + PushWithLint(scratch.arena, &latest_state, "'%s' - %s,\n", items[*it].name, items[*it].description); } PushWithLint(scratch.arena, &latest_state, "]\n"); }