WIP insect eyes, prosthetic fix

data/mods/Limb_WIP/armor/arm_prosthetics.json

@@ -80,7 +80,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "arm_stub_l", "arm_neuroprosthetic_l", "hand_neuroprosthetic_l" ] } ]
   },
   {
-    "id": "right_arm_prosthetic_wood",
+    "id": "right_arm_prosthetic_wood_old",
     "type": "ARMOR",
     "name": { "str": "wooden prosthetic right arm" },
     "description": "A prosthetic arm, used as a replacement limb for those missing one.  Dating back to antiquity, this wooden arm was often used by many individuals as a simple way to hide the loss of one of their limbs.  Outside of that, its rigidity and lack of flexibility make it nearly useless for practical purposes, though it can help with very basic tasks, like lifting objects.  This one is for the right arm.",
@@ -100,7 +100,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "arm_stub_r", "arm_prosthetic_cosmetic_r", "hand_prosthetic_r" ] } ]
   },
   {
-    "id": "left_arm_prosthetic_wood",
+    "id": "left_arm_prosthetic_wood_old",
     "type": "ARMOR",
     "name": { "str": "wooden prosthetic left arm" },
     "description": "A prosthetic arm, used as a replacement limb for those missing one.  Dating back to antiquity, this wooden arm was often used by many individuals as a simple way to hide the loss of one of their limbs.  Outside of that, its rigidity and lack of flexibility make it nearly useless for practical purposes, though it can help with very basic tasks, like lifting objects.  This one is for the left arm.",
@@ -120,7 +120,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "arm_stub_l", "arm_prosthetic_cosmetic_l", "hand_prosthetic_l" ] } ]
   },
   {
-    "id": "right_arm_prosthetic_steel",
+    "id": "right_arm_prosthetic_steel_old",
     "type": "ARMOR",
     "name": { "str": "steel prosthetic right arm" },
     "description": "A prosthetic arm, used as a replacement limb for those missing one.  Dating back to the Middle Ages and Rennaisance, this metallic arm was the cutting edge replacement of its day.  Hinges within the fingers and a simple locking system allow basic function of this prosthetic, such as holding a sword.  Often given to knights and nobility, this arm is quite heavy, but extremely durable.  This one is for the right arm.",
@@ -140,7 +140,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "arm_stub_r", "arm_prosthetic_r", "hand_prosthetic_r" ] } ]
   },
   {
-    "id": "left_arm_prosthetic_steel",
+    "id": "left_arm_prosthetic_steel_old",
     "type": "ARMOR",
     "name": { "str": "steel prosthetic left arm" },
     "description": "A prosthetic arm, used as a replacement limb for those missing one.  Dating back to the Middle Ages and Rennaisance, this metallic arm was the cutting edge replacement of its day.  Hinges within the fingers and a simple locking system allow basic function of this prosthetic, such as holding a sword.  Often given to knights and nobility, this arm is quite heavy, but extremely durable.  This one is for the left arm.",

data/mods/Limb_WIP/armor/legs_prosthetics.json

@@ -40,7 +40,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "leg_stub_l", "leg_prosthetic_l", "foot_prosthetic_l" ] } ]
   },
   {
-    "id": "right_peg_leg",
+    "id": "right_peg_leg_old",
     "type": "ARMOR",
     "name": { "str": "right peg leg" },
     "description": "A prosthetic leg, used as a replacement limb for those missing one.  A primitive peg leg, often remembered for pirate movies and such, this was a go-to replacement for decades for those who couldn't afford an iron or steel one.  This comes up above the knee and is fastened on with straps or rope, with the interior cushioned by stuffing.  This one is for the right leg.",
@@ -60,7 +60,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "leg_stub_r", "leg_peg_r" ] } ]
   },
   {
-    "id": "left_peg_leg",
+    "id": "left_peg_leg_old",
     "type": "ARMOR",
     "name": { "str": "left peg leg" },
     "description": "A prosthetic leg, used as a replacement limb for those missing one.  A primitive peg leg, often remembered for pirate movies and such, this was a go-to replacement for decades for those who couldn't afford an iron or steel one.  This comes up above the knee and is fastened on with straps or rope, with the interior cushioned by stuffing.  This one is for the left leg.",
@@ -80,7 +80,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "leg_stub_l", "leg_peg_l" ] } ]
   },
   {
-    "id": "right_leg_prosthetic_steel",
+    "id": "right_leg_prosthetic_steel_old",
     "type": "ARMOR",
     "name": { "str": "steel prosthetic right leg" },
     "description": "A prosthetic leg, used as a replacement limb for those missing one.  Dating back to the Middle Ages and the Renaissance, this prosthetic is made of iron placed over a framework, and is attached with leather straps to the leg, padding placed inside for comfort.  Made in a better fashion than more common prosthetics at the time, this limb is incredibly durable, with many noble warriors wearing these into battle.  However, they were incredibly expensive, time-consuming to make, and quite heavy, leaving them out of the hands of poorer individuals.  This one is for the right leg.",
@@ -100,7 +100,7 @@
     "armor": [ { "encumbrance": 0, "coverage": 100, "covers": [ "leg_stub_r", "leg_prosthetic_r", "foot_prosthetic_r" ] } ]
   },
   {
-    "id": "left_leg_prosthetic_steel",
+    "id": "left_leg_prosthetic_steel_old",
     "type": "ARMOR",
     "name": { "str": "steel prosthetic left leg" },
     "description": "A prosthetic leg, used as a replacement limb for those missing one.  Dating back to the Middle Ages and the Renaissance, this prosthetic is made of iron placed over a framework, and is attached with leather straps to the leg, padding placed inside for comfort.  Made in a better fashion than more common prosthetics at the time, this limb is incredibly durable, with many noble warriors wearing these into battle.  However, they were incredibly expensive, time-consuming to make, and quite heavy, leaving them out of the hands of poorer individuals.  This one is for the left leg.",

data/mods/Limb_WIP/item_groups.json

@@ -5,10 +5,10 @@
     "copy-from": "museum_primitive",
     "extend": {
       "items": [
-        { "item": "left_peg_leg", "prob": 10, "damage": [ 2, 4 ] },
-        { "item": "right_peg_leg", "prob": 10, "damage": [ 2, 4 ] },
-        { "item": "left_arm_prosthetic_wood", "prob": 10, "damage": [ 2, 4 ] },
-        { "item": "right_arm_prosthetic_wood", "prob": 10, "damage": [ 2, 4 ] }
+        { "item": "left_peg_leg_old", "prob": 10, "damage": [ 2, 4 ] },
+        { "item": "right_peg_leg_old", "prob": 10, "damage": [ 2, 4 ] },
+        { "item": "left_arm_prosthetic_wood_old", "prob": 10, "damage": [ 2, 4 ] },
+        { "item": "right_arm_prosthetic_wood_old", "prob": 10, "damage": [ 2, 4 ] }
       ]
     }
   },
