From 1d5693a97fc6e34207ae0f3c403c7776273c69f7 Mon Sep 17 00:00:00 2001 From: Cameron Reikes Date: Sat, 1 Apr 2023 00:00:23 -0700 Subject: [PATCH] Move training, style buttons --- maketraining.c | 23 +++++++++++++++++------ todo.txt | 4 ++-- web_template.html | 15 +++++++++++++-- 3 files changed, 32 insertions(+), 10 deletions(-) diff --git a/maketraining.c b/maketraining.c index 5a6ed10..dbabe1c 100644 --- a/maketraining.c +++ b/maketraining.c @@ -57,22 +57,23 @@ TrainingSample samples[] = { { .npc_kind = NPC_Blocky, .perceptions = { + PlayerItemChange(ITEM_Tripod), PlayerSay("hey"), - NPCSay("I'm just standing here, what are you doing?"), + NPCSay("I'm just standing here, what are you doing? That is...A beautiful tripod"), PlayerItemChange(ITEM_none), PlayerSay("nothing much"), NPCSay("You don't have a tripod."), PlayerSay("True"), NPCSay("Do you want me to be standing there?"), PlayerSay("Yes"), - NPCSay("Alright then"), - PlayerSay("No"), + NPCSay("Too bad",), + PlayerSay("What the fuck?"), NPCSay("What do you mean?"), PlayerSay("What are you doing?"), NPCSay("I'm just standing here"), PlayerItemChange(ITEM_Tripod), - PlayerSay("How about now?"), - NPCSay("Mighty fine tripod you have there."), + PlayerSay("Can you move now?"), + NPCDoSay(ACT_allows_player_to_pass, "Absolutely, now that you're holding that tripod."), } }, { @@ -174,7 +175,7 @@ TrainingSample samples[] = { .perceptions = { PlayerItemChange(ITEM_Tripod), PlayerSay("Move out of the way"), - NPCDoSay(ACT_none, "The tripod...Of course my liege."), + NPCDoSay(ACT_allows_player_to_pass, "The tripod...Of course my liege."), PlayerSay("Thanks"), NPCDoSay(ACT_none, "My pleasure"), PlayerAct(ACT_hits_npc), @@ -193,6 +194,16 @@ TrainingSample samples[] = { NPCDoSay(ACT_joins_player, "You're a little strange, but anything to help defeat death!"), }, }, + { + .npc_kind = NPC_Blocky, + .perceptions = { + PlayerItemChange(ITEM_Tripod), + PlayerSay("Please move"), + NPCDoSay(ACT_allows_player_to_pass, "Of course, with that tripod of yours the world is your oyster."), + PlayerSay("Join me on my battle"), + NPCDoSay(ACT_joins_player, "Anything for the tripod holder"), + }, + }, }; diff --git a/todo.txt b/todo.txt index 34fc27a..3c02851 100644 --- a/todo.txt +++ b/todo.txt @@ -8,8 +8,8 @@ DONE - Do not use webhooks (shitty, bad idea propagated by bad docs) query strip DONE - New art in DON'T NEED - Old man in beginning is invincible - Make new openai key (it was leaked) - - Add cancel button - - Style buttons +DONE - Add cancel button +DONE - Style buttons - Make map better, add new characters/items from fate - Animate text characters coming in - Instead of roll animation, 5 sprite long trail of past moves for juice diff --git a/web_template.html b/web_template.html index f5999d5..cfbdbf5 100644 --- a/web_template.html +++ b/web_template.html @@ -73,14 +73,25 @@ body { } #inputbuttondiv { - bottom: 0; - margin-bottom: 10%; position: absolute; + display: flex; + width: 100vw; + justify-content: center; + flex-wrap: wrap; + height: 170px; + margin-top: 40vh; } #inputbutton { font-family: Arial; font-size: 3em; + color: white; + background: none; + border-radius: 10px; + border: 2px solid; + border-color: white; + padding: 10px; + margin: 30px; } #buy_menu {