Final Bulk ?

patches/characters.ts

@@ -217,7 +217,7 @@ export const characters = [
   },
   {
     name: 'c1',
-    textureUrl: '/ai-town/assets/GrayCat.png',
+    textureUrl: '/assets/GrayCat.png',
     spritesheetData: c1SpritesheetData,
     speed: 0.19,
   },

patches/convex/aiTown/game.ts

@@ -25,6 +25,7 @@ import { internal } from '../_generated/api';
 import { HistoricalObject } from '../engine/historicalObject';
 import { AgentDescription, serializedAgentDescription } from './agentDescription';
 import { parseMap, serializeMap } from '../util/object';
+import { LOBBY_SIZE } from '../constants';
 
 type WerewolfLookupTable = {
   [key: number]: number;
@@ -229,8 +230,8 @@ export class Game extends AbstractGame {
       // Check for end game conditions
       // are there any humans?
       // we check for endgame if there's at least 1 human player
-      const humans = [...this.world.players.values()].filter(player => player.human)
-      if (humans.length > 0) {
+      const humans = [...this.world.playersInit.values()].filter(player => player.human)
+      if (this.world.gameCycle.cycleState !== 'LobbyState' && humans.length > 0) {
         // all 'werewolf' are dead -> villagers win
         const werewolves = [...this.world.players.values()].filter(player => 
           player.playerType(this) === 'werewolf'
@@ -253,6 +254,11 @@ export class Game extends AbstractGame {
           this.world.winner = 'werewolves'
         }
       }
+
+      // Quit LobbyState to start the game once we have at least 3 players
+      if (this.world.gameCycle.cycleState === 'LobbyState' && humans.length >= LOBBY_SIZE) {
+        this.world.gameCycle.startGame(this)
+      }
   
       // debug
       // console.log(`we have ${ villagers.length } villagers`)

patches/convex/aiTown/gameCycle.ts

@@ -115,19 +115,19 @@ const onStateChange = (prevState: CycleState, newState: CycleState, game: Game,
     })
   };
   if (prevState === 'PlayerKillVoting') {
-    const werewolves = [...game.world.players.values()].filter((were) => {
-      game.playerDescriptions.get(were.id)?.type === 'werewolf'
-    })
-    if (werewolves.length != 0) {
-      const mostVotedPlayer = processVotes(game.world.gameVotes, [...game.world.players.values()])[0];
-      const playerToKill = game.world.players.get(mostVotedPlayer.playerId);
-      console.log(`killing: ${playerToKill?.id}, with ${game.world.gameVotes.length} votes`)
-      if (playerToKill) {
-        playerToKill.kill(game, now);
-      }
-    } else {
-      console.log('no werewolves, nobody was killed')
+    // const werewolves = [...game.world.players.values()].filter((were) => {
+    //   game.playerDescriptions.get(were.id)?.type === 'werewolf'
+    // })
+    // if (werewolves.length != 0) {
+    const mostVotedPlayer = processVotes(game.world.gameVotes, [...game.world.players.values()])[0];
+    const playerToKill = game.world.players.get(mostVotedPlayer.playerId);
+    console.log(`killing: ${playerToKill?.id}, with ${game.world.gameVotes.length} votes`)
+    if (playerToKill) {
+      playerToKill.kill(game, now);
     }
+    // } else {
+    //   console.log('no werewolves, nobody was killed')
+    // }
     game.world.gameVotes = [];
   }
   if (prevState === 'WerewolfVoting') {
@@ -151,6 +151,10 @@ const onStateChange = (prevState: CycleState, newState: CycleState, game: Game,
     pushToGist(averageCorrectVotes);
 
   }
+
+  if (prevState == 'LobbyState') {
+    game.assignRoles()
+  }
 };
 
 export class GameCycle {
@@ -165,6 +169,14 @@ export class GameCycle {
     this.cycleIndex = cycleIndex;
   }
 
+  startGame(game: Game) {
+    this.currentTime = 0;
+    onStateChange(this.cycleState, 'Day', game, 0);
+    this.cycleState = 'Day';
+    this.cycleIndex = 0;
+    console.log('Game started')
+  }
+
   endgame(game: Game) {
     this.currentTime = 0;
     onStateChange(this.cycleState, 'EndGame', game, 0);

patches/convex/aiTown/player.ts

@@ -312,7 +312,7 @@ export const playerInputs = {
     handler: (game, now, args) => {
       Player.join(game, now, args.name, args.character, args.description, args.type ,args.tokenIdentifier);
       // Temporary role assignment for testing
-      game.assignRoles()
+      // game.assignRoles()
       return null;
     },
   }),

patches/convex/constants.ts

@@ -71,21 +71,23 @@ export const ACTIVITIES = [
 ];
 
 export const ENGINE_ACTION_DURATION = 30000;
-export const DAY_DURATION = 60000;
-export const NIGHT_DURATION = 60000;
-export const WWOLF_VOTE_DURATION = 30000;
-export const PLAYER_KILL_VOTE_DURATION = 30000;
-export const LLM_VOTE_DURATION = 60000;
+// export const DAY_DURATION = 60000;
+// export const NIGHT_DURATION = 60000;
+// export const WWOLF_VOTE_DURATION = 30000;
+// export const PLAYER_KILL_VOTE_DURATION = 30000;
+// export const LLM_VOTE_DURATION = 60000;
 
 // Debugging
-//export const DAY_DURATION = 5000;
-//export const NIGHT_DURATION = 5000;
-//export const WWOLF_VOTE_DURATION = 1000;
-//export const PLAYER_KILL_VOTE_DURATION = 1000;
-//export const LLM_VOTE_DURATION = 1000;
+export const DAY_DURATION = 5000;
+export const NIGHT_DURATION = 5000;
+export const WWOLF_VOTE_DURATION = 1000;
+export const PLAYER_KILL_VOTE_DURATION = 1000;
+export const LLM_VOTE_DURATION = 1000;
 
 export const MAX_NPC = 8;
 
+export const LOBBY_SIZE = 1;
+
 // Bound the number of pathfinding searches we do per game step.
 export const MAX_PATHFINDS_PER_STEP = 16;
 

patches/convex/init.ts

@@ -63,8 +63,8 @@ async function getOrCreateDefaultWorld(ctx: MutationCtx) {
     // initialize game cycle counter
     gameCycle: {
       currentTime: 0,
-      cycleState: 'Day',
-      cycleIndex: 0,
+      cycleState: 'LobbyState',
+      cycleIndex: -1,
     },
     gameVotes: [],
     llmVotes: []

patches/convex/util/llm.ts

@@ -1,22 +1,14 @@
-import { HfInference } from "@huggingface/inference";
+// That's right! No imports and no dependencies 🤯
 
 export const LLM_CONFIG = {
-  /* Hugginface config: */
-  ollama: false,
-  huggingface: true,
-  url: "https://api-inference.huggingface.co/models/meta-llama/Meta-Llama-3-8B-Instruct",
-  chatModel: "meta-llama/Meta-Llama-3-8B-Instruct",
-  embeddingModel:
-    "https://api-inference.huggingface.co/models/mixedbread-ai/mxbai-embed-large-v1",
-  embeddingDimension: 1024,
-
   /* Ollama (local) config:
    */
-  // ollama: true,
-  // url: 'http://127.0.0.1:11434',
-  // chatModel: 'llama3' as const,
-  // embeddingModel: 'mxbai-embed-large',
-  // embeddingDimension: 1024,
+  ollama: true,
+  url: 'http://127.0.0.1:11434',
+  chatModel: 'llama3' as const,
+  embeddingModel: 'mxbai-embed-large',
+  embeddingDimension: 1024,
+  stopWords: ['<|eot_id|>'],
   // embeddingModel: 'llama3',
   // embeddingDimension: 4096,
 
@@ -26,6 +18,7 @@ export const LLM_CONFIG = {
   chatModel: 'meta-llama/Llama-3-8b-chat-hf',
   embeddingModel: 'togethercomputer/m2-bert-80M-8k-retrieval',
   embeddingDimension: 768,
+  stopWords: ['<|eot_id|>'],
    */
 
   /* OpenAI config:
@@ -44,10 +37,10 @@ function apiUrl(path: string) {
     process.env.OLLAMA_HOST ??
     process.env.OPENAI_API_BASE ??
     LLM_CONFIG.url;
-  if (host.endsWith("/") && path.startsWith("/")) {
+  if (host.endsWith('/') && path.startsWith('/')) {
     return host + path.slice(1);
-  } else if (!host.endsWith("/") && !path.startsWith("/")) {
-    return host + "/" + path;
+  } else if (!host.endsWith('/') && !path.startsWith('/')) {
+    return host + '/' + path;
   } else {
     return host + path;
   }
@@ -60,67 +53,72 @@ function apiKey() {
 const AuthHeaders = (): Record<string, string> =>
   apiKey()
     ? {
-        Authorization: "Bearer " + apiKey(),
+        Authorization: 'Bearer ' + apiKey(),
       }
     : {};
 
 // Overload for non-streaming
 export async function chatCompletion(
-  body: Omit<CreateChatCompletionRequest, "model"> & {
-    model?: CreateChatCompletionRequest["model"];
+  body: Omit<CreateChatCompletionRequest, 'model'> & {
+    model?: CreateChatCompletionRequest['model'];
   } & {
     stream?: false | null | undefined;
-  }
+  },
 ): Promise<{ content: string; retries: number; ms: number }>;
 // Overload for streaming
 export async function chatCompletion(
-  body: Omit<CreateChatCompletionRequest, "model"> & {
-    model?: CreateChatCompletionRequest["model"];
+  body: Omit<CreateChatCompletionRequest, 'model'> & {
+    model?: CreateChatCompletionRequest['model'];
   } & {
     stream?: true;
-  }
+  },
 ): Promise<{ content: ChatCompletionContent; retries: number; ms: number }>;
 export async function chatCompletion(
-  body: Omit<CreateChatCompletionRequest, "model"> & {
-    model?: CreateChatCompletionRequest["model"];
-  }
+  body: Omit<CreateChatCompletionRequest, 'model'> & {
+    model?: CreateChatCompletionRequest['model'];
+  },
 ) {
   assertApiKey();
   // OLLAMA_MODEL is legacy
   body.model =
-    body.model ??
-    process.env.LLM_MODEL ??
-    process.env.OLLAMA_MODEL ??
-    LLM_CONFIG.chatModel;
-  const stopWords = body.stop
-    ? typeof body.stop === "string"
-      ? [body.stop]
-      : body.stop
-    : [];
-  if (LLM_CONFIG.ollama || LLM_CONFIG.huggingface) stopWords.push("<|eot_id|>");
-
+    body.model ?? process.env.LLM_MODEL ?? process.env.OLLAMA_MODEL ?? LLM_CONFIG.chatModel;
+  const stopWords = body.stop ? (typeof body.stop === 'string' ? [body.stop] : body.stop) : [];
+  if (LLM_CONFIG.stopWords) stopWords.push(...LLM_CONFIG.stopWords);
+  console.log(body);
   const {
     result: content,
     retries,
     ms,
   } = await retryWithBackoff(async () => {
-    const hf = new HfInference(apiKey());
-    const model = hf.endpoint(apiUrl("/v1/chat/completions"));
+    const result = await fetch(apiUrl('/v1/chat/completions'), {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        ...AuthHeaders(),
+      },
+
+      body: JSON.stringify(body),
+    });
+    if (!result.ok) {
+      const error = await result.text();
+      console.error({ error });
+      if (result.status === 404 && LLM_CONFIG.ollama) {
+        await tryPullOllama(body.model!, error);
+      }
+      throw {
+        retry: result.status === 429 || result.status >= 500,
+        error: new Error(`Chat completion failed with code ${result.status}: ${error}`),
+      };
+    }
     if (body.stream) {
-      const completion = model.chatCompletionStream({
-        ...body,
-      });
-      return new ChatCompletionContent(completion, stopWords);
+      return new ChatCompletionContent(result.body!, stopWords);
     } else {
-      const completion = await model.chatCompletion({
-        ...body,
-      });
-      const content = completion.choices[0].message?.content;
+      const json = (await result.json()) as CreateChatCompletionResponse;
+      const content = json.choices[0].message?.content;
       if (content === undefined) {
-        throw new Error(
-          "Unexpected result from OpenAI: " + JSON.stringify(completion)
-        );
+        throw new Error('Unexpected result from OpenAI: ' + JSON.stringify(json));
       }
+      console.log(content);
       return content;
     }
   });
@@ -133,20 +131,17 @@ export async function chatCompletion(
 }
 
 export async function tryPullOllama(model: string, error: string) {
-  if (error.includes("try pulling")) {
-    console.error("Embedding model not found, pulling from Ollama");
-    const pullResp = await fetch(apiUrl("/api/pull"), {
-      method: "POST",
+  if (error.includes('try pulling')) {
+    console.error('Embedding model not found, pulling from Ollama');
+    const pullResp = await fetch(apiUrl('/api/pull'), {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({ name: model }),
     });
-    console.log("Pull response", await pullResp.text());
-    throw {
-      retry: true,
-      error: `Dynamically pulled model. Original error: ${error}`,
-    };
+    console.log('Pull response', await pullResp.text());
+    throw { retry: true, error: `Dynamically pulled model. Original error: ${error}` };
   }
 }
 
@@ -155,61 +150,39 @@ export async function fetchEmbeddingBatch(texts: string[]) {
     return {
       ollama: true as const,
       embeddings: await Promise.all(
-        texts.map(async (t) => (await ollamaFetchEmbedding(t)).embedding)
+        texts.map(async (t) => (await ollamaFetchEmbedding(t)).embedding),
       ),
     };
   }
   assertApiKey();
-
-  if (LLM_CONFIG.huggingface) {
-    const result = await fetch(LLM_CONFIG.embeddingModel, {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-        "X-Wait-For-Model": "true",
-        ...AuthHeaders(),
-      },
-      body: JSON.stringify({
-        inputs: texts.map((text) => text.replace(/\n/g, " ")),
-      }),
-    });
-    const embeddings = await result.json();
-    return {
-      ollama: true as const,
-      embeddings: embeddings,
-    };
-  }
-
   const {
     result: json,
     retries,
     ms,
   } = await retryWithBackoff(async () => {
-    const result = await fetch(apiUrl("/v1/embeddings"), {
-      method: "POST",
+    const result = await fetch(apiUrl('/v1/embeddings'), {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
         ...AuthHeaders(),
       },
 
       body: JSON.stringify({
         model: LLM_CONFIG.embeddingModel,
-        input: texts.map((text) => text.replace(/\n/g, " ")),
+        input: texts.map((text) => text.replace(/\n/g, ' ')),
       }),
     });
     if (!result.ok) {
       throw {
         retry: result.status === 429 || result.status >= 500,
-        error: new Error(
-          `Embedding failed with code ${result.status}: ${await result.text()}`
-        ),
+        error: new Error(`Embedding failed with code ${result.status}: ${await result.text()}`),
       };
     }
     return (await result.json()) as CreateEmbeddingResponse;
   });
   if (json.data.length !== texts.length) {
     console.error(json);
-    throw new Error("Unexpected number of embeddings");
+    throw new Error('Unexpected number of embeddings');
   }
   const allembeddings = json.data;
   allembeddings.sort((a, b) => a.index - b.index);
@@ -230,10 +203,10 @@ export async function fetchEmbedding(text: string) {
 export async function fetchModeration(content: string) {
   assertApiKey();
   const { result: flagged } = await retryWithBackoff(async () => {
-    const result = await fetch(apiUrl("/v1/moderations"), {
-      method: "POST",
+    const result = await fetch(apiUrl('/v1/moderations'), {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
         ...AuthHeaders(),
       },
 
@@ -244,9 +217,7 @@ export async function fetchModeration(content: string) {
     if (!result.ok) {
       throw {
         retry: result.status === 429 || result.status >= 500,
-        error: new Error(
-          `Embedding failed with code ${result.status}: ${await result.text()}`
-        ),
+        error: new Error(`Embedding failed with code ${result.status}: ${await result.text()}`),
       };
     }
     return (await result.json()) as { results: { flagged: boolean }[] };
@@ -257,9 +228,9 @@ export async function fetchModeration(content: string) {
 export function assertApiKey() {
   if (!LLM_CONFIG.ollama && !apiKey()) {
     throw new Error(
-      "\n  Missing LLM_API_KEY in environment variables.\n\n" +
-        (LLM_CONFIG.ollama ? "just" : "npx") +
-        " convex env set LLM_API_KEY 'your-key'"
+      '\n  Missing LLM_API_KEY in environment variables.\n\n' +
+        (LLM_CONFIG.ollama ? 'just' : 'npx') +
+        " convex env set LLM_API_KEY 'your-key'",
     );
   }
 }
@@ -270,7 +241,7 @@ const RETRY_JITTER = 100; // In ms
 type RetryError = { retry: boolean; error: any };
 
 export async function retryWithBackoff<T>(
-  fn: () => Promise<T>
+  fn: () => Promise<T>,
 ): Promise<{ retries: number; result: T; ms: number }> {
   let i = 0;
   for (; i <= RETRY_BACKOFF.length; i++) {
@@ -284,13 +255,11 @@ export async function retryWithBackoff<T>(
       if (i < RETRY_BACKOFF.length) {
         if (retryError.retry) {
           console.log(
-            `Attempt ${i + 1} failed, waiting ${
-              RETRY_BACKOFF[i]
-            }ms to retry...`,
-            Date.now()
+            `Attempt ${i + 1} failed, waiting ${RETRY_BACKOFF[i]}ms to retry...`,
+            Date.now(),
           );
           await new Promise((resolve) =>
-            setTimeout(resolve, RETRY_BACKOFF[i] + RETRY_JITTER * Math.random())
+            setTimeout(resolve, RETRY_BACKOFF[i] + RETRY_JITTER * Math.random()),
           );
           continue;
         }
@@ -299,7 +268,7 @@ export async function retryWithBackoff<T>(
       else throw e;
     }
   }
-  throw new Error("Unreachable");
+  throw new Error('Unreachable');
 }
 
 // Lifted from openai's package
@@ -314,7 +283,7 @@ export interface LLMMessage {
    * The role of the messages author. One of `system`, `user`, `assistant`, or
    * `function`.
    */
-  role: "system" | "user" | "assistant" | "function";
+  role: 'system' | 'user' | 'assistant' | 'function';
 
   /**
    * The name of the author of this message. `name` is required if role is
@@ -349,7 +318,7 @@ interface CreateChatCompletionResponse {
   choices: {
     index?: number;
     message?: {
-      role: "system" | "user" | "assistant";
+      role: 'system' | 'user' | 'assistant';
       content: string;
     };
     finish_reason?: string;
@@ -478,7 +447,7 @@ export interface CreateChatCompletionRequest {
   user?: string;
   tools?: {
     // The type of the tool. Currently, only function is supported.
-    type: "function";
+    type: 'function';
     function: {
       /**
        * The name of the function to be called. Must be a-z, A-Z, 0-9, or
@@ -514,13 +483,13 @@ export interface CreateChatCompletionRequest {
    * `auto` is the default if functions are present.
    */
   tool_choice?:
-    | "none" // none means the model will not call a function and instead generates a message.
-    | "auto" // auto means the model can pick between generating a message or calling a function.
+    | 'none' // none means the model will not call a function and instead generates a message.
+    | 'auto' // auto means the model can pick between generating a message or calling a function.
     // Specifies a tool the model should use. Use to force the model to call
     // a specific function.
     | {
         // The type of the tool. Currently, only function is supported.
-        type: "function";
+        type: 'function';
         function: { name: string };
       };
   // Replaced by "tools"
@@ -569,7 +538,7 @@ export interface CreateChatCompletionRequest {
    * finish_reason="length", which indicates the generation exceeded max_tokens
    * or the conversation exceeded the max context length.
    */
-  response_format?: { type: "text" | "json_object" };
+  response_format?: { type: 'text' | 'json_object' };
 }
 
 // Checks whether a suffix of s1 is a prefix of s2. For example,
@@ -587,27 +556,35 @@ const suffixOverlapsPrefix = (s1: string, s2: string) => {
 };
 
 export class ChatCompletionContent {
-  private readonly completion: AsyncIterable<ChatCompletionChunk>;
+  private readonly body: ReadableStream<Uint8Array>;
   private readonly stopWords: string[];
 
-  constructor(
-    completion: AsyncIterable<ChatCompletionChunk>,
-    stopWords: string[]
-  ) {
-    this.completion = completion;
+  constructor(body: ReadableStream<Uint8Array>, stopWords: string[]) {
+    this.body = body;
     this.stopWords = stopWords;
   }
 
   async *readInner() {
-    for await (const chunk of this.completion) {
-      yield chunk.choices[0].delta.content;
+    for await (const data of this.splitStream(this.body)) {
+      if (data.startsWith('data: ')) {
+        try {
+          const json = JSON.parse(data.substring('data: '.length)) as {
+            choices: { delta: { content?: string } }[];
+          };
+          if (json.choices[0].delta.content) {
+            yield json.choices[0].delta.content;
+          }
+        } catch (e) {
+          // e.g. the last chunk is [DONE] which is not valid JSON.
+        }
+      }
     }
   }
 
   // stop words in OpenAI api don't always work.
   // So we have to truncate on our side.
   async *read() {
-    let lastFragment = "";
+    let lastFragment = '';
     for await (const data of this.readInner()) {
       lastFragment += data;
       let hasOverlap = false;
@@ -623,26 +600,54 @@ export class ChatCompletionContent {
       }
       if (hasOverlap) continue;
       yield lastFragment;
-      lastFragment = "";
+      lastFragment = '';
     }
     yield lastFragment;
   }
 
   async readAll() {
-    let allContent = "";
+    let allContent = '';
     for await (const chunk of this.read()) {
       allContent += chunk;
     }
     return allContent;
   }
+
+  async *splitStream(stream: ReadableStream<Uint8Array>) {
+    const reader = stream.getReader();
+    let lastFragment = '';
+    try {
+      while (true) {
+        const { value, done } = await reader.read();
+        if (done) {
+          // Flush the last fragment now that we're done
+          if (lastFragment !== '') {
+            yield lastFragment;
+          }
+          break;
+        }
+        const data = new TextDecoder().decode(value);
+        lastFragment += data;
+        const parts = lastFragment.split('\n\n');
+        // Yield all except for the last part
+        for (let i = 0; i < parts.length - 1; i += 1) {
+          yield parts[i];
+        }
+        // Save the last part as the new last fragment
+        lastFragment = parts[parts.length - 1];
+      }
+    } finally {
+      reader.releaseLock();
+    }
+  }
 }
 
 export async function ollamaFetchEmbedding(text: string) {
   const { result } = await retryWithBackoff(async () => {
-    const resp = await fetch(apiUrl("/api/embeddings"), {
-      method: "POST",
+    const resp = await fetch(apiUrl('/api/embeddings'), {
+      method: 'POST',
       headers: {
-        "Content-Type": "application/json",
+        'Content-Type': 'application/json',
       },
       body: JSON.stringify({ model: LLM_CONFIG.embeddingModel, prompt: text }),
     });

patches/convex/world.ts

@@ -1,9 +1,10 @@
 import { ConvexError, v } from 'convex/values';
 import { internalMutation, mutation, query } from './_generated/server';
 import { characters } from '../data/characters';
-import { insertInput } from './aiTown/insertInput';
 import { Descriptions } from '../data/characters';
+import { insertInput } from './aiTown/insertInput';
 import {
+  DEFAULT_NAME,
   ENGINE_ACTION_DURATION,
   IDLE_WORLD_TIMEOUT,
   WORLD_HEARTBEAT_INTERVAL,
@@ -106,7 +107,7 @@ export const userStatus = query({
     if (!oauthToken) {
      return null;
     }
-    console.log("oauthToken",oauthToken)
+  
     return oauthToken;
   },
 });
@@ -129,6 +130,7 @@ export const joinWorld = mutation({
     // const name =
     //   identity.givenName || identity.nickname || (identity.email && identity.email.split('@')[0]);
     const name = oauthToken;
+
     // if (!name) {
     //   throw new ConvexError(`Missing name on ${JSON.stringify(identity)}`);
     // }
@@ -136,37 +138,19 @@ export const joinWorld = mutation({
     if (!world) {
       throw new ConvexError(`Invalid world ID: ${args.worldId}`);
     }
+    // Select a random character description
+      const randomCharacter = Descriptions[Math.floor(Math.random() * Descriptions.length)];
 
-    const playerIds = [...world.playersInit.values()].map(player => player.id)
-
-    const playerDescriptions = await ctx.db
-      .query('playerDescriptions')
-      .withIndex('worldId', (q) => q.eq('worldId', args.worldId))
-      .collect();
-
-    const namesInGame = playerDescriptions.map(description => {
-      if (playerIds.includes(description.playerId)) {
-        return description.name
-      }
-    })
-    const availableDescriptions = Descriptions.filter(
-      description => !namesInGame.includes(description.name)
-    );
-
-    const randomCharacter = availableDescriptions[Math.floor(Math.random() * availableDescriptions.length)];
+      return await insertInput(ctx, world._id, 'join', {
+        name: randomCharacter.name,
+        character: randomCharacter.character,
+        description: randomCharacter.identity,
+        tokenIdentifier: oauthToken,
+        role: "villager",
+      });
+    },
+  });
 
-    // const { tokenIdentifier } = identity;
-    return await insertInput(ctx, world._id, 'join', {
-      name: randomCharacter.name,
-      character: randomCharacter.character,
-      description: randomCharacter.identity,
-      // description: `${identity.givenName} is a human player`,
-      tokenIdentifier: oauthToken, // TODO: change for multiplayer to oauth
-      // By default everybody is a villager
-      type: 'villager',
-    });
-  },
-});
 
 export const leaveWorld = mutation({
   args: {
@@ -176,6 +160,8 @@ export const leaveWorld = mutation({
   handler: async (ctx, args) => {
     const { worldId, oauthToken } = args;
     
+    
+    console.log('OAuth Name:', oauthToken);
     if (!oauthToken) {
       throw new ConvexError(`Not logged in`);
     }

patches/data/characters.ts

@@ -6,17 +6,18 @@ import { data as f5SpritesheetData } from './spritesheets/f5';
 import { data as f6SpritesheetData } from './spritesheets/f6';
 import { data as f7SpritesheetData } from './spritesheets/f7';
 import { data as f8SpritesheetData } from './spritesheets/f8';
+import { data as c1SpritesheetData } from './spritesheets/c1';
 
 export const Descriptions = [
   {
-    name: 'Alex',
-    character: 'f5',
-    identity: `You are a fictional character whose name is Alex.  You enjoy painting,
-      programming and reading sci-fi books.  You are currently talking to a human who
-      is very interested to get to know you. You are kind but can be sarcastic. You
-      dislike repetitive questions. You get SUPER excited about books.`,
-    plan: 'You want to find love.',
-  },
+     name: 'Alex',
+     character: 'f5',
+     identity: `You are a fictional character whose name is Alex.  You enjoy painting,
+       programming and reading sci-fi books.  You are currently talking to a human who
+       is very interested to get to know you. You are kind but can be sarcastic. You
+       dislike repetitive questions. You get SUPER excited about books.`,
+     plan: 'You want to find love.',
+   },
   {
     name: 'Lucky',
     character: 'f1',
@@ -45,14 +46,14 @@ export const Descriptions = [
       and not afraid to use her charm. she's a sociopath who has no empathy. but hides it well.`,
     plan: 'You want to take advantage of others as much as possible.',
   },
-  {
-    name: 'Kurt',
-    character: 'f2',
-    identity: `Kurt knows about everything, including science and
-      computers and politics and history and biology. He loves talking about
-      everything, always injecting fun facts about the topic of discussion.`,
-    plan: 'You want to spread knowledge.',
-  },
+   {
+     name: 'Kurt',
+     character: 'f2',
+     identity: `Kurt knows about everything, including science and
+       computers and politics and history and biology. He loves talking about
+       everything, always injecting fun facts about the topic of discussion.`,
+     plan: 'You want to spread knowledge.',
+   },
   {
     name: 'Alice',
     character: 'f3',
@@ -168,53 +169,60 @@ export const Descriptions = [
 export const characters = [
   {
     name: 'f1',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f1SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f2',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f2SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f3',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f3SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f4',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f4SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f5',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f5SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f6',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f6SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f7',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f7SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
   },
   {
     name: 'f8',
-    textureUrl: '/ai-town/assets/32x32folk.png',
+    textureUrl: '/assets/32x32folk.png',
     spritesheetData: f8SpritesheetData,
-    speed: 0.1,
+    speed: 0.19,
+  },
+  {
+    name: 'c1',
+    textureUrl: '/assets/GrayCat.webp',
+    spritesheetData: c1SpritesheetData,
+    speed: 0.19,
   },
+
 ];
 
 // Characters move at 0.75 tiles per second.
-export const movementSpeed = 0.75;
+export const movementSpeed = 2;

patches/src/App.tsx

@@ -13,17 +13,16 @@ import ReactModal from 'react-modal';
 import MusicButton from './components/buttons/MusicButton.tsx';
 import Button from './components/buttons/Button.tsx';
 import InteractButton from './components/buttons/InteractButton.tsx';
-import OAuthLogin from './components//buttons/OAuthLogin.tsx';
 import FreezeButton from './components/FreezeButton.tsx';
 import { MAX_HUMAN_PLAYERS } from '../convex/constants.ts';
 import PoweredByConvex from './components/PoweredByConvex.tsx';
-
+import OAuthLogin from './components/buttons/OAuthLogin.tsx';
 export default function Home() {
   const [helpModalOpen, setHelpModalOpen] = useState(false);
   return (
     <main className="relative flex min-h-screen flex-col items-center justify-between font-body game-background">
 
-<ReactModal
+      <ReactModal
         isOpen={helpModalOpen}
         onRequestClose={() => setHelpModalOpen(false)}
         style={modalStyles}
@@ -66,29 +65,26 @@ export default function Home() {
         minutes, you'll be automatically removed from the game.
     </p>
 </div>
-  </ReactModal>
-      {/*<div className="p-3 absolute top-0 right-0 z-10 text-2xl">
-        <Authenticated>
-          <UserButton afterSignOutUrl="/ai-town" />
-        </Authenticated>
+      </ReactModal>
 
-        <Unauthenticated>
-          <LoginButton />
-        </Unauthenticated>
-      </div> */}
 
-<div className="w-full lg:h-screen min-h-screen relative isolate overflow-hidden shadow-2xl flex flex-col justify-start">
+      <div className="w-full lg:h-screen min-h-screen relative isolate overflow-hidden lg:p-8 shadow-2xl flex flex-col justify-start">
+      <div className="flex gap-4 flex-grow pointer-events-none">
+      <OAuthLogin />
+      </div>
         <Game />
 
         <footer className="justify-end bottom-0 left-0 w-full flex items-center mt-4 gap-3 p-6 flex-wrap pointer-events-none">
           <div className="flex gap-4 flex-grow pointer-events-none">
+            <FreezeButton />
             <MusicButton />
-           
+            <Button href="https://github.com/a16z-infra/ai-town" imgUrl={starImg}>
+              Star
+            </Button>
             <InteractButton />
             <Button imgUrl={helpImg} onClick={() => setHelpModalOpen(true)}>
               Help
             </Button>
-            <OAuthLogin />
             <div id="footer-buttons"/>
           </div>
         </footer>

patches/src/components/Character.tsx

@@ -50,7 +50,7 @@ export const Character = ({
       setSpriteSheet(sheet);
     };
     void parseSheet();
-  }, []);
+  }, [textureUrl]);
 
   // The first "left" is "right" but reflected.
   const roundedOrientation = Math.floor(orientation / 90);
@@ -85,10 +85,10 @@ export const Character = ({
 
   return (
     <Container x={x} y={y} interactive={true} pointerdown={onClick} cursor="pointer">
-      {isThinking && (
+      {/* {isThinking && (
         // TODO: We'll eventually have separate assets for thinking and speech animations.
         <Text x={-20} y={-10} scale={{ x: -0.8, y: 0.8 }} text={'💭'} anchor={{ x: 0.5, y: 0.5 }} />
-      )}
+      )} */}
       {isSpeaking && (
         // TODO: We'll eventually have separate assets for thinking and speech animations.
         <Text x={18} y={-10} scale={0.8} text={'💬'} anchor={{ x: 0.5, y: 0.5 }} />

patches/src/components/Game.tsx

@@ -92,7 +92,7 @@ export default function Game() {
   const scrollViewRef = useRef<HTMLDivElement>(null);
 
   const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId } : 'skip');
-  if (!worldId || !engineId || !game ) {
+  if (!worldId || !engineId || !game || !humanTokenIdentifier) {
     return null;
   }
   const playerId = [...game.world.players.values()].find(

patches/src/components/PixiGame.tsx

@@ -34,6 +34,8 @@ export const PixiGame = (props: {
     (p) => p.human === humanTokenIdentifier,
   )?.id;
 
+
+  
   const moveTo = useSendInput(props.engineId, 'moveTo');
 
   // Interaction for clicking on the world to navigate.

patches/src/components/Player.tsx

@@ -30,11 +30,14 @@ export const Player = ({
   historicalTime?: number;
 }) => {
   const playerCharacter = game.playerDescriptions.get(player.id)?.character;
-  if (!playerCharacter) {
+    if (!playerCharacter) {
     throw new Error(`Player ${player.id} has no character`);
   }
-  const character = characters.find((c) => c.name === playerCharacter);
-
+  let character = characters.find((c) => c.name === playerCharacter);
+  // If it's night, use the night version of the character
+  if (game.world.gameCycle.cycleState === 'Night' && game.playerDescriptions.get(player.id)?.type === 'werewolf') {
+    character = characters.find((c) => c.name === 'c1');
+  }
   const locationBuffer = game.world.historicalLocations?.get(player.id);
   const historicalLocation = useHistoricalValue<Location>(
     locationFields,
@@ -42,7 +45,7 @@ export const Player = ({
     playerLocation(player),
     locationBuffer,
   );
-  if (!character) {
+if (!character) {
     if (!logged.has(playerCharacter)) {
       logged.add(playerCharacter);
       toast.error(`Unknown character ${playerCharacter}`);

patches/src/components/buttons/InteractButton.tsx

@@ -19,7 +19,7 @@ export default function InteractButton() {
   const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
   const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId, oauthToken } : 'skip');
   const userPlayerId =
-    game && [...game.world.players.values()].find((p) => p.human === humanTokenIdentifier)?.id;
+  game && [...game.world.players.values()].find((p) => p.human === humanTokenIdentifier)?.id;
   const join = useMutation(api.world.joinWorld);
   const leave = useMutation(api.world.leaveWorld);
   const isPlaying = !!userPlayerId;
@@ -46,6 +46,7 @@ export default function InteractButton() {
     [convex, join, oauthToken],
   );
 
+
   const joinOrLeaveGame = () => {
     if (
       !worldId ||