Merge branch 'Kenan2000:master' into master

wave · web-flow · commit b54cbf7829e5 · 2021-09-17T23:29:48.000+08:00
diff --git a/Kenan-Modpack/AdvancedGear_CDDA_Mod/items/vehicle/items.json b/Kenan-Modpack/AdvancedGear_CDDA_Mod/items/vehicle/items.json
@@ -312,6 +312,7 @@
     "color": "light_cyan",
     "ammo_type": "battery",
     "capacity": 1000000,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1000000 } } ],
     "flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "TRADER_AVOID" ]
   },
   {
diff --git a/Kenan-Modpack/Animatronics/bankrupt_pizzeria.json b/Kenan-Modpack/Animatronics/bankrupt_pizzeria.json
@@ -12,7 +12,7 @@
       [ "seasoning_salt", 13 ],
       [ "pepper", 5 ],
       [ "yeast", 10 ],
-      [ [ "sugar", 9 ], [ "artificial_sweetener", 9 ] ],
+      { "distribution": [ { "item": "sugar", "prob": 9 }, { "item": "artificial_sweetener", "prob": 9 } ] },
       [ "cornmeal", 8 ],
       [ "flour", 25 ],
       [ "cookbook", 3 ],
diff --git a/Kenan-Modpack/Arcana/items/tool_armor.json b/Kenan-Modpack/Arcana/items/tool_armor.json
@@ -526,6 +526,19 @@
     "color": "light_red",
     "environmental_protection": 1,
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "essence_dull_type": 120 } } ],
+    "relic_data": {
+      "passive_effects": [
+        {
+          "has": "WORN",
+          "condition": "ACTIVE",
+          "values": [
+            { "value": "ARMOR_HEAT", "multiply": -1.0 },
+            { "value": "ARMOR_STAB", "multiply": -1.0 },
+            { "value": "ARMOR_BULLET", "multiply": -1.0 }
+          ]
+        }
+      ]
+    },
     "ammo": "essence_dull_type",
     "use_action": [
       {
diff --git a/Kenan-Modpack/Arcana/mutations/mutations_dragonblood.json b/Kenan-Modpack/Arcana/mutations/mutations_dragonblood.json
@@ -354,7 +354,7 @@
       "attack_text_u": "You sink your teeth into %s",
       "attack_text_npc": "%1$s sinks their teeth into %2$s",
       "body_part": "mouth",
-      "chance": 20,
+      "chance": 30,
       "strength_damage": { "damage_type": "stab", "amount": 2 }
     }
   },
@@ -380,7 +380,7 @@
       "attack_text_u": "You savagely tear into %s with your jaws",
       "attack_text_npc": "%1$s savagely tear into %2$s with their jaws",
       "body_part": "mouth",
-      "chance": 15,
+      "chance": 30,
       "strength_damage": { "damage_type": "stab", "amount": 4 }
     }
   },
@@ -411,7 +411,7 @@
       {
         "attack_text_u": "You rake %s with your toe claws",
         "attack_text_npc": "%1$s rakes %2$s with their toe claws",
-        "chance": 30,
+        "chance": 40,
         "strength_damage": { "damage_type": "cut", "amount": 2 }
       }
     ]
@@ -442,7 +442,7 @@
       {
         "attack_text_u": "You rake %s with your toe claws",
         "attack_text_npc": "%1$s rakes %2$s with their toe claws",
-        "chance": 25,
+        "chance": 40,
         "strength_damage": { "damage_type": "cut", "amount": 3 }
       }
     ]
@@ -489,7 +489,7 @@
     "attacks": {
       "attack_text_u": "You lash %s with your tail",
       "attack_text_npc": "%1$s lashes %2$s with their tail",
-      "chance": 15,
+      "chance": 20,
       "strength_damage": [ { "damage_type": "stab", "amount": 2 }, { "damage_type": "bash", "amount": 1 } ]
     },
     "//": "Becoming less effective at balancing is intentional, spikes aren't as substantial as Spiked Tail but still impedes dodge bonus.",
@@ -514,7 +514,7 @@
     "attacks": {
       "attack_text_u": "You headbutt %s",
       "attack_text_npc": "%1$s headbutts %2$s",
-      "chance": 35,
+      "chance": 40,
       "strength_damage": { "damage_type": "bash", "amount": 2 }
     }
   },
