mv rarity

src/lib/components/MonsterGenerator/MonsterGenerator.svelte

@@ -35,12 +35,6 @@ Guidelines:
 - Add a mouth, beak, or feeding apparatus if appropriate
 - Add creature elements like tail, fins, claws, or horns where fitting
 
-Rarity assessment - Rate objects based on their real-world availability and value:
-• COMMON: Everyday items everyone has (stationery, grass, rocks, basic furniture, common tools)
-• UNCOMMON: Items that cost money but are widely available (electronics, appliances, vehicles, branded items)  
-• RARE: Expensive or specialized items (luxury goods, professional equipment, gold jewelry, antiques)
-• LEGENDARY: Priceless or one-of-a-kind items (crown jewels, world wonders, famous artifacts, masterpiece art)
-
 Include:
 - A creative name that hints at the original object
 - Physical description showing how the object becomes a creature
@@ -50,7 +44,6 @@ Include:
 Format your response as:
 \`\`\`
 # {monster name}
-Object Rarity: {common, uncommon, rare, legendary}
 ## Monster Visual Description
 ...
 ## Monster Lore
@@ -301,19 +294,8 @@ Focus on: colors, body shape, eyes, limbs, mouth, and key visual features. Omit
       throw new Error('Text generation service not available or no concept');
     }
     
-    // Extract tier from the joy-caption output
-    let tier: 'low' | 'medium' | 'high' | 'legendary' = 'medium'; // default
-    const rarityMatch = state.monsterConcept.match(/Object Rarity:\s*(common|uncommon|rare|legendary)/i);
-    if (rarityMatch) {
-      // Map rarity to tier
-      const tierMap: { [key: string]: 'low' | 'medium' | 'high' | 'legendary' } = {
-        'common': 'low',
-        'uncommon': 'medium',
-        'rare': 'high',
-        'legendary': 'legendary'
-      };
-      tier = tierMap[rarityMatch[1].toLowerCase()] || 'medium';
-    }
+    // Default tier (will be set from the generated stats)
+    let tier: 'low' | 'medium' | 'high' | 'legendary' = 'medium';
     
     // Extract monster name from the concept
     const nameMatch = state.monsterConcept.match(/^#\s+(.+)$/m);
@@ -327,11 +309,18 @@ Focus on: colors, body shape, eyes, limbs, mouth, and key visual features. Omit
     const statsPrompt = `Based on this monster concept, generate a JSON object with battle stats and abilities:
 "${state.monsterConcept}"
 
+First, assess the rarity of the original object based on real-world availability and value:
+• COMMON: Everyday items everyone has (stationery, grass, rocks, basic furniture, common tools)
+• UNCOMMON: Items that cost money but are widely available (electronics, appliances, vehicles, branded items)  
+• RARE: Expensive or specialized items (luxury goods, professional equipment, gold jewelry, antiques)
+• LEGENDARY: Priceless or one-of-a-kind items (crown jewels, world wonders, famous artifacts, masterpiece art)
+
 The output should be formatted as a JSON instance that conforms to the JSON schema below.
 
 \`\`\`json
 {
   "properties": {
+    "rarity": {"type": "string", "enum": ["common", "uncommon", "rare", "legendary"], "description": "Rarity of the original object based on real-world availability and value"},
     "HP": {"type": "integer", "minimum": 0, "maximum": 100, "description": "Health/vitality stat (0=fragile, 100=incredibly tanky)"},
     "defence": {"type": "integer", "minimum": 0, "maximum": 100, "description": "Defensive/armor stat (0=paper thin, 100=impenetrable fortress)"},
     "attack": {"type": "integer", "minimum": 0, "maximum": 100, "description": "Physical attack power (0=harmless, 100=devastating force)"},
@@ -346,14 +335,14 @@ The output should be formatted as a JSON instance that conforms to the JSON sche
     "specialActionName": {"type": "string", "description": "Name of the monster's ultimate move (one use per battle)"},
     "specialActionDescription": {"type": "string", "description": "Describe this powerful finishing move and its dramatic effects in battle"}
   },
-  "required": ["HP", "defence", "attack", "speed", "specialPassiveTraitDescription", "attackActionName", "attackActionDescription", "buffActionName", "buffActionDescription", "debuffActionName", "debuffActionDescription", "specialActionName", "specialActionDescription"]
+  "required": ["rarity", "HP", "defence", "attack", "speed", "specialPassiveTraitDescription", "attackActionName", "attackActionDescription", "buffActionName", "buffActionDescription", "debuffActionName", "debuffActionDescription", "specialActionName", "specialActionDescription"]
 }
 \`\`\`
 
-Base the HP, defence, attack, and speed stats on the tier level:
-- low: stats should be 10-40
-- medium: stats should be 30-60
-- high: stats should be 50-80
+Base the HP, defence, attack, and speed stats on the rarity level:
+- common: stats should be 10-40
+- uncommon: stats should be 30-60
+- rare: stats should be 50-80
 - legendary: stats should be 70-100
 
 Write your response within \`\`\`json\`\`\``;
@@ -399,7 +388,7 @@ Write your response within \`\`\`json\`\`\``;
         const parsedStats = JSON.parse(cleanJson.trim());
         
         // Remove any extra fields not in our schema
-        const allowedFields = ['HP', 'defence', 'attack', 'speed',
+        const allowedFields = ['rarity', 'HP', 'defence', 'attack', 'speed',
           'specialPassiveTraitDescription', 'attackActionName', 'attackActionDescription',
           'buffActionName', 'buffActionDescription', 'debuffActionName', 'debuffActionDescription',
           'specialActionName', 'specialActionDescription', 'boostActionName', 'boostActionDescription',
@@ -411,7 +400,18 @@ Write your response within \`\`\`json\`\`\``;
           }
         }
         
-        // Add the name, description, and tier that we already extracted
+        // Map rarity to tier
+        if (parsedStats.rarity) {
+          const tierMap: { [key: string]: 'low' | 'medium' | 'high' | 'legendary' } = {
+            'common': 'low',
+            'uncommon': 'medium',
+            'rare': 'high',
+            'legendary': 'legendary'
+          };
+          tier = tierMap[parsedStats.rarity.toLowerCase()] || 'medium';
+        }
+        
+        // Add the name, description, and tier that we extracted/mapped
         parsedStats.name = monsterName;
         parsedStats.description = monsterLore;
         parsedStats.tier = tier;