Add Skunks!

data/json/effects.json

@@ -2073,6 +2073,27 @@
     "rating": "bad",
     "base_mods": { "vomit_chance": [ 500 ] }
   },
+  {
+    "type": "effect_type",
+    "id": "skunk_spray",
+    "name": [ "Skunk Spray" ],
+    "desc": [ "You were sprayed by a skunk!" ],
+    "apply_message": "You're covered in a foul smelling fluid!",
+    "rating": "bad",
+    "max_duration": "5 hours",
+    "base_mods": { "per_mod": [ -1 ], "int_mod": [ -1 ], "vomit_chance": [ 2000 ] },
+    "enchantments": [
+      {
+        "values": [
+          { "value": "SOCIAL_PERSUADE", "add": -10 },
+          { "value": "SOCIAL_LIE", "add": -4 },
+          { "value": "SOCIAL_INTIMIDATE", "add": 2 },
+          { "value": "UGLINESS", "add": 5 },
+          { "value": "SCENT_MASK", "add": 300 }
+        ]
+      }
+    ]
+  },
   {
     "type": "effect_type",
     "id": "invisibility",

data/json/harvest.json

@@ -2715,6 +2715,23 @@
       { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
     ]
   },
+  {
+    "id": "skunk_with_skull",
+    "type": "harvest",
+    "entries": [
+      { "drop": "skull_skunk", "type": "bone", "scale_num": [ 1, 1 ], "max": 1 },
+      { "drop": "meat", "type": "flesh", "mass_ratio": 0.28 },
+      { "drop": "meat_scrap", "type": "flesh", "mass_ratio": 0.05 },
+      { "drop": "lung", "type": "flesh", "mass_ratio": 0.0035 },
+      { "drop": "liver", "type": "offal", "mass_ratio": 0.01 },
+      { "drop": "brain", "type": "flesh", "mass_ratio": 0.005 },
+      { "drop": "bone", "type": "bone", "mass_ratio": 0.15 },
+      { "drop": "animal_blood", "type": "blood", "mass_ratio": 0.1 },
+      { "drop": "sinew", "type": "bone", "mass_ratio": 0.00035 },
+      { "drop": "raw_fur", "type": "skin", "mass_ratio": 0.02 },
+      { "drop": "fat", "type": "flesh", "mass_ratio": 0.07 }
+    ]
+  },
   {
     "id": "beaver_with_skull",
     "type": "harvest",

data/json/items/generic/skulls.json

@@ -130,6 +130,16 @@
     "volume": "275 ml",
     "longest_side": "11 cm"
   },
+  {
+    "type": "GENERIC",
+    "id": "skull_skunk",
+    "name": { "str": "skunk skull" },
+    "description": "The skull of a skunk.",
+    "copy-from": "skull_abstract",
+    "weight": "56 g",
+    "volume": "300 ml",
+    "longest_side": "8 cm"
+  },
   {
     "type": "GENERIC",
     "id": "skull_rodent",

data/json/monster_special_attacks/spells.json

@@ -674,6 +674,21 @@
     "id": "portal_cage_revert_transform",
     "furniture": [ { "result": [ "f_null" ], "valid_furniture": [ "f_absence" ] } ]
   },