@@ -18,14 +18,14 @@
     "copy-from": "museum_misc",
     "extend": {
       "items": [
-        { "item": "left_peg_leg", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "right_peg_leg", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "right_leg_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "left_leg_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "left_arm_prosthetic_wood", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "right_arm_prosthetic_wood", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "left_arm_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] },
-        { "item": "right_arm_prosthetic_steel", "prob": 15, "damage": [ 2, 4 ] }
+        { "item": "left_peg_leg_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "right_peg_leg_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "right_leg_prosthetic_steel_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "left_leg_prosthetic_steel_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "left_arm_prosthetic_wood_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "right_arm_prosthetic_wood_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "left_arm_prosthetic_steel_old", "prob": 15, "damage": [ 2, 4 ] },
+        { "item": "right_arm_prosthetic_steel_old", "prob": 15, "damage": [ 2, 4 ] }
       ]
     }
   },

data/mods/Limb_WIP/mutation_eocs/limb_changing_eocs.json

@@ -2,19 +2,35 @@
   {
     "type": "effect_on_condition",
     "id": "EOC_PRE_EYES_INSECT",
-    "condition": { "and": [ { "math": [ "u_vitamin('mutagen_insect')", ">=", "100" ] } ] },
+    "//": "IF we're asleep and have enough juice grow eyes, ELSE IF we're asleep print dream ELSE print failure",
+    "condition": {
+      "and": [
+        { "math": [ "u_vitamin('mutagen_insect')", ">=", "500" ] },
+        { "math": [ "u_vitamin('mutagen')", ">=", "500" ] },
+        { "u_has_effect": "sleep" }
+      ]
+    },
     "effect": [
-      { "u_message": "BZZZZZZT", "type": "good", "popup": true },
+      { "u_mutate_towards": "EYES_INSECT", "category": "INSECT", "use_vitamins": false },
       {
-        "u_mutate_towards": "EYES_INSECT",
-        "category": { "u_val": "mutation_category", "type": "upcoming", "context": "mutation" },
-        "use_vitamins": true
-      },
-      { "u_message": "<u_val:upcoming_mutation_mutation_category>" }
+        "if": { "u_has_trait": "EYES_INSECT" },
+        "then": { "u_message": "<insect_eye_success>", "popup": true },
+        "else": { "u_message": "<insect_failure>", "type": "bad", "snippet": true }
+      }
     ],
     "false_effect": [
-      { "u_message": "Ouchie owie", "type": "bad" },
-      { "u_add_var": "mutation_category", "type": "upcoming", "context": "mutation", "value": "INSECT" }
+      {
+        "if": {
+          "and": [
+            { "u_has_effect": "sleep" },
+            {
+              "x_in_y_chance": { "x": { "math": [ "u_vitamin('mutagen_insect') + u_vitamin('mutagen')" ] }, "y": 100 }
+            }
+          ]
+        },
+        "then": [ { "u_message": "<insect_eye_dream>", "snippet": true, "popup": true }, { "u_lose_effect": "sleep" } ],
+        "else": { "u_message": "<insect_failure>", "type": "bad", "snippet": true }
+      }
     ]
   }
 ]