diff --git a/Kenan-Modpack/Arcana/spells/spells_magic_signs.json b/Kenan-Modpack/Arcana/spells/spells_magic_signs.json
@@ -652,9 +652,10 @@
     "max_level": 10,
     "min_damage": 3,
     "max_damage": 1,
-    "range_increment": -0.2,
+    "damage_increment": -0.2,
     "min_range": 5,
     "max_range": 10,
+    "range_increment": 0.5,
     "min_aoe": 1,
     "max_aoe": 5,
     "aoe_increment": 0.4,
diff --git a/Kenan-Modpack/Arcana/techniques.json b/Kenan-Modpack/Arcana/techniques.json
@@ -7,9 +7,9 @@
     "skill_requirements": [ { "name": "melee", "level": 4 } ],
     "melee_allowed": true,
     "req_buffs": [ "buff_cleansingflame_onattack" ],
-    "crit_ok": true,
-    "weighting": 2,
-    "stunned_target": true,
+    "aoe": "wide",
+    "crit_tec": true,
+    "weighting": 3,
     "down_dur": 2,
     "mult_bonuses": [ { "stat": "movecost", "scale": 0.8 } ]
   },
@@ -23,7 +23,7 @@
     "req_buffs": [ "buff_cleansingflame_onattack" ],
     "crit_ok": true,
     "weighting": 3,
-    "stunned_target": true,
+    "stun_dur": 1,
     "disarms": true,
     "mult_bonuses": [ { "stat": "movecost", "scale": 0.8 } ]
   },
@@ -48,8 +48,8 @@
     "melee_allowed": true,
     "dodge_counter": true,
     "crit_ok": true,
-    "stun_dur": 1,
-    "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 } ]
+    "stun_dur": 2,
+    "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 }, { "stat": "arpen", "type": "bash", "scale": 5 } ]
   },
   {
     "type": "technique",
@@ -61,8 +61,8 @@
     "melee_allowed": true,
     "block_counter": true,
     "crit_ok": true,
-    "stun_dur": 1,
-    "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 } ]
+    "stun_dur": 2,
+    "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 }, { "stat": "arpen", "type": "cut", "scale": 5 } ]
   },
   {
     "type": "technique",
@@ -73,8 +73,8 @@
     "unarmed_allowed": true,
     "dodge_counter": true,
     "crit_ok": true,
-    "stun_dur": 1,
-    "down_dur": 1,
+    "stun_dur": 2,
+    "down_dur": 2,
     "mult_bonuses": [ { "stat": "movecost", "scale": 0.0 } ]
   },
   {
diff --git a/Kenan-Modpack/BL9-100%_monster_resilience_version/Items/item_groups.json b/Kenan-Modpack/BL9-100%_monster_resilience_version/Items/item_groups.json
@@ -600,8 +600,8 @@
       [ "esbit_stove", 10 ],
       [ "bottle_folding", 10 ],
       [ "mess_tin", 10 ],
-      [ "survival_kit", 30 ],
-      [ "premium_survival_kit", 3 ],
+      { "group": "full_survival_kit", "prob": 30 },
+      { "group": "premium_contents", "prob": 3 },
       { "group": "BL9_whereabouts_journal", "prob": 10 }
     ]
   },
diff --git a/Kenan-Modpack/BL9-140%_monster_resilience_version/Items/item_groups.json b/Kenan-Modpack/BL9-140%_monster_resilience_version/Items/item_groups.json
@@ -600,8 +600,8 @@
       [ "esbit_stove", 10 ],
       [ "bottle_folding", 10 ],
       [ "mess_tin", 10 ],
-      [ "survival_kit", 30 ],
-      [ "premium_survival_kit", 3 ],
+      { "group": "full_survival_kit", "prob": 30 },
+      { "group": "premium_contents", "prob": 3 },
       { "group": "BL9_whereabouts_journal", "prob": 10 }
     ]
   },
diff --git a/Kenan-Modpack/BL9-175%_monster_resilience_version/Items/item_groups.json b/Kenan-Modpack/BL9-175%_monster_resilience_version/Items/item_groups.json
@@ -600,8 +600,8 @@
       [ "esbit_stove", 10 ],
       [ "bottle_folding", 10 ],
       [ "mess_tin", 10 ],
-      [ "survival_kit", 30 ],
-      [ "premium_survival_kit", 3 ],
+      { "group": "full_survival_kit", "prob": 30 },
+      { "group": "premium_contents", "prob": 3 },
       { "group": "BL9_whereabouts_journal", "prob": 10 }
     ]
   },
