[Magiclysm] Add two magical rings

data/mods/Magiclysm/Spells/item_only.json

@@ -818,5 +818,17 @@
     "effect_str": "EOC_FORGE_RETURN_TELEPORT",
     "shape": "blast",
     "base_casting_time": 30000
+  },
+  {
+    "id": "ring_of_flight_spell",
+    "type": "SPELL",
+    "name": "Flight",
+    "description": "You can fly.",
+    "valid_targets": [ "self" ],
+    "effect": "attack",
+    "effect_str": "effect_ring_of_flight",
+    "shape": "blast",
+    "min_duration": 90000,
+    "max_duration": 90000
   }
 ]

data/mods/Magiclysm/effects/effects.json

@@ -1394,6 +1394,23 @@
     "name": [ "" ],
     "desc": [ "" ]
   },
+  {
+    "type": "effect_type",
+    "id": "effect_mring_fire_protection",
+    "//": "Hidden effect, used so the ring of fire protection will stop you from being set on fire",
+    "name": [ "" ],
+    "desc": [ "" ],
+    "removes_effects": [ "onfire" ]
+  },
+  {
+    "type": "effect_type",
+    "id": "effect_ring_of_flight",
+    "name": [ "Flying" ],
+    "desc": [ "You're flying." ],
+    "rating": "good",
+    "remove_message": "Your magical flight ends.",
+    "flags": [ "CLIMB_FLYING", "LEVITATION" ]
+  },
   {
     "id": "effect_dispel_magic",
     "type": "effect_type",
@@ -1610,7 +1627,8 @@
       "gravity_mage_melee",
       "eff_storm_elemental_electric_melee",
       "effect_flame_immunity",
-      "effect_burning_trail"
+      "effect_burning_trail",
+      "effect_ring_of_flight"
     ]
   },
   {

data/mods/Magiclysm/itemgroups/itemgroups.json

@@ -510,6 +510,7 @@
       { "group": "spellbook_loot_1", "prob": 35, "count": [ 1, 3 ] },
       { "group": "enchanted_rings_common", "prob": 20 },
       { "group": "enchanted_rings_uncommon", "prob": 5 },
+      { "item": "mring_fire_protection", "prob": 3 },
       { "group": "enchanted_combat_items", "prob": 10 },
       { "group": "enchanted_belts", "prob": 2 },
       { "group": "magical_reagents", "prob": 8 },
@@ -733,6 +734,7 @@
       { "item": "mring_speed_7", "prob": 10 },
       { "item": "mring_protection_6", "prob": 10 },
       { "item": "storage_ring_greater", "prob": 10 },
+      { "item": "mring_fire_protection", "prob": 10 },
       { "item": "mring_wizardry_moderate", "prob": 5 }
     ]
   },
@@ -748,6 +750,7 @@
       { "item": "mring_perception_4", "prob": 10 },
       { "item": "mring_speed_10", "prob": 10 },
       { "item": "mring_protection_8", "prob": 10 },
+      { "item": "mring_flying", "prob": 10 },
       { "item": "mring_wizardry_greater", "prob": 5 }
     ]
   },

data/mods/Magiclysm/items/enchanted_rings.json

@@ -485,5 +485,39 @@
       }
     ],
     "use_action": { "type": "holster", "holster_prompt": "Stick what into your ring", "holster_msg": "You tuck your %s into your %s" }
+  },
+  {
+    "copy-from": "mring_gold",
+    "type": "TOOL_ARMOR",
+    "id": "mring_fire_protection",
+    "price_postapoc": "6000 USD",
+    "name": { "str": "ring of fire protection", "str_pl": "rings of fire protection" },
+    "description": "A crimsonite ring with a dappled pattern that protects you from fire.",
+    "replace_materials": { "gold": "crimsonite_metal" },
+    "relic_data": {
+      "passive_effects": [
+        {
+          "has": "WORN",
+          "condition": "ALWAYS",
+          "values": [ { "value": "ARMOR_HEAT", "multiply": -0.5 } ],
+          "ench_effects": [ { "effect": "effect_mring_fire_protection", "intensity": 1 } ]
+        }
+      ]
+    }
+  },
+  {
+    "copy-from": "mring_platinum",
+    "type": "TOOL_ARMOR",
+    "id": "mring_flying",
+    "price_postapoc": "10000 USD",
+    "name": { "str": "ring of flying", "str_pl": "rings of flying" },
+    "description": "A platinum ring that allows you fly for a short time each day, and prevents fall damage while worn.",
+    "charges_per_use": 1,
+    "relic_data": {
+      "charge_info": { "recharge_type": "periodic", "time": "24 h", "regenerate_ammo": true },
+      "passive_effects": [ { "has": "WORN", "condition": "ALWAYS", "values": [ { "value": "FALL_DAMAGE", "multiply": -1 } ] } ]
+    },
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "crystallized_mana": 1 } } ],
+    "use_action": { "type": "cast_spell", "spell_id": "ring_of_flight_spell", "no_fail": true, "level": 0, "need_worn": true }
   }
 ]

data/mods/Magiclysm/items/metals.json

@@ -85,5 +85,20 @@
     "symbol": "=",
     "color": "light_blue",
     "melee_damage": { "bash": 6 }
+  },
+  {
+    "id": "crimsonite_ingot",
+    "type": "GENERIC",
+    "category": "spare_parts",
+    "name": "crimsonite ingot",
+    "description": "An ingot of crimsonite.  About 3cm by 7cm by 12cm in size, ready to be used for various blacksmithing tasks.",
+    "//": "slightly denser than copper",
+    "weight": "2250 g",
+    "volume": "253 ml",
+    "price": "63 USD 99 cent",
+    "material": [ "crimsonite_metal" ],
+    "symbol": "=",
+    "color": "red",
+    "melee_damage": { "bash": 6 }
   }
 ]

data/mods/Magiclysm/materials.json

@@ -145,6 +145,23 @@
     "resist": { "bash": 13, "cut": 20, "acid": 10, "heat": 10, "bullet": 16, "electric": 10 },
     "repair_difficulty": 7
   },
+  {
+    "type": "material",
+    "id": "crimsonite_metal",
+    "name": { "//~": "Translated from the Japanese hihi'irokane", "str": "Crimsonite" },
+    "density": 9,
+    "specific_heat_liquid": 0.82,
+    "specific_heat_solid": 0.45,
+    "latent_heat": 1000,
+    "conductive": true,
+    "chip_resist": 40,
+    "repaired_with": "crimsonite_ingot",
+    "dmg_adj": [ "marked", "dented", "smashed", "shattered" ],
+    "bash_dmg_verb": "dented",
+    "cut_dmg_verb": "scratched",
+    "resist": { "bash": 7, "cut": 15, "acid": 3, "heat": 75, "bullet": 16, "electric": 0 },
+    "repair_difficulty": 7
+  },
   {
     "type": "material",
     "id": "glassteel",

tools/spell_checker/dictionary.txt

@@ -1269,6 +1269,7 @@ Creighton
 creped
 crêpes
 crewmember
+crimsonite
 criniere
 CRISPR
 criss