data/mods/Limb_WIP/mutation_eocs/prosthetics_eocs.json

@@ -235,13 +235,13 @@
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "left_peg_leg", "worn_only": true } ],
-        "true_eocs": [ "EOC_left_peg_leg_hp_set" ]
+        "search_data": [ { "id": "left_peg_leg_old", "worn_only": true } ],
+        "true_eocs": [ "EOC_left_peg_leg_old_hp_set" ]
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "right_peg_leg", "worn_only": true } ],
-        "true_eocs": [ "EOC_right_peg_leg_hp_set" ]
+        "search_data": [ { "id": "right_peg_leg_old", "worn_only": true } ],
+        "true_eocs": [ "EOC_right_peg_leg_old_hp_set" ]
       },
       {
         "u_run_inv_eocs": "random",
@@ -255,12 +255,12 @@
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "left_arm_prosthetic_steel", "worn_only": true } ],
+        "search_data": [ { "id": "left_arm_prosthetic_steel_old", "worn_only": true } ],
         "true_eocs": [ "EOC_left_arm_hp_set" ]
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "right_arm_prosthetic_steel", "worn_only": true } ],
+        "search_data": [ { "id": "right_arm_prosthetic_steel_old", "worn_only": true } ],
         "true_eocs": [ "EOC_right_arm_hp_set" ]
       },
       {
@@ -275,12 +275,12 @@
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "left_arm_prosthetic_wood", "worn_only": true } ],
+        "search_data": [ { "id": "left_arm_prosthetic_wood_old", "worn_only": true } ],
         "true_eocs": [ "EOC_left_cosmetic_arm_hp_set" ]
       },
       {
         "u_run_inv_eocs": "random",
-        "search_data": [ { "id": "right_arm_prosthetic_wood", "worn_only": true } ],
+        "search_data": [ { "id": "right_arm_prosthetic_wood_old", "worn_only": true } ],
         "true_eocs": [ "EOC_right_cosmetic_arm_hp_set" ]
       }
     ]
