[Xedra Evolved] Mics updates (#69645)

* Mics xedra evolved updates * fix the message, tweak relic data for death_ray * make EoC run for NPC * add megachette to dictionary, fix arm guards recipe * Apply suggestions from code review Co-authored-by: b3brodie <[email protected]> * Update data/mods/Xedra_Evolved/items/inventor/melee.json Co-authored-by: TheShadowFerret <[email protected]> * Update data/mods/Xedra_Evolved/eocs/inventor.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * remove the rest of rip ticket, remove dimension researches * fix inconrrect id * moar * plural --------- Co-authored-by: b3brodie <[email protected]> Co-authored-by: TheShadowFerret <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Nov 25, 2023 · 7560c55 · 7560c55
1 parent c43e917
commit 7560c55
Show file tree

Hide file tree

Showing 21 changed files with 419 additions and 293 deletions.
diff --git a/data/mods/Xedra_Evolved/eocs/inventor.json b/data/mods/Xedra_Evolved/eocs/inventor.json
@@ -14,7 +14,7 @@
           "inventor_sniper",
           "inventor_shotgun",
           "inventor_pistol",
-          "mace_magic",
+          "megachette",
           "software_math_inventor",
           "software_electronics_reference_inventor",
           "combatsaw_spear_off",
@@ -55,6 +55,7 @@
           "inventor_fists",
           "wolf_mask",
           "magnetic_holster",
+          "binary_sword",
           "bio_launcher",
           "bio_warhead",
           "trinket_damage",
@@ -95,7 +96,7 @@
       { "math": [ "base_difficulty_3", "+=", "4" ] },
       { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" },
       {
-        "u_roll_remainder": [ "inventor_backpack", "vision_halo", "sonic_gun", "inventor_research_energy_1" ],
+        "u_roll_remainder": [ "inventor_backpack", "vision_halo", "sonic_gun", "mace_magic", "inventor_fists_plus", "inventor_research_energy_1" ],
         "type": "recipe",
         "true_eocs": [ "EOC_INVENTOR_MESSAGE_GOOD" ],
         "false_eocs": {
@@ -285,43 +286,6 @@
       { "math": [ "AI_sparks", "+=", "4" ] }
     ]
   },
-  {
-    "type": "effect_on_condition",
-    "id": "EOC_INVENTOR_RESEARCH_DIMENSION_1",
-    "condition": {
-      "and": [
-        { "math": [ "u_val('vitamin', 'name:creative_spark_research')", ">=", "base_difficulty_3" ] },
-        { "math": [ "dimension_sparks", ">=", "dimension_difficulty_1" ] }
-      ]
-    },
-    "effect": [
-      { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "-=", "base_difficulty_3" ] },
-      { "math": [ "dimension_sparks", "+=", "dimension_difficulty_1" ] },
-      { "math": [ "base_difficulty_3", "+=", "5" ] },
-      { "math": [ "dimension_difficulty_1", "+=", "5" ] },
-      { "run_eocs": "EOC_INVENTOR_PROCESS_SPARKS" },
-      {
-        "u_roll_remainder": [ "rip_ticket" ],
-        "type": "recipe",
-        "true_eocs": [ "EOC_INVENTOR_MESSAGE_GOOD" ],
-        "false_eocs": {
-          "id": "EOC_REMOVE_RESEARCH_DIMENSION_1",
-          "effect": [
-            { "u_forget_recipe": "inventor_research_dimesnion_1" },
-            {
-              "u_message": "You reach the limit of what can be done at this level.  It is time to move forward.",
-              "type": "info"
-            }
-          ]
-        }
-      }
-    ],
-    "false_effect": [
-      { "u_message": "inventor_fail", "snippet": true, "type": "bad" },
-      { "math": [ "u_val('vitamin', 'name:creative_spark_research')", "+=", "5" ] },
-      { "math": [ "dimension_sparks", "+=", "4" ] }
-    ]
-  },
   {
     "type": "effect_on_condition",
     "id": "EOC_INVENTOR_PROCESS_SPARKS",
@@ -351,5 +315,30 @@
     "type": "effect_on_condition",
     "id": "EOC_INVENTOR_MESSAGE_GOOD",
     "effect": { "u_message": "inventor_success", "snippet": true, "type": "good" }
+  },
+  {
+    "type": "effect_on_condition",
+    "id": "EOC_INVENTOR_CRAFTED_DEGRADATION",
+    "recurrence": [ "1 d", "2 d" ],
+    "global": true,
+    "run_for_npcs": true,
+    "condition": { "not": { "u_has_trait": "INVENTOR" } },
+    "effect": {
+      "u_run_inv_eocs": "all",
+      "search_data": [ { "flags": [ "INVENTOR_CRAFTED" ] } ],
+      "true_eocs": [
+        {
+          "id": "EOC_RUST_INVENTOR_ITEMS",
+          "effect": [
+            { "math": [ "n_hp('ALL')", "-=", "2" ] },
+            { "message": "You hear a sudden crack!" },
+            {
+              "u_message": "Your lack of an inventor's aura makes items created by their fevered mind rapidly degrade!"
+            },
+            { "npc_message": "My items are falling apart!  It isn't me!" }
+          ]
+        }
+      ]
+    }
   }
 ]