+  {
+    "id": "skunk_squirt",
+    "type": "SPELL",
+    "name": { "str": "Skunk Spray" },
+    "description": "Skunk spray defense mechanism.",
+    "valid_targets": [ "hostile" ],
+    "effect": "attack",
+    "shape": "cone",
+    "min_range": 4,
+    "max_range": 4,
+    "//": "Duration is 3-5 hours, can't seem to write it in hours, had to write it in moves which is terrible",
+    "min_duration": 1080000,
+    "max_duration": 1800000,
+    "effect_str": "skunk_spray"
+  },
   {
     "id": "boomer_claymore_initial",
     "type": "SPELL",

data/json/monstergroups/wilderness.json

@@ -146,6 +146,7 @@
       { "monster": "mon_weasel", "weight": 5, "cost_multiplier": 5 },
       { "monster": "mon_raccoon", "weight": 8, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
       { "monster": "mon_opossum", "weight": 8, "cost_multiplier": 0, "pack_size": [ 1, 3 ] },
+      { "monster": "mon_skunk", "weight": 6, "cost_multiplier": 0, "pack_size": [ 1, 2 ] },
       { "monster": "mon_black_rat", "weight": 10, "cost_multiplier": 0, "pack_size": [ 1, 5 ] },
       { "group": "GROUP_WILDERNESS_FOREST_MAMMAL_WINTER", "weight": 22 },
       { "group": "GROUP_WILDERNESS_FOREST_MAMMAL_MUTANT", "weight": 1, "starts": "14 days" },
@@ -505,6 +506,7 @@
       { "group": "GROUP_RABBIT_WILD", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel", "weight": 50, "cost_multiplier": 0 },
       { "monster": "mon_squirrel_red", "weight": 50, "cost_multiplier": 0 },
+      { "monster": "mon_skunk", "weight": 2, "cost_multiplier": 0 },
       { "monster": "mon_mantis_small", "weight": 5, "cost_multiplier": 10 },
       { "monster": "mon_lady_bug", "weight": 8, "cost_multiplier": 10 },
       { "monster": "mon_aphid", "weight": 20, "cost_multiplier": 0 },

data/json/monsters/mammal.json

@@ -2652,6 +2652,60 @@
     "fear_triggers": [ "PLAYER_CLOSE" ],
     "flags": [ "SEES", "HEARS", "SMELLS", "ANIMAL", "CLIMBS", "PATH_AVOID_DANGER_1", "WARM", "KEENNOSE", "EATS", "SMALL_HIDER" ]
   },
+  {
+    "id": "mon_skunk",
+    "type": "MONSTER",
+    "name": { "str": "skunk" },
+    "description": "The common striped skunk, similar in size to opossum or domestic cats, these mammals can often be smelled before they are seen.",
+    "default_faction": "small_animal",
+    "bodytype": "pig",
+    "categories": [ "WILDLIFE" ],
+    "species": [ "MAMMAL" ],
+    "volume": "4000 ml",
+    "weight": "5 kg",
+    "hp": 12,
+    "speed": 110,
+    "material": [ "flesh" ],
+    "symbol": "s",
+    "color": "black_white",
+    "//": "Aggression note - No matter what anger triggers I gave the skunk they would never spray, HAD to raise aggression. Its not a perfect solution but don't lower their aggression or they won't spray anymore",
+    "aggression": 15,
+    "morale": 10,
+    "melee_dice": 1,
+    "melee_dice_sides": 4,
+    "melee_damage": [ { "damage_type": "cut", "amount": 1 } ],
+    "special_attacks": [
+      {
+        "type": "spell",
+        "spell_data": { "id": "skunk_squirt", "min_level": 0 },
+        "monster_message": "A skunk raises its tail and squirts!",
+        "cooldown": 10
+      },
+      [ "BROWSE", 150 ]
+    ],
+    "dodge": 2,
+    "vision_day": 9,
+    "vision_night": 9,
+    "stomach_size": 50,
+    "harvest": "skunk_with_skull",
+    "families": [ "prof_intro_biology", "prof_physiology" ],
+    "anger_triggers": [ "FRIEND_ATTACKED", "HURT" ],
+    "fear_triggers": [ "PLAYER_CLOSE" ],
+    "flags": [
+      "SEES",
+      "HEARS",
+      "SMELLS",
+      "ANIMAL",
+      "CLIMBS",
+      "PATH_AVOID_DANGER_1",
+      "WARM",
+      "KEENNOSE",
+      "GOODHEARING",
+      "EATS",
+      "CORNERED_FIGHTER",
+      "SMALL_HIDER"
+    ]
+  },
   {
     "id": "mon_otter",
     "type": "MONSTER",