Vanilla Spell name to object, double have decimal

CleverRaven · Feb 28, 2020 · 2bfa7dc · 2bfa7dc
1 parent 7d60cda
commit 2bfa7dc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/data/json/legacy_artifact_active.json b/data/json/legacy_artifact_active.json
@@ -209,7 +209,7 @@
   {
     "type": "SPELL",
     "id": "art_eff_pet",
-    "name": "Pet",
+    "name": { "str": "Pet" },
     "description": "Makes the target a pet",
     "valid_targets": [ "ally", "hostile" ],
     "effect": "target_attack",
@@ -461,7 +461,7 @@
   {
     "type": "SPELL",
     "id": "AEA_STORM_bolt",
-    "name": "Bolt",
+    "name": { "str": "Bolt" },
     "description": "One of the bolts thrown by AEA_STORM",
     "effect": "line_attack",
     "valid_targets": [ "ground", "hostile", "ally" ],
@@ -497,7 +497,7 @@
   {
     "type": "SPELL",
     "id": "AEA_SCREAM_morale",
-    "name": "Morale Scream",
+    "name": { "str": "Morale Scream" },
     "description": "Morale effect from AEA_SCREAM",
     "effect": "morale",
     "effect_str": "morale_scream",
@@ -543,7 +543,7 @@
   {
     "type": "SPELL",
     "id": "AEA_PULSE_bash_terrain",
-    "name": "Bash Terrain",
+    "name": { "str": "Bash Terrain" },
     "description": "Damages the terrain",
     "valid_targets": [ "self", "ally", "hostile", "ground" ],
     "effect": "bash",

diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json
@@ -2,67 +2,67 @@
   {
     "id": "pain_damage",
     "type": "SPELL",
-    "name": "Pain",
+    "name": { "str": "Pain" },
     "description": "Increases pain",
     "valid_targets": [ "hostile" ],
     "flags": [ "SILENT" ],
     "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
     "min_damage": -25,
     "max_damage": -225,
-    "damage_increment": -50,
+    "damage_increment": -50.0,
     "max_level": 10,
     "effect": "recover_energy",
     "effect_str": "PAIN"
   },
   {
     "id": "stamina_damage",
     "type": "SPELL",
-    "name": "Tired",
+    "name": { "str": "Tired" },
     "description": "decreases stamina",
     "valid_targets": [ "hostile" ],
     "flags": [ "SILENT" ],
     "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
     "min_damage": -2000,
     "max_damage": -10000,
-    "damage_increment": -2000,
+    "damage_increment": -2000.0,
     "max_level": 10,
     "effect": "recover_energy",
     "effect_str": "STAMINA"
   },
   {
     "id": "stamina_damage_mi-go_slaver_beam",
     "type": "SPELL",
-    "name": "Tired",
+    "name": { "str": "Tired" },
     "description": "decreases stamina.  Designed for mi-go slaver beam",
     "valid_targets": [ "hostile" ],
     "flags": [ "SILENT" ],
     "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
     "min_damage": -500,
     "max_damage": -5500,
-    "damage_increment": -500,
+    "damage_increment": -500.0,
     "max_level": 10,
     "effect": "recover_energy",
     "effect_str": "STAMINA"
   },
   {
     "id": "pain_damage_mi-go_slaver_beam",
     "type": "SPELL",
-    "name": "Pain",
+    "name": { "str": "Pain" },
     "description": "Increases pain.  Designed for mi-go slaver beam",
     "valid_targets": [ "hostile" ],
     "flags": [ "SILENT" ],
     "//": "Listed as a recover energy effect with a negative modifier that decreases with each level of the spell, which makes it cause damage instead.",
     "min_damage": -8,
     "max_damage": -148,
-    "damage_increment": -14,
+    "damage_increment": -14.0,
     "max_level": 10,
     "effect": "recover_energy",
     "effect_str": "PAIN"
   },
   {
     "id": "mi-go_slaver_beam",
     "type": "SPELL",
-    "name": "mi-go slaver beam",
+    "name": { "str": "mi-go slaver beam" },
     "description": "Mi-go slaver beams cause pain, lower stamina, and give a short-lasting daze effect.  Starts very short range, increases rapidly with level.",
     "valid_targets": [ "hostile" ],
     "effect": "projectile_attack",
@@ -72,15 +72,15 @@
     "max_level": 5,
     "min_range": 1,
     "max_range": 25,
-    "range_increment": 5,
+    "range_increment": 5.0,
     "min_duration": 100,
     "max_duration": 1000,
     "duration_increment": 200
   },
   {
     "type": "SPELL",
     "id": "mon_summon_zombie_gasbag_crawler",
-    "name": "Summon Gangrenous Crawlers",
+    "name": { "str": "Summon Gangrenous Crawlers" },
     "description": "Summons 2 permanent gangrenous crawlers.",
     "flags": [ "HOSTILE_SUMMON", "PERMANENT" ],
     "valid_targets": [ "ground", "self" ],
@@ -98,7 +98,7 @@
   {
     "type": "SPELL",
     "id": "crushed_giant_summoning",
-    "name": "Summon Gangrenous Monsters",
+    "name": { "str": "Summon Gangrenous Monsters" },
     "description": "Summons 2 permanent gangrenous impalers.",
     "flags": [ "HOSTILE_SUMMON", "PERMANENT" ],
     "valid_targets": [ "ground" ],