Backporting CleverRaven#48746

ZhilkinSerg · Aug 12, 2021 · 4b68f33 · 4b68f33
1 parent 4d112a5
commit 4b68f33
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/data/mods/Magiclysm/Spells/monsterspells.json b/data/mods/Magiclysm/Spells/monsterspells.json
@@ -74,6 +74,20 @@
     "shape": "blast",
     "effect": "attack"
   },
+  {
+    "id": "prank",
+    "type": "SPELL",
+    "name": "Leprechaun prank",
+    "description": "Pranks the PC.  Gag humor.",
+    "valid_targets": [ "hostile" ],
+    "flags": [ "NO_LEGS" ],
+    "max_level": 5,
+    "min_range": 1,
+    "max_range": 5,
+    "range_increment": 1,
+    "shape": "blast",
+    "effect": "vomit"
+  },
   {
     "id": "gas_attack",
     "type": "SPELL",

diff --git a/data/mods/Magiclysm/monsters/holiday_magiclysm.json b/data/mods/Magiclysm/monsters/holiday_magiclysm.json
@@ -93,20 +93,22 @@
     "bodytype": "human",
     "volume": "145 ml",
     "weight": "168 kg",
-    "hp": 125,
+    "hp": 45,
     "speed": 124,
     "material": [ "flesh" ],
     "symbol": "L",
     "color": "green",
     "aggression": 45,
-    "morale": 100,
-    "melee_skill": 6,
-    "melee_dice": 7,
-    "melee_dice_sides": 7,
+    "morale": 5,
+    "melee_skill": 4,
+    "melee_dice": 3,
+    "melee_dice_sides": 2,
     "dodge": 6,
     "harvest": "demihuman",
     "path_settings": { "avoid_traps": true, "avoid_sharp": true },
     "death_function": [ "NORMAL" ],
-    "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "WARM" ]
+    "fear_triggers": [ "HURT", "FIRE" ],
+    "special_attacks": [ { "type": "spell", "spell_data": { "id": "prank", "min_level": 5 }, "cooldown": 80 }, [ "PULL_METAL_WEAPON", 25 ] ],
+    "flags": [ "SEES", "HEARS", "SMELLS", "PATH_AVOID_DANGER_1", "KEEP_DISTANCE", "WARM", "HIT_AND_RUN" ]
   }
 ]