world change try

patches/convex/world.ts

@@ -1,8 +1,8 @@
 import { ConvexError, v } from 'convex/values';
 import { internalMutation, mutation, query } from './_generated/server';
 import { characters } from '../data/characters';
-import { Descriptions } from '../data/characters';
 import { insertInput } from './aiTown/insertInput';
+import { Descriptions } from '../data/characters';
 import {
   DEFAULT_NAME,
   ENGINE_ACTION_DURATION,
@@ -114,7 +114,6 @@ export const userStatus = query({
 
 export const joinWorld = mutation({
   args: {
-    worldId: v.id('worlds'),
     oauthToken: v.optional(v.string()),
 
   },
@@ -130,27 +129,41 @@ 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)}`);
-    // }
     const world = await ctx.db.get(args.worldId);
     if (!world) {
       throw new ConvexError(`Invalid world ID: ${args.worldId}`);
     }
-    // Select a random character description
-      const randomCharacter = Descriptions[Math.floor(Math.random() * Descriptions.length)];
 
-      return await insertInput(ctx, world._id, 'join', {
-        name: randomCharacter.name,
-        character: randomCharacter.character,
-        description: randomCharacter.identity,
-        tokenIdentifier: oauthToken,
-        role: "villager",
-      });
-    },
-  });
+    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)];
+
+    // 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: {
@@ -165,7 +178,6 @@ export const leaveWorld = mutation({
     if (!oauthToken) {
       throw new ConvexError(`Not logged in`);
     }
-
     const world = await ctx.db.get(args.worldId);
     if (!world) {
       throw new Error(`Invalid world ID: ${args.worldId}`);