diff --git a/data/mods/Xedra_Evolved/flags.json b/data/mods/Xedra_Evolved/flags.json
@@ -3,5 +3,10 @@
     "id": "IRONSWORN",
     "type": "json_flag",
     "info": "This gear <good>completely protects</good> you from <info>cold iron damage</info>."
+  },
+  {
+    "id": "INVENTOR_CRAFTED",
+    "type": "json_flag",
+    "info": "This thing was crafted by a mad inventor.  It is very unstable and will rapidly degrade without an inventor's presence."
   }
 ]
diff --git a/data/mods/Xedra_Evolved/itemgroups/spell_artifacts/main.json b/data/mods/Xedra_Evolved/itemgroups/spell_artifacts/main.json
@@ -56,7 +56,6 @@
       [ "battery_gun", 100 ],
       [ "ray_gun", 50 ],
       [ "ray_rifle", 10 ],
-      [ "rip_ticket", 100 ],
       [ "ion_gun", 100 ],
       [ "inventor_shotgun", 100 ],
       [ "sonic_gun", 100 ],

diff --git a/data/mods/Xedra_Evolved/items/inventor/armor.json b/data/mods/Xedra_Evolved/items/inventor/armor.json
@@ -52,7 +52,7 @@
       }
     ],
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATERPROOF", "STURDY", "PADDED", "TRADER_AVOID", "PSYSHIELD_PARTIAL", "MUNDANE" ]
+    "flags": [ "WATERPROOF", "STURDY", "PADDED", "TRADER_AVOID", "PSYSHIELD_PARTIAL", "MUNDANE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "helmet_inventor_on",
@@ -141,7 +141,7 @@
     ],
     "warmth": 10,
     "material_thickness": 2,
