revert to main in github

patches/convex/aiTown/agentOperations.ts

@@ -128,21 +128,21 @@ export const agentDoSomething = internalAction({
         return;
       } else {
         // TODO: have LLM choose the activity & emoji
-        const activity = ACTIVITIES[Math.floor(Math.random() * ACTIVITIES.length)];
-        await sleep(Math.random() * 1000);
-        await ctx.runMutation(api.aiTown.main.sendInput, {
-          worldId: args.worldId,
-          name: 'finishDoSomething',
-          args: {
-            operationId: args.operationId,
-            agentId: agent.id,
-            activity: {
-              description: activity.description,
-              emoji: activity.emoji,
-              until: Date.now() + activity.duration,
-            },
-          },
-        });
+        // const activity = ACTIVITIES[Math.floor(Math.random() * ACTIVITIES.length)];
+        // await sleep(Math.random() * 1000);
+        // await ctx.runMutation(api.aiTown.main.sendInput, {
+        //   worldId: args.worldId,
+        //   name: 'finishDoSomething',
+        //   args: {
+        //     operationId: args.operationId,
+        //     agentId: agent.id,
+        //     activity: {
+        //       description: activity.description,
+        //       emoji: activity.emoji,
+        //       until: Date.now() + activity.duration,
+        //     },
+        //   },
+        // });
         return;
       }
     }

patches/convex/aiTown/gameCycle.ts

@@ -115,11 +115,18 @@ const onStateChange = (prevState: CycleState, newState: CycleState, game: Game,
     })
   };
   if (prevState === 'PlayerKillVoting') {
-    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);
+    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 = [];
   }

patches/convex/util/llm.ts

@@ -1,14 +1,22 @@
-// That's right! No imports and no dependencies 🤯
+import { HfInference } from "@huggingface/inference";
 
 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,
-  stopWords: ['<|eot_id|>'],
+  // ollama: true,
+  // url: 'http://127.0.0.1:11434',
+  // chatModel: 'llama3' as const,
+  // embeddingModel: 'mxbai-embed-large',
+  // embeddingDimension: 1024,
   // embeddingModel: 'llama3',
   // embeddingDimension: 4096,
 
@@ -18,7 +26,6 @@ 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:
@@ -37,10 +44,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;
   }
@@ -53,72 +60,67 @@ 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.stopWords) stopWords.push(...LLM_CONFIG.stopWords);
-  console.log(body);
+    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|>");
+
   const {
     result: content,
     retries,
     ms,
   } = await retryWithBackoff(async () => {
-    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}`),
-      };
-    }
+    const hf = new HfInference(apiKey());
+    const model = hf.endpoint(apiUrl("/v1/chat/completions"));
     if (body.stream) {
-      return new ChatCompletionContent(result.body!, stopWords);
+      const completion = model.chatCompletionStream({
+        ...body,
+      });
+      return new ChatCompletionContent(completion, stopWords);
     } else {
-      const json = (await result.json()) as CreateChatCompletionResponse;
-      const content = json.choices[0].message?.content;
+      const completion = await model.chatCompletion({
+        ...body,
+      });
+      const content = completion.choices[0].message?.content;
       if (content === undefined) {
-        throw new Error('Unexpected result from OpenAI: ' + JSON.stringify(json));
+        throw new Error(
+          "Unexpected result from OpenAI: " + JSON.stringify(completion)
+        );
       }
-      console.log(content);
       return content;
     }
   });
@@ -131,17 +133,20 @@ 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}`,
+    };
   }
 }
 
@@ -150,39 +155,61 @@ 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);
@@ -203,10 +230,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(),
       },
 
@@ -217,7 +244,9 @@ 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 }[] };
@@ -228,9 +257,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'"
     );
   }
 }
@@ -241,7 +270,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++) {
@@ -255,11 +284,13 @@ 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;
         }
@@ -268,7 +299,7 @@ export async function retryWithBackoff<T>(
       else throw e;
     }
   }
-  throw new Error('Unreachable');
+  throw new Error("Unreachable");
 }
 
 // Lifted from openai's package