diff --git a/Kenan-Modpack/Dino_Mad_Science/harvest.json b/Kenan-Modpack/Dino_Mad_Science/harvest.json
@@ -219,8 +219,7 @@
       { "drop": "meat_tainted", "type": "flesh", "mass_ratio": 0.25 },
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
-      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 }
+      { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 }
     ]
   },
   {
@@ -234,7 +233,6 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 },
       { "drop": "feather", "type": "skin", "mass_ratio": 0.0001 }
     ]
   },
@@ -249,7 +247,6 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 },
       {
         "drop": "bio_power_storage_mkII",
         "type": "bionic",
@@ -275,7 +272,6 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 },
       {
         "drop": "bio_power_storage_mkII",
         "type": "bionic",
@@ -302,7 +298,6 @@
       { "drop": "fat_tainted", "type": "flesh", "mass_ratio": 0.08 },
       { "drop": "bone_tainted", "type": "bone", "mass_ratio": 0.1 },
       { "drop": "raw_tainted_leather", "type": "skin", "mass_ratio": 0.02 },
-      { "drop": "pheromone", "type": "bionic", "max": 1 },
       {
         "drop": "bio_power_storage_mkII",
         "type": "bionic",
diff --git a/Kenan-Modpack/Make_Bows_Great_Again/Items/Archery_override.json b/Kenan-Modpack/Make_Bows_Great_Again/Items/Archery_override.json
@@ -253,9 +253,41 @@
   },
   {
     "id": "hybridbow",
-    "copy-from": "hybridbow",
+    "looks_like": "longbow",
     "type": "GUN",
+    "symbol": "(",
+    "color": "yellow",
     "name": { "str": "hybrid longbow" },
+    "description": "A modernized, six-foot longbow that curves away from the archer at the tips for increased power.  It can be used effectively by those of somewhat above-average strength.  Designed for archers that appreciate the smoothness of a traditional longbow, but desire the superior power of a modern recurve.",
+    "price": "380 USD",
+    "material": [ "steel", "plastic", "wood" ],
+    "//": "60in Fiberglass bow at 28in draw with 29in, 52J, 80 lbs draw, 0.6 slugs. bullshit stats, but this is a nonsense bow.",
+    "flags": [
+      "FIRE_TWOHAND",
+      "STR_DRAW",
+      "RELOAD_AND_SHOOT",
+      "PRIMITIVE_RANGED_WEAPON",
+      "BELTED",
+      "WATER_FRIENDLY",
+      "WATERPROOF_GUN",
+      "NEVER_JAMS"
+    ],
+    "ammo_effects": [ "NEVER_MISFIRES" ],
+    "skill": "archery",
+    "ammo": [ "arrow" ],
+    "weight": "600 g",
+    "volume": "3500 ml",
+    "price_postapoc": "50 USD",
+    "bashing": 12,
+    "armor_data": { "material_thickness": 1, "armor": [ { "covers": [ "torso" ], "coverage": 5, "encumbrance": 20 } ] },
+    "reload_noise_volume": 3,
+    "loudness": 8,
+    "range": 14,
+    "dispersion": 850,
+    "durability": 6,
+    "clip_size": 1,
+    "valid_mod_locations": [ [ "underbarrel", 1 ], [ "sights", 1 ], [ "accessories", 2 ], [ "stabilizer", 1 ], [ "dampening", 1 ] ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "arrow": 1 } } ],
     "min_strength": 9,
     "ranged_damage": { "damage_type": "stab", "amount": 20 }
   },
diff --git a/Kenan-Modpack/Pneumatic_fun/Items/Weapons/Pneumatic.json b/Kenan-Modpack/Pneumatic_fun/Items/Weapons/Pneumatic.json
@@ -117,5 +117,32 @@
       [ "rail mount", 1 ],
       [ "underbarrel mount", 1 ]
     ]
