Dogs love (#57677)

* Dogs love * Mission: Protect your dogs * Update professions.json * Organization * Update starting_missions.json * Dog clothing drops for dog monsters
CleverRaven · May 27, 2022 · c687f3d · c687f3d
1 parent 8983592
commit c687f3d
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 5 deletions.
diff --git a/data/json/itemgroups/Locations_MapExtras/locations.json b/data/json/itemgroups/Locations_MapExtras/locations.json
@@ -1611,6 +1611,7 @@
       { "item": "whistle", "prob": 75 },
       { "item": "ear_plugs", "prob": 66 },
       { "group": "charged_two_way_radio", "prob": 50 },
+      { "item": "kevlar_harness", "prob": 20 },
       { "item": "file", "prob": 25 },
       { "item": "baton", "prob": 20 },
       { "item": "kevlar", "prob": 15 },

diff --git a/data/json/itemgroups/Locations_MapExtras/locations_commercial.json b/data/json/itemgroups/Locations_MapExtras/locations_commercial.json
@@ -1292,9 +1292,9 @@
       [ "can_chicken", 15 ],
       [ "aquarium_medium", 10 ],
       [ "petpack", 10 ],
-      [ "kevlar_harness", 5 ],
-      [ "leather_harness_dog", 5 ],
-      [ "rubber_harness_dog", 5 ]
+      [ "kevlar_harness", 2 ],
+      [ "leather_harness_dog", 8 ],
+      [ "rubber_harness_dog", 15 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json b/data/json/itemgroups/Monsters_Animals_Lairs/monster_drops_lairs.json
@@ -291,6 +291,16 @@
     "subtype": "distribution",
     "entries": [ { "item": "kevlar_harness", "prob": 1 } ]
   },
+  {
+    "type": "item_group",
+    "id": "dog_clothes",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "rubber_harness_dog", "prob": 50 },
+      { "item": "leather_harness_dog", "prob": 25 },
+      { "item": "kevlar_harness", "prob": 1 }
+    ]
+  },
   {
     "type": "item_group",
     "id": "hive",

diff --git a/data/json/itemgroups/activities_hobbies.json b/data/json/itemgroups/activities_hobbies.json
@@ -360,6 +360,7 @@
       [ "folding_bicycle", 1 ],
       [ "coat_rain", 10 ],
       [ "hood_rain", 5 ],
+      [ "rubber_harness_dog", 3 ],
       [ "jacket_windbreaker", 5 ],
       [ "umbrella", 12 ],
       [ "teleumbrella", 5 ],

diff --git a/data/json/itemgroups/collections_domestic.json b/data/json/itemgroups/collections_domestic.json
@@ -456,6 +456,7 @@
       { "item": "atomic_lamp", "prob": 1 },
       { "item": "dog_whistle", "prob": 5 },
       { "item": "pet_carrier", "prob": 2 },
+      { "item": "rubber_harness_dog", "prob": 2 },
       { "item": "dogfood", "prob": 5, "container-item": "can_medium" },
       { "item": "catfood", "prob": 5, "container-item": "can_food" },
       { "item": "dogfood_dry", "prob": 2, "charges": 8, "container-item": "bag_plastic" },
@@ -1044,6 +1045,7 @@
       { "item": "magnifying_glass", "prob": 2 },
       { "item": "holy_symbol", "prob": 5 },
       { "item": "pet_carrier", "prob": 3 },
+      { "item": "rubber_harness_dog", "prob": 3 },
       { "item": "eclipse_glasses", "prob": 1 },
       { "item": "bodypillow", "prob": 2 },
       { "item": "teddy_bear", "prob": 2 },

diff --git a/data/json/mapgen/prison_1.json b/data/json/mapgen/prison_1.json
@@ -673,7 +673,8 @@
         "Q": { "item": "prison_canine_food", "chance": 70, "repeat": [ 3, 5 ] },
         "R": [
           { "item": "animalshelter_softdrug", "chance": 70, "repeat": [ 1, 2 ] },
-          { "item": "animalshelter_hardrug", "chance": 30, "repeat": [ 1, 2 ] }
+          { "item": "animalshelter_hardrug", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "dog_cop", "chance": 30 }
         ],
         "U": { "item": "prison_canine_bowl", "chance": 70 },
         "Y": { "item": "clothing_outdoor_torso", "chance": 60 },
@@ -1151,7 +1152,8 @@
         "Q": { "item": "prison_canine_food", "chance": 70, "repeat": [ 3, 5 ] },
         "R": [
           { "item": "animalshelter_softdrug", "chance": 70, "repeat": [ 1, 2 ] },
-          { "item": "animalshelter_hardrug", "chance": 30, "repeat": [ 1, 2 ] }
+          { "item": "animalshelter_hardrug", "chance": 30, "repeat": [ 1, 2 ] },
+          { "item": "dog_cop", "chance": 30 }
         ],
         "u": { "item": "mil_base_mess_hall", "chance": 30 },
         "U": { "item": "prison_canine_bowl", "chance": 70 },

diff --git a/data/json/monsterdrops/zombie.json b/data/json/monsterdrops/zombie.json
@@ -117,5 +117,11 @@
       { "group": "wallets", "damage": [ 1, 4 ], "prob": 10 },
       { "item": "fighter_sting", "prob": 60 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "mon_dog_death_drops",
+    "subtype": "collection",
+    "entries": [ { "group": "dog_clothes", "damage": [ 1, 4 ], "prob": 20 } ]
   }
 ]
diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json
@@ -879,6 +879,7 @@
     "dodge": 3,
     "vision_night": 5,
     "zombify_into": "mon_zombie_dog",
+    "death_drops": "mon_dog_death_drops",
     "path_settings": { "max_dist": 10 },
     "reproduction": { "baby_monster": "mon_dog_pup", "baby_count": 4, "baby_timer": 270 },
     "//": "1-4 puppies & 270 days per-litter for size small canines",

diff --git a/data/json/monsters/zanimal_upgrade.json b/data/json/monsters/zanimal_upgrade.json
@@ -30,6 +30,7 @@
     "vision_night": 3,
     "harvest": "mr_bones",
     "special_attacks": [ { "type": "bite", "attack_upper": false, "cooldown": 5 } ],
+    "death_drops": "mon_dog_death_drops",
     "upgrades": { "half_life": 15, "into": "mon_dog_skeleton_brute" },
     "flags": [ "SEES", "HEARS", "NO_BREATHE", "HARDTOSHOOT", "REVIVES", "POISON", "FILTHY" ]
   },
@@ -100,6 +101,7 @@
     "armor_acid": 1,
     "armor_elec": 2,
     "bleed_rate": 0,
+    "death_drops": "mon_dog_death_drops",
     "special_attacks": [
       { "id": "smash", "attack_upper": false, "throw_strength": 66, "cooldown": 45 },
       {

diff --git a/data/json/monsters/zed-animal.json b/data/json/monsters/zed-animal.json
@@ -67,6 +67,7 @@
     "vision_night": 4,
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "attack_upper": false, "cooldown": 5 } ],
+    "death_drops": "mon_dog_death_drops",
     "upgrades": { "half_life": 28, "into_group": "GROUP_ZOMBIE_DOG_UPGRADE" },
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "FILTHY" ]
   },
@@ -132,6 +133,7 @@
     "vision_night": 4,
     "harvest": "zombie",
     "special_attacks": [ { "type": "bite", "attack_upper": false, "cooldown": 2, "accuracy": 4, "infection_chance": 8 } ],
+    "death_drops": "mon_dog_death_drops",
     "upgrades": { "half_life": 28, "into": "mon_dog_zombie_brute" },
     "flags": [ "SEES", "HEARS", "SMELLS", "STUMBLES", "WARM", "BASHES", "POISON", "NO_BREATHE", "REVIVES", "PUSH_MON", "FILTHY" ]
   },

diff --git a/data/json/professions.json b/data/json/professions.json
@@ -223,6 +223,18 @@
     "id": "bandolier_ww_gunslinger",
     "entries": [ { "item": "45colt_jhp", "charges": 18 } ]
   },
+  {
+    "type": "item_group",
+    "subtype": "collection",
+    "id": "dog_lover_bag",
+    "entries": [
+      { "item": "rubber_harness_dog" },
+      { "item": "rubber_harness_dog" },
+      { "item": "dog_whistle" },
+      { "item": "dogfood_dry" },
+      { "item": "dogfood_dry" }
+    ]
+  },
   {
     "type": "item_group",
     "subtype": "collection",
@@ -1526,6 +1538,25 @@
       "female": [ "bra", "boy_shorts" ]
     }
   },
+  {
+    "type": "profession",
+    "id": "dog_lover",
+    "name": "Dog Lover",
+    "description": "You spent your days running around with your faithful dogs by your side.  When the world ended, you grabbed your companions along with some of their things to protect them.  The zombies could be nearby, but at least your canine friends shouldn't have to worry about the rain.",
+    "points": 3,
+    "skills": [ { "level": 2, "name": "swimming" } ],
+    "traits": [ "ANIMALEMPATH" ],
+    "pets": [ { "name": "mon_dog", "amount": 2 } ],
+    "items": {
+      "both": {
+        "items": [ "jeans", "longshirt", "socks", "sneakers", "water_clean", "wristwatch", "petpack", "pet_carrier" ],
+        "entries": [ { "group": "charged_smart_phone" }, { "item": "mbag", "contents-group": "dog_lover_bag" } ]
+      },
+      "male": [ "boxer_shorts" ],
+      "female": [ "bra", "panties" ]
+    },
+    "missions": [ "MISSION_DOG_LOVER" ]
+  },
   {
     "type": "profession",
     "id": "crazy_cat_lady",

diff --git a/data/json/starting_missions.json b/data/json/starting_missions.json
@@ -115,6 +115,28 @@
     },
     "origins": [ "ORIGIN_GAME_START" ]
   },
+  {
+    "id": "MISSION_DOG_LOVER",
+    "type": "mission_definition",
+    "name": { "str": "Protect your canine friends" },
+    "description": "You have saved your dogs from the fall of the world, but they could still suffer from danger everywhere.  Police dogs used some kevlar harnesses for protection…  Maybe your friends could use some too?",
+    "goal": "MGOAL_FIND_ITEM",
+    "difficulty": 2,
+    "item": "kevlar_harness",
+    "origins": [ "ORIGIN_GAME_START" ],
+    "value": 0,
+    "end": {
+      "effect": [
+        {
+          "u_add_morale": "morale_feeling_good",
+          "bonus": 10,
+          "max_bonus": 50,
+          "duration": "60 minutes",
+          "decay_start": "60 minutes"
+        }
+      ]
+    }
+  },
   {
     "id": "MISSION_HUNTER",
     "type": "mission_definition",