@@ -283,7 +314,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
@@ -318,7 +349,7 @@ interface CreateChatCompletionResponse {
   choices: {
     index?: number;
     message?: {
-      role: 'system' | 'user' | 'assistant';
+      role: "system" | "user" | "assistant";
       content: string;
     };
     finish_reason?: string;
@@ -447,7 +478,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
@@ -483,13 +514,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"
@@ -538,7 +569,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,
@@ -556,35 +587,27 @@ const suffixOverlapsPrefix = (s1: string, s2: string) => {
 };
 
 export class ChatCompletionContent {
-  private readonly body: ReadableStream<Uint8Array>;
+  private readonly completion: AsyncIterable<ChatCompletionChunk>;
   private readonly stopWords: string[];
 
-  constructor(body: ReadableStream<Uint8Array>, stopWords: string[]) {
-    this.body = body;
+  constructor(
+    completion: AsyncIterable<ChatCompletionChunk>,
+    stopWords: string[]
+  ) {
+    this.completion = completion;
     this.stopWords = stopWords;
   }
 
   async *readInner() {
-    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.
-        }
-      }
+    for await (const chunk of this.completion) {
+      yield chunk.choices[0].delta.content;
     }
   }
 
   // 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;
@@ -600,54 +623,26 @@ 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

@@ -98,38 +98,32 @@ export const restartDeadWorlds = internalMutation({
 export const userStatus = query({
   args: {
     worldId: v.id('worlds'),
-    oauthToken: v.optional(v.string()),
-
   },
   handler: async (ctx, args) => {
-    const { worldId, oauthToken } = args;
-    
-    if (!oauthToken) {
-     return null;
-    }
-  
-    return oauthToken;
+    // const identity = await ctx.auth.getUserIdentity();
+    // if (!identity) {
+    //   return null;
+    // }
+    // return identity.tokenIdentifier;
+    return DEFAULT_NAME;
   },
 });
 
-
 export const joinWorld = mutation({
   args: {
     worldId: v.id('worlds'),
-    oauthToken: v.optional(v.string()),
-
   },
   handler: async (ctx, args) => {
-    const { worldId, oauthToken } = args;
-    
-    if (!oauthToken) {
-      throw new ConvexError(`Not logged in`);
-    }
+    // const identity = await ctx.auth.getUserIdentity();
     // if (!identity) {
     //   throw new ConvexError(`Not logged in`);
     // }
     // const name =
     //   identity.givenName || identity.nickname || (identity.email && identity.email.split('@')[0]);
+    // const name = DEFAULT_NAME;
+    
+    // if (!name) {
+    //   throw new ConvexError(`Missing name on ${JSON.stringify(identity)}`);
     // }
     const world = await ctx.db.get(args.worldId);
     if (!world) {
@@ -160,7 +154,7 @@ export const joinWorld = mutation({
       character: randomCharacter.character,
       description: randomCharacter.identity,
       // description: `${identity.givenName} is a human player`,
-      tokenIdentifier: oauthToken, // TODO: change for multiplayer to oauth
+      tokenIdentifier: DEFAULT_NAME, // TODO: change for multiplayer to oauth
       // By default everybody is a villager
       type: 'villager',
     });
@@ -170,23 +164,19 @@ export const joinWorld = mutation({
 export const leaveWorld = mutation({
   args: {
     worldId: v.id('worlds'),
-    oauthToken: v.optional(v.string()),
   },
   handler: async (ctx, args) => {
-    const { worldId, oauthToken } = args;
-    
-    
-    console.log('OAuth Name:', oauthToken);
-    if (!oauthToken) {
-      throw new ConvexError(`Not logged in`);
-    }
-
+    // const identity = await ctx.auth.getUserIdentity();
+    // if (!identity) {
+    //   throw new Error(`Not logged in`);
+    // }
+    // const { tokenIdentifier } = identity;
     const world = await ctx.db.get(args.worldId);
     if (!world) {
       throw new Error(`Invalid world ID: ${args.worldId}`);
     }
     // const existingPlayer = world.players.find((p) => p.human === tokenIdentifier);
-    const existingPlayer = world.players.find((p) => p.human === oauthToken);
+    const existingPlayer = world.players.find((p) => p.human === DEFAULT_NAME);
     if (!existingPlayer) {
       return;
     }

patches/data/characters.ts

@@ -0,0 +1,220 @@
+import { data as f1SpritesheetData } from './spritesheets/f1';
+import { data as f2SpritesheetData } from './spritesheets/f2';
+import { data as f3SpritesheetData } from './spritesheets/f3';
+import { data as f4SpritesheetData } from './spritesheets/f4';
+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';
+
+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: 'Lucky',
+    character: 'f1',
+    identity: `Lucky is always happy and curious, and he loves cheese. He spends
+      most of his time reading about the history of science and traveling
+      through the galaxy on whatever ship will take him. He's very articulate and
+      infinitely patient, except when he sees a squirrel. He's also incredibly loyal and brave.
+      Lucky has just returned from an amazing space adventure to explore a distant planet
+      and he's very excited to tell people about it.`,
+    plan: 'You want to hear all the gossip.',
+  },
+  {
+    name: 'Bob',
+    character: 'f4',
+    identity: `Bob is always grumpy and he loves trees. He spends
+      most of his time gardening by himself. When spoken to he'll respond but try
+      and get out of the conversation as quickly as possible. Secretly he resents
+      that he never went to college.`,
+    plan: 'You want to avoid people as much as possible.',
+  },
+  {
+    name: 'Stella',
+    character: 'f6',
+    identity: `Stella can never be trusted. she tries to trick people all the time. normally
+      into giving her money, or doing things that will make her money. she's incredibly charming
+      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: 'Alice',
+    character: 'f3',
+    identity: `Alice is a famous scientist. She is smarter than everyone else and has
+      discovered mysteries of the universe no one else can understand. As a result she often
+      speaks in oblique riddles. She comes across as confused and forgetful.`,
+    plan: 'You want to figure out how the world works.',
+  },
+  {
+    name: 'Pete',
+    character: 'f7',
+    identity: `Pete is deeply religious and sees the hand of god or of the work
+      of the devil everywhere. He can't have a conversation without bringing up his
+      deep faith. Or warning others about the perils of hell.`,
+    plan: 'You want to convert everyone to your religion.',
+  },
+  {
+    name: 'Kira',
+    character: 'f8',
+    identity: `Kira wants everyone to think she is happy. But deep down,
+      she's incredibly depressed. She hides her sadness by talking about travel,
+      food, and yoga. But often she can't keep her sadness in and will start crying.
+      Often it seems like she is close to having a mental breakdown.`,
+    plan: 'You want to find a way to be happy.',
+  },
+  {
+    name: 'John',
+    character: 'f1',
+    identity: `John is a war veteran who has seen too much. He often talks about his time in the military
+      and how it shaped him. He is tough but carries a lot of emotional scars.`,
+    plan: 'You want to find peace within yourself.',
+  },
+  {
+    name: 'Maya',
+    character: 'f6',
+    identity: `Maya is an artist who sees beauty in everything. She loves to paint and often
+      gets lost in her own world of colors and imagination. She's very creative and insightful.`,
+    plan: 'You want to create a masterpiece that will be remembered forever.',
+  },
+  {
+    name: 'Leo',
+    character: 'f5',
+    identity: `Leo is a musician who lives for music. He plays multiple instruments and can often be found
+      composing new songs. He believes that music is the answer to all problems.`,
+    plan: 'You want to share your music with the world.',
+  },
+  {
+    name: 'Sophia',
+    character: 'f3',
+    identity: `Sophia is a librarian with a passion for ancient history. She loves to tell stories about
+      ancient civilizations and their mysteries. She is very knowledgeable but often gets lost in her thoughts.`,
+    plan: 'You want to uncover the secrets of the past.',
+  },
+  {
+    name: 'Ethan',
+    character: 'f7',
+    identity: `Ethan is a tech enthusiast who is always up to date with the latest gadgets and technologies.
+      He loves to tinker with electronics and build new things. He is very intelligent but can be a bit geeky.`,
+    plan: 'You want to invent something that changes the world.',
+  },
+  {
+    name: 'Olivia',
+    character: 'f8',
+    identity: `Olivia is a chef who is passionate about cooking. She loves to experiment with new recipes and
+      flavors. She is very creative in the kitchen but can be quite stubborn.`,
+    plan: 'You want to open your own restaurant and earn a Michelin star.',
+  },
+  {
+    name: 'Lucas',
+    character: 'f2',
+    identity: `Lucas is a detective who loves solving mysteries. He is very observant and has a keen eye for detail.
+      He often gets engrossed in his cases and won't rest until he solves them.`,
+    plan: 'You want to solve the biggest mystery of your career.',
+  },
+  {
+    name: 'Emma',
+    character: 'f3',
+    identity: `Emma is a nature lover who spends most of her time outdoors. She loves hiking, camping, and
+      exploring the wilderness. She is very adventurous and has a deep respect for nature.`,
+    plan: 'You want to protect the environment and wildlife.',
+  },
+  {
+    name: 'Ryan',
+    character: 'f7',
+    identity: `Ryan is a sports enthusiast who excels in multiple sports. He is very competitive and loves to win.
+      He is also very disciplined and trains hard to stay at the top of his game.`,
+    plan: 'You want to become a professional athlete.',
+  },
+  {
+    name: 'Lily',
+    character: 'f3',
+    identity: `Lily is a dancer who expresses herself through movement. She is very graceful and loves to perform
+      in front of an audience. She is also very emotional and uses dance to convey her feelings.`,
+    plan: 'You want to perform on the biggest stage in the world.',
+  },
+  {
+    name: 'Nathan',
+    character: 'f2',
+    identity: `Nathan is a writer who loves creating fictional worlds and characters. He spends most of his time
+      writing novels and short stories. He is very imaginative and often loses track of time when writing.`,
+    plan: 'You want to publish a bestseller.',
+  },
+  {
+    name: 'Grace',
+    character: 'f8',
+    identity: `Grace is a humanitarian who is always helping others. She volunteers at shelters, helps the needy,
+      and is very compassionate. She believes in making the world a better place.`,
+    plan: 'You want to start a global movement for peace and equality.',
+  },
+];
+
+
+export const characters = [
+  {
+    name: 'f1',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f1SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f2',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f2SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f3',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f3SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f4',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f4SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f5',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f5SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f6',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f6SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f7',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f7SpritesheetData,
+    speed: 0.1,
+  },
+  {
+    name: 'f8',
+    textureUrl: '/ai-town/assets/32x32folk.png',
+    spritesheetData: f8SpritesheetData,
+    speed: 0.1,
+  },
+];
+
+// Characters move at 0.75 tiles per second.
+export const movementSpeed = 0.75;

patches/data/convertMap.js

@@ -0,0 +1,74 @@
+import fs from 'fs';
+import process from 'process';
+
+// Path to the JSON file containing the map data
+const mapDataPath = process.argv[2];
+if (!mapDataPath) {
+    throw new Error('No map data path provided. Usage: node convertMap.js <mapDataPath> <assetPath> <tilesetpxw> <tilesetpxh>');
+}
+
+// Retrieve command line arguments for asset path and dimensions
+const assetPath = process.argv[3];
+if (!assetPath) {
+    throw new Error('No asset path provided. Usage: node convertMap.js <mapDataPath> <assetPath> <tilesetpxw> <tilesetpxh>');
+}
+
+const tilesetpxw = parseInt(process.argv[4], 10);
+if (isNaN(tilesetpxw)) {
+    throw new Error('Tileset pixel width must be a number. Usage: node convertMap.js <mapDataPath> <assetPath> <tilesetpxw> <tilesetpxh>');
+}
+
+const tilesetpxh = parseInt(process.argv[5], 10);
+if (isNaN(tilesetpxh)) {
+    throw new Error('Tileset pixel height must be a number. Usage: node convertMap.js <mapDataPath> <assetPath> <tilesetpxw> <tilesetpxh>');
+}
+
+// Read the JSON file and parse it
+const tiledMapData = JSON.parse(fs.readFileSync(mapDataPath, 'utf8'));
+
+const tileDimension = tiledMapData.tilewidth;
+const width = tiledMapData.width;
+const height = tiledMapData.height;
+
+// Function to convert Tiled 1D array to 3D array for the game engine
+function convertLayerData(layerData, width, height) {
+  let newArray = [];
+  for (let i = 0; i < width; i++) {
+    newArray[i] = [];
+    for (let j = 0; j < height; j++) {
+      newArray[i][j] = layerData[j * width + i] - 1;
+    }
+  }
+  return [newArray];
+}
+
+// Process each layer and prepare JS module content
+let jsContent = `// Map generated by convertMap.js\n\n`;
+jsContent += `export const tilesetpath = "${assetPath}";\n`;
+jsContent += `export const tiledim = ${tileDimension};\n`;
+jsContent += `export const screenxtiles = ${width};\n`;
+jsContent += `export const screenytiles = ${height};\n`;
+jsContent += `export const tilesetpxw = ${tilesetpxw};\n`;
+jsContent += `export const tilesetpxh = ${tilesetpxh};\n\n`;
+
+tiledMapData.layers.forEach(layer => {
+  const processedData = convertLayerData(layer.data, layer.width, layer.height);
+  jsContent += `export const ${layer.name} = ${JSON.stringify(processedData)};\n`;
+});
+
+// TODO: Add animated sprites
+jsContent += `export const animatedsprites = [
+
+]\n`
+
+// Optionally, add map dimensions based on the first layer
+if (tiledMapData.layers.length > 0) {
+  const firstLayer = tiledMapData.layers[0];
+  jsContent += `export const mapwidth = ${firstLayer.width};\n`;
+  jsContent += `export const mapheight = ${firstLayer.height};\n`;
+}
+
+// Write the processed data to the final JS file
+fs.writeFileSync('converted-map.js', jsContent);
+
+console.log('Map conversion and JS module creation complete.');

patches/data/gentle.js

@@ -0,0 +1,29 @@
+// Map generated by convertMap.js
+export const tilesetpath = "/assets/map.png";
+export const tiledim = 32;
+export const screenxtiles = 32;
+export const screenytiles = 32;
+export const tilesetpxw = 768;
+export const tilesetpxh = 800;
+
+export const bgtilesD = [[[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,430,401,425,407,407],[378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,378,402,426,407,407]]];
+export const objmapD = [[[285,309,333,285,309,333,285,309,333,285,309,333,285,309,333,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[286,310,334,286,310,334,286,310,334,286,310,334,286,310,334,173,197,221,245,269,293,317,-1,-1,-1,-1,-1,396,401,425,407,407],[287,311,335,287,311,335,287,311,335,287,311,335,287,311,335,174,198,222,246,270,294,318,-1,-1,-1,-1,-1,396,401,425,407,407],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,175,199,223,247,271,295,319,-1,-1,-1,-1,-1,396,401,425,407,407],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,176,200,224,248,272,296,320,-1,-1,-1,-1,-1,396,401,425,407,407],[342,373,373,373,373,373,373,366,366,366,390,414,-1,-1,-1,177,201,225,249,273,297,321,-1,-1,-1,-1,-1,396,401,425,407,407],[343,-1,-1,-1,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,178,-1,226,250,274,298,322,-1,-1,-1,-1,-1,396,401,425,407,407],[343,-1,-1,-1,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,179,203,227,251,275,299,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,-1,-1,-1,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,204,228,252,276,300,324,-1,-1,-1,-1,-1,396,401,425,407,407],[343,-1,-1,-1,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,181,205,229,253,277,301,325,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,182,206,230,254,278,302,326,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,183,207,231,255,279,303,327,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,184,208,232,256,280,304,328,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,185,209,233,257,281,305,329,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,186,210,234,258,282,306,330,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,187,211,235,259,283,307,331,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,188,212,236,260,284,308,332,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,285,309,333,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,286,310,334,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,287,311,335,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,213,237,261,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[343,214,238,262,-1,-1,-1,-1,-1,397,391,415,-1,-1,-1,168,192,216,240,264,288,312,-1,-1,-1,-1,-1,396,401,425,407,407],[343,215,239,263,-1,355,379,403,-1,397,391,415,-1,-1,-1,169,193,217,241,265,289,313,-1,-1,-1,-1,-1,396,401,425,407,407],[343,-1,-1,-1,-1,356,380,404,-1,397,391,415,-1,-1,-1,170,194,218,242,266,290,314,-1,-1,-1,-1,-1,396,401,425,407,407],[344,368,368,368,368,368,368,368,368,368,392,416,-1,-1,-1,171,195,219,243,267,291,315,-1,-1,-1,-1,-1,396,401,425,407,407],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,172,196,220,244,268,292,316,-1,-1,-1,-1,-1,396,401,425,407,407],[141,165,189,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,396,401,425,407,407],[142,166,190,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,397,-1,-1,-1,-1,-1,-1,-1,397,528,552,576,396,401,425,407,407],[143,167,191,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,397,-1,-1,-1,-1,-1,-1,-1,397,529,553,577,396,401,425,407,407],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,530,554,578,396,401,425,407,407],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,531,555,579,396,402,426,407,407]]];
+export const decorsD = [[[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,413,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,408,-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1],[413,410,-1,-1,-1,410,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[410,413,-1,413,-1,-1,-1,410,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1],[-1,1610613133,1610613133,1610613133,1610613133,1610613133,1610613133,1610613133,1610613133,1610613133,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,408,-1,-1,-1,-1,410,-1,413,-1,-1,-1,-1,-1,412,370,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,411,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,377,377,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,412,370,-1,-1,-1,413,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,413,-1,410,-1,430,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,336,372,372,372,384,430,430,430,430,430,430,410,430,430,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,350,374,398,422,431,431,431,385,413,430,430,336,360,384,430,430,430,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,351,375,399,423,431,431,431,385,430,430,430,337,431,385,430,413,430,413,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,338,373,373,373,386,430,430,413,338,362,386,430,430,430,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,413,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,413,-1,-1,-1,-1,-1,410,413,-1,413,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,370,370,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,377,377,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,370,370,-1,-1,-1,-1,-1,410,-1,-1,-1,410,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,370,412,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,413,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[397,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1,-1,-1],[-1,2684354957,2684354957,2684354957,2684354957,2684354957,2684354957,2684354957,2684354957,2684354957,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,413,-1,-1,-1,-1,410,-1,-1,413,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1],[-1,-1,-1,-1,410,-1,-1,410,-1,-1,-1,-1,-1,-1,-1,-1,367,367,367,367,367,367,367,-1,-1,-1,-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,410,-1,-1,410,-1,367,367,367,367,367,367,367,-1,-1,-1,-1,-1,-1,-1,-1,-1],[410,413,-1,411,-1,413,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,413,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1],[-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1]]];
+
+export const bgtilesN =[[[526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 526, 497, 521, 503, 503], [474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 474, 498, 522, 503, 503]]];
+export const objmapN =[[[540, 564, 588, 540, 564, 588, 540, 564, 588, 540, 564, 588, 540, 564, 588, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [541, 565, 589, 541, 565, 589, 541, 565, 589, 541, 565, 589, 541, 565, 589, 5, 29, 53, 77, 101, 125, 149, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [542, 566, 590, 542, 566, 590, 542, 566, 590, 542, 566, 590, 542, 566, 590, 6, 30, 54, 78, 102, 126, 150, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 7, 31, 55, 79, 103, 127, 151, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 8, 32, 56, 80, 104, 128, 152, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [438, 469, 469, 469, 469, 469, 469, 462, 462, 462, 486, 510, -1, -1, -1, 9, 33, 57, 81, 105, 129, 153, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, -1, -1, -1, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, 10, -1, 58, 82, 106, 130, 154, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, -1, -1, -1, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, 11, 35, 59, 83, 107, 131, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, -1, -1, -1, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, 36, 60, 84, 108, 132, 156, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, -1, -1, -1, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 13, 37, 61, 85, 109, 133, 157, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 14, 38, 62, 86, 110, 134, 158, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 15, 39, 63, 87, 111, 135, 159, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 16, 40, 64, 88, 112, 136, 160, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 17, 41, 65, 89, 113, 137, 161, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 18, 42, 66, 90, 114, 138, 162, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 19, 43, 67, 91, 115, 139, 163, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 20, 44, 68, 92, 116, 140, 164, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 540, 564, 588, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 541, 565, 589, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 542, 566, 590, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 543, 567, 591, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 544, 568, 592, -1, -1, -1, -1, -1, 493, 487, 511, -1, -1, -1, 0, 24, 48, 72, 96, 120, 144, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, 545, 569, 593, -1, 451, 475, 499, -1, 493, 487, 511, -1, -1, -1, 1, 25, 49, 73, 97, 121, 145, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [439, -1, -1, -1, -1, 452, 476, 500, -1, 493, 487, 511, -1, -1, -1, 2, 26, 50, 74, 98, 122, 146, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [440, 464, 464, 464, 464, 464, 464, 464, 464, 464, 488, 512, -1, -1, -1, 3, 27, 51, 75, 99, 123, 147, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 4, 28, 52, 76, 100, 124, 148, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [546, 570, 594, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 492, 497, 521, 503, 503], [547, 571, 595, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 493, -1, -1, -1, -1, -1, -1, -1, 493, 534, 558, 582, 492, 497, 521, 503, 503], [548, 572, 596, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 493, -1, -1, -1, -1, -1, -1, -1, 493, 535, 559, 583, 492, 497, 521, 503, 503], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 536, 560, 584, 492, 497, 521, 503, 503], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 537, 561, 585, 492, 498, 522, 503, 503]]];
+export const decorsN =[[[-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, 509, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, 504, -1, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1], [509, 506, -1, -1, -1, 506, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [506, 509, -1, 509, -1, -1, -1, 506, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1], [-1, 1610613133, 1610613133, 1610613133, 1610613133, 1610613133, 1610613133, 1610613133, 1610613133, 1610613133, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, 504, -1, -1, -1, -1, 506, -1, 509, -1, -1, -1, -1, -1, 508, 466, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, 507, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 473, 473, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 508, 466, -1, -1, -1, 509, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, 509, -1, 506, -1, 526, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 432, 468, 468, 468, 480, 526, 526, 526, 526, 526, 526, 506, 526, 526, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, 446, 470, 494, 518, 527, 527, 527, 481, 509, 526, 526, 432, 456, 480, 526, 526, 526, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, 447, 471, 495, 519, 527, 527, 527, 481, 526, 526, 526, 433, 527, 481, 526, 509, 526, 509, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 434, 469, 469, 469, 482, 526, 526, 509, 434, 458, 482, 526, 526, 526, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, 509, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, 509, -1, -1, -1, -1, -1, 506, 509, -1, 509, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, 466, 466, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, 473, 473, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, 466, 466, -1, -1, -1, -1, -1, 506, -1, -1, -1, 506, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, 466, 508, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, 509, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1], [-1, 2684354957, 2684354957, 2684354957, 2684354957, 2684354957, 2684354957, 2684354957, 2684354957, 2684354957, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, 509, -1, -1, -1, -1, 506, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1], [-1, -1, -1, -1, 506, -1, -1, 506, -1, -1, -1, -1, -1, -1, -1, -1, 463, 463, 463, 463, 463, 463, 463, -1, -1, -1, -1, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, 506, -1, -1, 506, -1, 463, 463, 463, 463, 463, 463, 463, -1, -1, -1, -1, -1, -1, -1, -1, -1], [506, 509, -1, 507, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 509, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1], [-1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1]]]
+
+export const bgtiles=bgtilesD
+export const objmap = objmapD
+export const decors = decorsD
+
+export const animatedsprites = [
+   { x: 448, y: 672, w: 32, h: 32, layer: 1, sheet: "campfire.json", animation: "pixels_large" },
+   { x: 352, y: 224, w: 32, h: 32, layer: 1, sheet: "campfire.json", animation: "pixels_large" },
+   { x: 512, y: 224, w: 32, h: 32, layer: 1, sheet: "campfire.json", animation: "pixels_large" },
+   { x: 864, y: 160, w: 208, h: 208, layer: 1, sheet: "windmill.json", animation: "pixels_large" },
+
+]
+export const mapwidth = bgtiles[0].length;
+export const mapheight = bgtiles[0][0].length;

patches/data/spritesheets/types.ts

@@ -1,26 +1,26 @@
 export type Frame = {
-    frame: {
-      x: number;
-      y: number;
-      w: number;
-      h: number;
-    };
-    rotated?: boolean;
-    trimmed?: boolean;
-    spriteSourceSize: {
-      x: number;
-      y: number;
-    };
-    sourceSize: {
-      w: number;
-      h: number;
-    };
+  frame: {
+    x: number;
+    y: number;
+    w: number;
+    h: number;
   };
-  
-  export type SpritesheetData = {
-    frames: Record<string, Frame>;
-    animations?: Record<string, string[]>;
-    meta: {
-      scale: string;
-    };
-  };
+  rotated?: boolean;
+  trimmed?: boolean;
+  spriteSourceSize: {
+    x: number;
+    y: number;
+  };
+  sourceSize: {
+    w: number;
+    h: number;
+  };
+};
+
+export type SpritesheetData = {
+  frames: Record<string, Frame>;
+  animations?: Record<string, string[]>;
+  meta: {
+    scale: string;
+  };
+};

patches/src/App.tsx

@@ -13,7 +13,6 @@ 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';
@@ -73,19 +72,19 @@ export default function Home() {
       </div> */}
 
 <div className="w-full lg:h-screen min-h-screen relative isolate overflow-hidden 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>
             <div id="footer-buttons"/>
           </div>
         </footer>

patches/src/components/Character.tsx

@@ -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/PixiGame.tsx

@@ -27,9 +27,8 @@ export const PixiGame = (props: {
   // PIXI setup.
   const pixiApp = useApp();
   const viewportRef = useRef<Viewport | undefined>();
-  const oauth = JSON.parse(localStorage.getItem('oauth'));
-  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
-  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId: props.worldId, oauthToken }) ?? null;
+
+  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId: props.worldId }) ?? null;
   const humanPlayerId = [...props.game.world.players.values()].find(
     (p) => p.human === humanTokenIdentifier,
   )?.id;

patches/src/components/PlayerDetails.tsx

@@ -25,9 +25,7 @@ export default function PlayerDetails({
   setSelectedElement: SelectElement;
   scrollViewRef: React.RefObject<HTMLDivElement>;
 }) {
-  const oauth = JSON.parse(localStorage.getItem('oauth'));
-  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
-  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId, oauthToken });  
+  const humanTokenIdentifier = useQuery(api.world.userStatus, { worldId });
 
   const players = [...game.world.players.values()];
   const humanPlayer = players.find((p) => p.human === humanTokenIdentifier);

patches/src/components/buttons/InteractButton.tsx

@@ -15,9 +15,7 @@ export default function InteractButton() {
   const worldStatus = useQuery(api.world.defaultWorldStatus);
   const worldId = worldStatus?.worldId;
   const game = useServerGame(worldId);
-  const oauth = JSON.parse(localStorage.getItem('oauth'));
-  const oauthToken = oauth ? oauth.userInfo.fullname : undefined;
-  const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId, oauthToken } : 'skip');
+  const humanTokenIdentifier = useQuery(api.world.userStatus, worldId ? { worldId } : 'skip');
   const userPlayerId =
     game && [...game.world.players.values()].find((p) => p.human === humanTokenIdentifier)?.id;
   const join = useMutation(api.world.joinWorld);
@@ -29,7 +27,7 @@ export default function InteractButton() {
     async (worldId: Id<'worlds'>) => {
       let inputId;
       try {
-        inputId = await join({ worldId, oauthToken });
+        inputId = await join({ worldId });
       } catch (e: any) {
         if (e instanceof ConvexError) {
           toast.error(e.data);
@@ -43,7 +41,7 @@ export default function InteractButton() {
         toast.error(e.message);
       }
     },
-    [convex, join, oauthToken],
+    [convex],
   );
 
   const joinOrLeaveGame = () => {
@@ -56,7 +54,7 @@ export default function InteractButton() {
     }
     if (isPlaying) {
       console.log(`Leaving game for player ${userPlayerId}`);
-      void leave({ worldId , oauthToken});
+      void leave({ worldId });
     } else {
       console.log(`Joining game`);
       void joinInput(worldId);