+  },
+  {
+    "id": "mininuke_launcher",
+    "looks_like": "m79",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "symbol": "(",
+    "color": "dark_gray",
+    "name": { "str": "mininuke launcher" },
+    "description": "A powerful handheld launcher handcrafted from scrap.  Made to launch modified handheld nuclear weapons, it is an exceedingly powerful weapon.",
+    "price": "7500 USD",
+    "price_postapoc": "7 USD",
+    "material": [ "aluminum", "wood" ],
+    "flags": [ "STR_RELOAD", "NEVER_JAMS" ],
+    "skill": "launcher",
+    "ammo": [ "mininuke_mod" ],
+    "weight": "11260 g",
+    "volume": "2750 ml",
+    "bashing": 12,
+    "to_hit": -1,
+    "range": 40,
+    "dispersion": 600,
+    "durability": 7,
+    "clip_size": 1,
+    "reload": 800,
+    "valid_mod_locations": [ [ "sling", 1 ], [ "grip mount", 1 ], [ "rail mount", 1 ], [ "sights mount", 1 ], [ "underbarrel mount", 1 ] ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "ammo_restriction": { "mininuke_mod": 1 } } ]
   }
 ]
diff --git a/Kenan-Modpack/Valkyria_Mod_jm/maps/battlefield_chunks.json b/Kenan-Modpack/Valkyria_Mod_jm/maps/battlefield_chunks.json
@@ -520,7 +520,7 @@
         "e  # BBB",
         "...  #. ",
         "    T . ",
-        "   ....  ",
+        "   .... ",
         "    ..  ",
         "t  e    ",
         "        "
@@ -551,7 +551,7 @@
         "d  # BBB",
         "...  #. ",
         "    BB. ",
-        "   BaaB  ",
+        "   BaaB ",
         "    BB  ",
         "D       ",
         "      ee"
diff --git a/Kenan-Modpack/Valkyria_Mod_jm/val_professions.json b/Kenan-Modpack/Valkyria_Mod_jm/val_professions.json
@@ -170,8 +170,7 @@
           "gallian_pack",
           "galmilboots",
           "beret",
-          "binoculars",
-          "survival_kit"
+          "binoculars"
         ],
         "entries": [
           { "item": "knife_combat", "container-item": "sheath" },
@@ -180,7 +179,8 @@
             "item": "gsr1",
             "ammo-item": "gal792_b",
             "charges": 5
-          }
+          },
+          { "group": "full_survival_kit" }
         ]
       },
       "male": [ "boxer_shorts", "gal_pants_army", "galarmyjacket", "socks" ],
@@ -431,8 +431,7 @@
           "imp_helmet",
           "socks",
           "binoculars",
-          "val_idticketcard",
-          "survival_kit"
+          "val_idticketcard"
         ],
         "entries": [
           { "item": "knife_combat", "container-item": "sheath" },
@@ -441,7 +440,8 @@
             "item": "zmsg1",
             "ammo-item": "imp762_b",
             "charges": 5
-          }
+          },
+          { "group": "full_survival_kit" }
         ]
       },
       "male": [ "boxer_shorts" ],
diff --git a/Kenan-Modpack/Wandering_Masters/npc/Teachers/drunken_master.json b/Kenan-Modpack/Wandering_Masters/npc/Teachers/drunken_master.json
@@ -385,14 +385,13 @@
     "type": "mission_definition",
     "has_generic_rewards": false,
     "name": { "str": "Ingredients for liquor" },
-    "description": "Gather <color_light_blue>20 ammonium nitrate</color>, <color_light_blue>0.3L gasoline</color>, <color_light_blue>15 hops</color>, <color_light_blue>5 <zombie> pheromone</color>.",
+    "description": "Gather <color_light_blue>20 ammonium nitrate</color>, <color_light_blue>0.3L gasoline</color>, <color_light_blue>15 hops</color>.",
     "goal": "MGOAL_CONDITION",
     "goal_condition": {
       "and": [
         { "u_has_items": { "item": "chem_ammonium_nitrate", "count": 20 } },
         { "u_has_items": { "item": "gasoline", "count": 300 } },
-        { "u_has_items": { "item": "hops", "count": 15 } },
-        { "u_has_items": { "item": "pheromone", "count": 5 } }
+        { "u_has_items": { "item": "hops", "count": 15 } }
       ]
     },
     "difficulty": 0,
@@ -402,7 +401,6 @@
         { "u_consume_item": "chem_ammonium_nitrate", "count": 20 },
         { "u_consume_item": "gasoline", "count": 300 },
         { "u_consume_item": "hops", "count": 15 },