@@ -297,12 +297,12 @@
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_left_peg_leg_hp_set",
+    "id": "EOC_left_peg_leg_old_hp_set",
     "effect": [ { "math": [ "n_hp('ALL')", "=", "u_hp('leg_peg_l') * n_hp_max('bp_null') / u_hp_max('leg_peg_l')" ] } ]
   },
   {
     "type": "effect_on_condition",
-    "id": "EOC_right_peg_leg_hp_set",
+    "id": "EOC_right_peg_leg_old_hp_set",
     "effect": [ { "math": [ "n_hp('ALL')", "=", "u_hp('leg_peg_r') * n_hp_max('bp_null') / u_hp_max('leg_peg_r')" ] } ]
   },
   {

data/mods/Limb_WIP/mutation_snippets.json

@@ -0,0 +1,38 @@
+[
+  {
+    "type": "snippet",
+    "category": "<insect_failure>",
+    "text": [
+      "You need the right nectar, otherwise you will never be queen.",
+      "You long for a safe, dark place to complete your change.",
+      "You could build a hive, if only you were better.  What are you missing?",
+      "More of the <color_yellow> good nectar</color>.  That's what you need.",
+      "You can't be expected to metamorphose with so little.  You need more.",
+      "You need enough insect primer and catalyst in your system while you are sleeping to complete your change.",
+      "You won't be able to change without enough catalyst, the right primer and being asleep."
+    ]
+  },
+  {
+    "type": "snippet",
+    "category": "<insect_dream>",
+    "text": [
+      "You and your sisters have worked diligently, made your home safe and prosperous.  You felt so proud.  But lately Mother has been growing slower, and more cells are empty than with brood.  You see hesitation on your sisters as well…does the hive need you to step up?  Would they follow?  Could you defeat Her?",
+      "You dream of a dark, damp place permeated by the smell of sawdust.  You feel like this is all you've ever known, each bend in the walls and scratch on the floor your handiwork.  It feels like home, but deep down you know that you'll have to change and emerge into the dangerous, light-battered outside.",
+      "You have stuffed yourself to bursting for the fourth time today, but your hunger doesn't abate.  You would need to escape your too-small skin to be able to eat enough, you're sure of it.  Take the knife to one of the stretch marks on your back, and part the skin - it springs to the side readily and with no pain.  You work your way down your sides, changing the knife between hands as needed and free your <color_light_green>new skin</color> from its fleshy prison.",
+      "Getting the bodybag was harder than you would have thought, and ordinary garbage bags would just not do.  You eat your fill for the last time with this mouth, undress (you won't need clothes after the <bold>change</bold>), and climb in the bag.  Closing the zipper from the inside is a challenge, but you need complete darkness for what comes now.  You wait.\nAnd wait.\nAnd wait.\n\nCould you have been wrong?  You were so sure the time was right.\nYou need to get out of here, but you can't move your…anything.  Do you even have anything to move?"
+    ]
+  },
+  {
+    "type": "snippet",
+    "category": "<insect_eye_dream>",
+    "text": [
+      "<insect_dream>",
+      "Your try going about your day as usual, but your vision seems to dim every few seconds for no reason.  You reach to your eyes in annoyance and feel a disgusting fleshy membrane periodically covering them with a squeaky, wet motion.  You grasp them tightly and pull hard despite the pain until they tear off with a shower of red ichor coating your eyes.  You lick it away, and finally you can see clearly."
+    ]
+  },
+  {
+    "type": "snippet",
+    "category": "<insect_eye_success>",
+    "text": [ "WOOOOO HOOOOO INSECT EYES BAYBY" ]
+  }
+]