bulk 3

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;
       }
     }
@@ -177,4 +177,4 @@ function wanderDestination(worldMap: WorldMap) {
     x: 1 + Math.floor(Math.random() * (worldMap.width - 2)),
     y: 1 + Math.floor(Math.random() * (worldMap.height - 2)),
   };
-}
+}

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 = [];
   }
@@ -168,7 +175,6 @@ export class GameCycle {
 
   // Tick method to increment the counter
   tick(game: Game, tickDuration: number) {
-    console.log(process.env.GITHUB_TOKEN)
     this.currentTime += tickDuration;
 
     if (this.currentTime >= stateDurations[this.cycleState]) {

patches/convex/aiTown/player.ts

@@ -282,6 +282,7 @@ export class Player {
     if (agent) {
       agent.kill(game, now)
     }
+    
   }
 
   serialize(): SerializedPlayer {

patches/src/App.tsx

@@ -31,37 +31,42 @@ export default function Home() {
         ariaHideApp={false}
       >
         <div className="font-body">
-          <h1 className="text-center text-6xl font-bold font-display game-title">Help</h1>
-          <p>
-            Welcome to AI town. AI town supports both anonymous <i>spectators</i> and logged in{' '}
-            <i>interactivity</i>.
-          </p>
-          <h2 className="text-4xl mt-4">Spectating</h2>
-          <p>
-            Click and drag to move around the town, and scroll in and out to zoom. You can click on
-            an individual character to view its chat history.
-          </p>
-          <h2 className="text-4xl mt-4">Interactivity</h2>
-          <p>
-            If you log in, you can join the simulation and directly talk to different agents! After
-            logging in, click the "Interact" button, and your character will appear somewhere on the
-            map with a highlighted circle underneath you.
-          </p>
-          <p className="text-2xl mt-2">Controls:</p>
-          <p className="mt-4">Click to navigate around.</p>
-          <p className="mt-4">
-            To talk to an agent, click on them and then click "Start conversation," which will ask
-            them to start walking towards you. Once they're nearby, the conversation will start, and
-            you can speak to each other. You can leave at any time by closing the conversation pane
-            or moving away. They may propose a conversation to you - you'll see a button to accept
-            in the messages panel.
-          </p>
-          <p className="mt-4">
-            AI town only supports {MAX_HUMAN_PLAYERS} humans at a time. If you're idle for five
-            minutes, you'll be automatically removed from the simulation.
-          </p>
-        </div>
-      </ReactModal>
+    <h1 className="text-center text-6xl font-bold font-display game-title">Help</h1>
+    <p>
+        Welcome to Matou Garou. To play, you have to be logged in{' '}
+        <i>as player</i>.
+    </p>
+    <h2 className="text-4xl mt-4">Spectating</h2>
+    <p>
+        Click and drag to move around the village, and scroll in and out to zoom. You can click on
+        an individual character to view its chat history.
+    </p>
+    <h2 className="text-4xl mt-4">Playing</h2>
+    <p>
+        If you log in, you can join the game and directly interact with different characters! After
+        logging in, click the "Play" button, and your character will appear somewhere in the village with a highlighted circle underneath you.
+    </p>
+    <p className="text-2xl mt-2">Controls:</p>
+    <p className="mt-4">Click to navigate around.</p>
+    <p className="mt-4">
+        To talk to a character, click on them and then click "Start conversation," which will ask
+        them to start walking towards you. Once they're nearby, the conversation will start, and
+        you can speak to each other. You can leave at any time by closing the conversation pane
+        or moving away. They may propose a conversation to you - you'll see a button to accept
+        in the messages panel.
+    </p>
+    <h2 className="text-4xl mt-4">Rules</h2>
+    <p>
+        When the game starts, players will be assigned roles randomly (team Villagers and team Matou Garou). The primary objective is 
+        to vote against another team to kick them out of the game (the game ends once there's no members left of one of the teams).
+        The bonus objective is to discover which players are actually powered by an LLM (you can vote at any moment even if your character was kicked out).
+    </p>
+    <p className="mt-4">
+        Matou Garou only supports {MAX_HUMAN_PLAYERS} human players at a time. If you're idle for five
+        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" />