-        { "u_consume_item": "pheromone", "count": 5 },
         { "npc_add_var": "master_mission", "type": "count", "context": "mission", "value": "2" },
         { "npc_add_var": "wait_time", "type": "general", "context": "brew", "time": true },
         { "npc_add_var": "wait", "type": "general", "context": "brew", "value": "yes" }
diff --git a/Kenan-Modpack/secronom_lore_expansion/Modification Files/Maps/SecronomBunker.json b/Kenan-Modpack/secronom_lore_expansion/Modification Files/Maps/SecronomBunker.json
@@ -195,7 +195,6 @@
         "                        ",
         "                        ",
         "                        ",
-        "                        ",
         "         cccccc         ",
         "         aaaaaa         ",
         "         aaaaaa         ",

Original file line number	Diff line number	Diff line change
`@@ -312,6 +312,7 @@`
`312`	`312`	`"color": "light_cyan",`
`313`	`313`	`"ammo_type": "battery",`
`314`	`314`	`"capacity": 1000000,`
	`315`	`+ "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "battery": 1000000 } } ],`
`315`	`316`	`"flags": [ "NO_SALVAGE", "NO_UNLOAD", "NO_RELOAD", "RECHARGE", "UNBREAKABLE_MELEE", "NONCONDUCTIVE", "TRADER_AVOID" ]`
`316`	`317`	`},`
`317`	`318`	`{`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@`
`354`	`354`	`"attack_text_u": "You sink your teeth into %s",`
`355`	`355`	`"attack_text_npc": "%1$s sinks their teeth into %2$s",`
`356`	`356`	`"body_part": "mouth",`
`357`		`- "chance": 20,`
	`357`	`+ "chance": 30,`
`358`	`358`	`"strength_damage": { "damage_type": "stab", "amount": 2 }`
`359`	`359`	`}`
`360`	`360`	`},`
`@@ -380,7 +380,7 @@`
`380`	`380`	`"attack_text_u": "You savagely tear into %s with your jaws",`
`381`	`381`	`"attack_text_npc": "%1$s savagely tear into %2$s with their jaws",`
`382`	`382`	`"body_part": "mouth",`
`383`		`- "chance": 15,`
	`383`	`+ "chance": 30,`
`384`	`384`	`"strength_damage": { "damage_type": "stab", "amount": 4 }`
`385`	`385`	`}`
`386`	`386`	`},`
`@@ -411,7 +411,7 @@`
`411`	`411`	`{`
`412`	`412`	`"attack_text_u": "You rake %s with your toe claws",`
`413`	`413`	`"attack_text_npc": "%1$s rakes %2$s with their toe claws",`
`414`		`- "chance": 30,`
	`414`	`+ "chance": 40,`
`415`	`415`	`"strength_damage": { "damage_type": "cut", "amount": 2 }`
`416`	`416`	`}`
`417`	`417`	`]`
`@@ -442,7 +442,7 @@`
`442`	`442`	`{`
`443`	`443`	`"attack_text_u": "You rake %s with your toe claws",`
`444`	`444`	`"attack_text_npc": "%1$s rakes %2$s with their toe claws",`
`445`		`- "chance": 25,`
	`445`	`+ "chance": 40,`
`446`	`446`	`"strength_damage": { "damage_type": "cut", "amount": 3 }`
`447`	`447`	`}`
`448`	`448`	`]`
`@@ -489,7 +489,7 @@`
`489`	`489`	`"attacks": {`
`490`	`490`	`"attack_text_u": "You lash %s with your tail",`
`491`	`491`	`"attack_text_npc": "%1$s lashes %2$s with their tail",`
`492`		`- "chance": 15,`
	`492`	`+ "chance": 20,`
`493`	`493`	`"strength_damage": [ { "damage_type": "stab", "amount": 2 }, { "damage_type": "bash", "amount": 1 } ]`
`494`	`494`	`},`
`495`	`495`	`"//": "Becoming less effective at balancing is intentional, spikes aren't as substantial as Spiked Tail but still impedes dodge bonus.",`
`@@ -514,7 +514,7 @@`
`514`	`514`	`"attacks": {`
`515`	`515`	`"attack_text_u": "You headbutt %s",`
`516`	`516`	`"attack_text_npc": "%1$s headbutts %2$s",`
`517`		`- "chance": 35,`
	`517`	`+ "chance": 40,`
`518`	`518`	`"strength_damage": { "damage_type": "bash", "amount": 2 }`
`519`	`519`	`}`
`520`	`520`	`},`