improvement

src/app/engines.ts

@@ -28,8 +28,8 @@ export const engines: Record<string, Engine> = {
   cartesian_video: {
     type: "cartesian_video",
     label: "Cartesian video",
-    visible: false,
-    enabled: false,
+    visible: true,
+    enabled: true,
     modelName: "Zeroscope",
     modelUrl: "https://huggingface.co/cerspense/zeroscope_v2_576w",
   },

src/app/games/city.ts

@@ -38,7 +38,9 @@ const initialActionnables = [
   "tree",
   "river",
   "sea",
-  "house"
+  "house",
+  "window",
+  "roof"
 ]
 
 export const game: Game = {

src/app/games/doom.ts

@@ -6,12 +6,16 @@ const initialSituation = [
 ].join(", ")
 
 const initialActionnables = [
+  "moon",
+  "dunes",
+  "building",
   "gun",
   "person",
   "door",
   "laser",
   "window",
-  "box"
+  "box",
+  "rocks"
 ]
 
 export const game: Game = {

src/app/games/dungeon.ts

@@ -34,15 +34,16 @@ const initialSituation = [
 ].join(", ")
 
 const initialActionnables = [
- //  "floor",
-  // "fireplace",
   "door",
- // "window",
-  "chair",
+  "box",
+  "stone wall",
+  "torch",
+  "window",
   "chest",
   "key",
+  "machine",
   "table",
-  // torch"
+  "fireplace"
 ]
 
 export const game: Game = {

src/app/games/enchanters.ts

@@ -10,9 +10,10 @@ const initialActionnables = [
   "dragon",
   "castle",
   "gate",
-  "stone wall",
+  "rocks",
   "lake",
-  "roof"
+  "roof",
+  "boat",
 ]
 
 export const game: Game = {

src/app/games/pirates.ts

@@ -26,8 +26,17 @@ const lights = [
 ]
 
 const initialActionnables = [
-  "chest",
+  "door",
   "box",
+  "sea",
+  "chest",
+  "key",
+  "parrot",
+  "lock",
+  "barrel",
+  "tree",
+  "rope"
+  // skull
   // "door",
   // "window",
   // "sail",
@@ -39,8 +48,6 @@ const initialActionnables = [
   // "rope",
   // "bucket",
  // "skull",
-  "parrot",
-  "lock",
   // "ship",
   // "wooden leg"
 ]

src/app/games/vernian.ts

@@ -11,9 +11,12 @@ const initialActionnables = [
   "box",
   "door",
   "table",
-  "blueprint",
+  "chair",
+  "paper",
   "gear",
-  "machine"
+  "machine",
+  "window",
+  "ground"
 ]
 
 export const game: Game = {

src/app/main.tsx

@@ -54,8 +54,12 @@ export default function Main() {
   const [dialogue, setDialogue] = useState("")
   const [hoveredActionnable, setHoveredActionnable] = useState("")
 
+  const [isBusy, setBusy] = useState<boolean>(true)
+  const busyRef = useRef(true)
+
   const loopRef = useRef<any>(null)
 
+
   const loadNextScene = async (nextSituation?: string, nextActionnables?: string[]) => {
     
     await startTransition(async () => {
@@ -72,7 +76,7 @@ export default function Main() {
         actionnables: (Array.isArray(nextActionnables) && nextActionnables.length
           ? nextActionnables
           : game.initialActionnables
-        ).slice(0, 6) // too many can slow us down it seems
+        ).slice(0, 10) // too many can slow us down it seems
       })
 
       console.log("got the first version of our scene!", renderedRef.current)
@@ -125,6 +129,10 @@ export default function Main() {
           console.log("updating scene..")
           renderedRef.current = newRendered
           setRendered(renderedRef.current)
+
+          if (newRendered.status === "completed") {
+            setBusy(busyRef.current = false)
+          }
         }
       } catch (err) {
         console.error(err)
@@ -141,8 +149,8 @@ export default function Main() {
   }, [])
 
   const handleUserAction = async (actionnable: string) => {
-    console.log("user actionnable:", actionnable)
-  
+    console.log("user clicked on:", actionnable)
+    setBusy(busyRef.current = true)
 
     // TODO: ask Llama2 what to do about it
     // we need a frame and some actionnables,
@@ -232,6 +240,9 @@ export default function Main() {
     window.location = `${window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + search.toString()}` as any
   }
 
+  // determine when to show the spinner
+  const isLoading = isBusy || rendered.status === "pending"
+
   return (
     <div
       className="flex flex-col w-full max-w-5xl"
@@ -295,7 +306,7 @@ export default function Main() {
           rendered={rendered}
           onUserAction={handleUserAction}
           onUserHover={setHoveredActionnable}
-          isLoading={rendered.status === "pending"}
+          isLoading={isLoading}
           game={game}
           engine={engine}
           debug={debug}

src/app/queries/getActionnables.ts

@@ -31,8 +31,8 @@ export const getActionnables = async ({
       content: [
         `You are an API endpoint that can return a list of objects visible in the background image of a role playing game.`,
         basePrompt,
-        `You must list basic name of characters or visible objects (eg. "parrot", "chest", "spaceship", "glass", "door", "person", "window", "light", "knob", "button" etc) but don't list any word from abstract concepts (ig. don't say things like "secret", "danger", "next move" etc)`,
-        `The answer must be a JSON array, ie. a list of quoted strings.`
+        `You must list ten (10) basic names of visible objects (eg. "door", "person", "window", "light", "knob", "button", "rock", "tree", "parrot", "chest", "glass".. etc) but don't list any word from abstract or immaterial concepts (ig. don't list words like "secret", "danger", "next move", "game" etc)`,
+        `The answer must be a JSON array, ie. a list of 10 quoted strings.`
       ].filter(item => item).join("\n")
     },
     {