From 2fcc36be51e767f4d81171546065c7795eda1809 Mon Sep 17 00:00:00 2001 From: Grail Finder Date: Mon, 23 Jun 2025 10:22:07 +0300 Subject: [PATCH] Enha: style update --- components/cardword.html | 26 +++++--------------------- handlers/actions.go | 2 -- llmapi/main.go | 5 ++++- models/main.go | 6 +++--- 4 files changed, 12 insertions(+), 27 deletions(-) diff --git a/components/cardword.html b/components/cardword.html index cd58b72..2c497d5 100644 --- a/components/cardword.html +++ b/components/cardword.html @@ -1,28 +1,12 @@ {{define "cardword"}} {{if .Revealed}} -
{{.Word}} +
{{.Word}}
{{else}} -
+
{{.Word}}
{{end}} diff --git a/handlers/actions.go b/handlers/actions.go index 5d91684..755fa10 100644 --- a/handlers/actions.go +++ b/handlers/actions.go @@ -356,8 +356,6 @@ func recoverPlayer(pm map[string]string) error { if !ok { return fmt.Errorf("failed to find player %s in the room %v", pm["Username"], room) } - // pm["Role"] = string(role) - // pm["Team"] = string(team) us := &models.UserState{ Username: pm["Username"], RoomID: pm["RoomID"], diff --git a/llmapi/main.go b/llmapi/main.go index 941dc9d..210d2ab 100644 --- a/llmapi/main.go +++ b/llmapi/main.go @@ -24,7 +24,7 @@ var ( MimePrompt = `we are playing alias;\nyou are a mime (player who gives a clue of one noun word and number of cards you expect them to open) of the %s team (people who would guess by your clue want open the %s cards);\nplease return your clue, number of cards to open and what words you mean them to find using that clue in json like:\n{\n\"clue\": \"one-word-noun\",\n\"number\": \"number-from-0-to-9\",\n\"words_I_mean_my_team_to_open\": [\"this\", \"that\", ...]\n}\nthe team who openes all their cards first wins.\nplease return json only.\nunopen Blue cards left: %d;\nunopen Red cards left: %d;\nhere is the game info in json:\n%s` // TODO: simplify; bot gets confused; so show it only unrevealed cards and last clue (maybe older clues as well); GuesserPrompt = `we are playing alias;\nyou are to guess words of the %s team (you want open %s cards) by given clue and a number of meant guesses;\nplease return your guesses and words that could be meant by the clue, but you do not wish to open yet, in json like:\n{\n\"guesses\": [\"word1\", \"word2\", ...],\n\"could_be\": [\"this\", \"that\", ...]\n}\nthe team who openes all their cards first wins.\nplease return json only.\nunopen Blue cards left: %d;\nunopen Red cards left: %d;\nhere is the cards (and other info), you need to choose revealed==false words:\n%s` - GuesserSimplePrompt = `we are playing game of alias;\n you were given a clue: \"%s\";\nplease return your guess and words that could be meant by the clue, but you do not wish to open yet, in json like:\n{\n\"guess\": "most_relevant_word_to_the_clue",\n\"could_be\": [\"this\", \"that\", ...]\n}\nhere is the words that left:\n%s` + GuesserSimplePrompt = `we are playing game of alias;\n you were given a clue: \"%s\";\nplease return your guess and words that could be meant by the clue, but you do not wish to open yet, in json like:\n{\n\"guess\": \"most_relevant_word_to_the_clue\",\n\"could_be\": [\"this\", \"that\", ...]\n}\nhere is the words that left:\n%s` ) type DSResp struct { @@ -254,6 +254,8 @@ func (b *Bot) StartBot() { room.LogJournal = append(room.LogJournal, fmt.Sprintf("%s also considered this: %v", b.BotName, couldBe)) eventName = models.NotifyRoomUpdatePrefix + room.ID eventPayload = "" + // TODO: needs to decide if it wants to open the next cardword or end turn + // or end turn on limit default: b.log.Error("unexpected role", "role", b.Role, "resp-map", tempMap) continue @@ -263,6 +265,7 @@ func (b *Bot) StartBot() { b.log.Error("failed to save room", "error", err) continue } + // will it notify itself? if botName := room.WhichBotToMove(); botName != "" { SignalChanMap[botName] <- true } diff --git a/models/main.go b/models/main.go index a8bf061..1357906 100644 --- a/models/main.go +++ b/models/main.go @@ -12,16 +12,16 @@ import ( type WordColor string const ( - WordColorWhite = "white" + WordColorWhite = "amber" WordColorBlue = "blue" WordColorRed = "red" WordColorBlack = "black" - WordColorUknown = "beige" + WordColorUknown = "stone" // beige ) func StrToWordColor(s string) WordColor { switch s { - case "white": + case "amber", "white": return WordColorWhite case "blue": return WordColorBlue