-    "flags": [ "BELTED", "WATER_FRIENDLY", "MUNDANE" ],
+    "flags": [ "BELTED", "WATER_FRIENDLY", "MUNDANE", "INVENTOR_CRAFTED" ],
     "use_action": [ { "type": "attach_molle", "size": 8 }, { "type": "detach_molle" } ],
     "armor": [
       {
@@ -165,7 +165,7 @@
     "symbol": "[",
     "looks_like": "legguard_hard",
     "color": "light_red",
-    "flags": [ "STURDY", "OUTER", "BELTED", "MUNDANE" ],
+    "flags": [ "STURDY", "OUTER", "BELTED", "MUNDANE", "INVENTOR_CRAFTED" ],
     "ammo": "battery",
     "use_action": {
       "target": "inventor_leg_weight_on",
@@ -227,7 +227,7 @@
     "symbol": "[",
     "looks_like": "legguard_hard",
     "color": "light_red",
-    "flags": [ "STURDY", "OUTER", "SOFT", "MUNDANE" ],
+    "flags": [ "STURDY", "OUTER", "SOFT", "MUNDANE", "INVENTOR_CRAFTED" ],
     "ammo": "battery",
     "charges_per_use": 150,
     "use_action": { "type": "cast_spell", "spell_id": "jump_boots_leap", "no_fail": true, "level": 0 },
@@ -339,7 +339,7 @@
       }
     ],
     "techniques": [ "WBLOCK_1" ],
-    "flags": [ "WATERPROOF", "STURDY", "SOFT", "TRADER_AVOID", "BELTED", "MUNDANE" ]
+    "flags": [ "WATERPROOF", "STURDY", "SOFT", "TRADER_AVOID", "BELTED", "MUNDANE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "aura_force_on",
@@ -382,7 +382,7 @@
     ],
     "ammo": [ "battery" ],
     "material_thickness": 0.1,
-    "flags": [ "WATCH", "ALARMCLOCK", "SKINTIGHT", "WATER_BREAK", "CALORIES_INTAKE", "ELECTRONIC", "MUNDANE" ],
+    "flags": [ "WATCH", "ALARMCLOCK", "SKINTIGHT", "WATER_BREAK", "CALORIES_INTAKE", "ELECTRONIC", "MUNDANE", "INVENTOR_CRAFTED" ],
     "pocket_data": [
       {
         "pocket_type": "MAGAZINE_WELL",
@@ -454,7 +454,7 @@
     "material": [ "aluminum", "steel" ],
     "volume": "11678 ml",
     "weight": "3970 g",
-    "flags": [ "DURABLE_MELEE", "PADDED", "MUNDANE" ],
+    "flags": [ "DURABLE_MELEE", "PADDED", "MUNDANE", "INVENTOR_CRAFTED" ],
     "techniques": [ "WBLOCK_3", "BRUTAL", "SWEEP" ],
     "material_thickness": 1,
     "armor": [
@@ -499,6 +499,23 @@
     ],
     "melee_damage": { "bash": 28 }
   },
+  {
+    "type": "TOOL_ARMOR",
+    "id": "inventor_fists_plus",
+    "copy-from": "inventor_fists",
+    "symbol": "3",
+    "color": "light_gray",
+    "name": { "str": "advanced heavy CQC system" },
+    "description": "Advanced version of heavy CQC system, it contain a self-recharging pneumatic tank, that slowly builds the pressure, that you can use in fight.",
+    "relic_data": { "charge_info": { "recharge_type": "periodic", "time": "1 m", "regenerate_ammo": true } },
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "oxygen": 3 }, "airtight": true } ],
+    "techniques": [ "WBLOCK_3", "BRUTAL", "SWEEP", "CQB_BRUTAL" ],
+    "use_action": {
+      "type": "effect_on_conditions",
+      "description": "Activate to read the file",
+      "effect_on_conditions": [ { "id": "EOC_CQC_ATTACK", "effect": [ { "u_attack": "CQB_BRUTAL" } ] } ]
+    }
+  },
   {
     "type": "TOOL_ARMOR",
     "id": "inventor_electric_fist",
@@ -512,7 +529,7 @@
     "weight": "300 g",
     "longest_side": "25 cm",
     "ammo": [ "battery" ],
-    "flags": [ "ONLY_ONE", "TRADER_AVOID", "MUNDANE" ],
+    "flags": [ "ONLY_ONE", "TRADER_AVOID", "MUNDANE", "INVENTOR_CRAFTED" ],
     "use_action": [
       {
         "target": "inventor_electric_fist_act",
@@ -575,7 +592,7 @@
     "color": "dark_gray",
     "material_thickness": 0.4,
     "environmental_protection": 4,
-    "flags": [ "MUNDANE" ],
+    "flags": [ "MUNDANE", "INVENTOR_CRAFTED" ],
     "relic_data": {
       "passive_effects": [ { "has": "WORN", "condition": "ACTIVE", "values": [ { "value": "REGEN_STAMINA", "multiply": 0.6 } ] } ]
     },
@@ -641,7 +658,7 @@
       }
     ],
     "use_action": { "type": "holster" },
-    "flags": [ "BELTED", "OVERSIZE", "MUNDANE" ],
+    "flags": [ "BELTED", "OVERSIZE", "MUNDANE", "INVENTOR_CRAFTED" ],
     "armor": [ { "encumbrance": 1, "coverage": 5, "covers": [ "torso" ], "specifically_covers": [ "torso_upper" ] } ]
   }
 ]
diff --git a/data/mods/Xedra_Evolved/items/inventor/bots.json b/data/mods/Xedra_Evolved/items/inventor/bots.json
@@ -15,7 +15,7 @@
       "moves": 100,
       "skills": [ "deduction", "electronics", "computer" ]
     },
-    "flags": [ "SINGLE_USE" ]
+    "flags": [ "SINGLE_USE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "bot_shotgunbot",
@@ -33,7 +33,7 @@
       "moves": 100,
       "skills": [ "deduction", "electronics", "computer" ]
     },
-    "flags": [ "SINGLE_USE" ]
+    "flags": [ "SINGLE_USE", "INVENTOR_CRAFTED" ]
   },
   {
     "id": "bot_meleebot",
@@ -51,6 +51,6 @@
       "moves": 100,
       "skills": [ "deduction", "electronics", "computer" ]
     },
-    "flags": [ "SINGLE_USE" ]
+    "flags": [ "SINGLE_USE", "INVENTOR_CRAFTED" ]
   }
 ]