auto update

linonetwo · Nov 8, 2024 · b4371b1 · b4371b1
1 parent bd2aaeb
commit b4371b1
Show file tree

Hide file tree

Showing 12 changed files with 75 additions and 72 deletions.
diff --git a/Kenan-Structured-Modpack/Tankmod_Revived/mapgen.json b/Kenan-Structured-Modpack/Tankmod_Revived/mapgen.json
@@ -318,7 +318,7 @@
         "H": "t_wall_glass",
         "e": "t_gates_mech_control",
         "|": "t_wall_b",
-        "W": "t_chainfence_h",
+        "W": "t_chainfence",
         "^": "t_chaingate_c",
         "M": "t_metal_floor",
         "#": "t_grate",
@@ -591,7 +591,6 @@
       "monster": {
         ".": [
           { "monster": "mon_zombie_soldier", "chance": 1 },
-          { "monster": "mon_zombie_marine", "chance": 1 },
           { "monster": "mon_dispatch", "chance": 1 },
           { "monster": "mon_dispatch_military", "chance": 1 },
           { "monster": "mon_secubot", "chance": 5 }
@@ -636,7 +635,7 @@
         "*": "t_door_c",
         "+": "t_chaingate_l",
         ",": "t_floor",
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         "/": "t_concrete_wall",
         "0": "t_window",
         "6": "t_card_military",
@@ -646,7 +645,7 @@
         "M": "t_wall_metal",
         "C": "t_dirt",
         "S": "t_dirt",
-        "|": "t_chainfence_v"
+        "|": "t_chainfence"
       },
       "furniture": { "#": "f_table", "C": "f_crate_o", "S": "f_sandbag_half" },
       "place_loot": [

diff --git a/Kenan-Structured-Modpack/Tankmod_Revived/modinfo.json b/Kenan-Structured-Modpack/Tankmod_Revived/modinfo.json
@@ -6,7 +6,7 @@
     "authors": [ "Chaosvolt" ],
     "maintainers": [ "Chaosvolt" ],
     "description": "The intended successor of my older, obsoleted Tanks and Other Vehicles mod.",
-    "version": "DDA version, update 6/26/2024",
+    "version": "DDA version, update 11/6/2024",
     "category": "vehicles",
     "dependencies": [ "dda" ]
   }

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Char_creation/c_scenarios.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Char_creation/c_scenarios.json
@@ -54,7 +54,7 @@
   {
     "type": "scenario",
     "name": "Prepper Safehouse",
-    "description": "You knew something was coming, so you made connections with like-minded survivors beforehand to establish safe refuge.  You've made your plans, now it's time to put them into action.",
+    "description": "You knew something was coming, so you made connections with like-minded survivors beforehand to establish safe refuge.  You've made your plans, now that you've weathered the first few months it's time for the next steps.",
     "id": "prep_house",
     "points": 2,
     "start_name": "Safehouse",
@@ -83,7 +83,8 @@
     ],
     "traits": [ "MARTIAL_ARTS_SURV_COM" ],
     "forced_traits": [ "PROF_PREPPER_HOLDOUT" ],
-    "flags": [ "CITY_START", "LONE_START" ]
+    "flags": [ "CITY_START", "LONE_START" ],
+    "start_of_game": { "season": "autumn" }
   },
   {
     "type": "scenario",

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Monsters/c_monsters.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Monsters/c_monsters.json
@@ -219,7 +219,7 @@
   {
     "id": "mon_zombie_bio_dormant_unarmed",
     "type": "MONSTER",
-    "looks_like": "mon_zombie_marine",
+    "looks_like": "mon_zombie_bio_op",
     "name": { "str": "zombie augmented soldier" },
     "description": "An advanced, well-equipped member of the military that still succumbed to the cataclysm.  It staggers with an unsteady mechanical gait, as though hindered by its augmentations.",
     "default_faction": "super_soldat",
@@ -259,7 +259,7 @@
   {
     "id": "mon_zombie_bio_dormant_armed",
     "type": "MONSTER",
-    "looks_like": "mon_zombie_marine",
+    "looks_like": "mon_zombie_bio_op",
     "name": { "str": "zombie augmented soldier" },
     "description": "An advanced, well-equipped member of the military that still succumbed to the cataclysm.  It staggers under the weight of its gear, an unsteady mechanical march hinting at its augmentations.",
     "default_faction": "super_soldat",
@@ -300,7 +300,7 @@
     "id": "mon_zombie_bio_knife",
     "type": "MONSTER",
     "copy-from": "mon_zombie_bio_dormant_unarmed",
-    "looks_like": "mon_zombie_marine",
+    "looks_like": "mon_zombie_bio_op2",
     "name": { "str": "zombie augmented prowler" },
     "description": "An advanced, well-equipped member of the military that still succumbed to the cataclysm.  This one moves with purpose and clarity, knife in hand as though it still remembers how to use it.",
     "speed": 100,

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Npc/NC_GLADIATORS.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Npc/NC_GLADIATORS.json
@@ -8,12 +8,12 @@
       { "distribution": [ { "item": "boxer_shorts", "prob": 50 }, { "item": "loincloth", "prob": 50 } ] },
       { "distribution": [ { "item": "socks", "prob": 50 }, { "item": "footrags", "prob": 50 } ] },
       { "distribution": [ { "item": "tank_top", "prob": 50 }, { "item": "chestwrap", "prob": 50 } ] },
-      { "group": "NC_GLADIATOR_LIGHT_torso", "prob": 50 },
-      { "group": "NC_GLADIATOR_LIGHT_arms" },
-      { "group": "NC_GLADIATOR_LIGHT_hands", "prob": 75 },
+      { "group": "NC_GLADIATOR_LIGHT_torso", "prob": 50, "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_LIGHT_arms", "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_LIGHT_hands", "prob": 75, "damage": [ 0, 2 ] },
       { "group": "clothing_outdoor_pants" },
-      { "group": "NC_GLADIATOR_LIGHT_legs", "prob": 50 },
-      { "group": "NC_GLADIATOR_LIGHT_feet", "prob": 50 }
+      { "group": "NC_GLADIATOR_LIGHT_legs", "prob": 50, "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_LIGHT_feet", "prob": 50, "damage": [ 0, 2 ] }
     ]
   },
   {
@@ -25,12 +25,12 @@
       { "item": "loincloth" },
       { "item": "footrags" },
       { "item": "chestwrap" },
-      { "group": "NC_GLADIATOR_HEAVY_head" },
-      { "group": "NC_GLADIATOR_HEAVY_torso", "prob": 50 },
-      { "group": "NC_GLADIATOR_HEAVY_arms" },
-      { "group": "NC_GLADIATOR_HEAVY_hands", "prob": 75 },
-      { "group": "NC_GLADIATOR_HEAVY_legs" },
-      { "group": "NC_GLADIATOR_HEAVY_feet" }
+      { "group": "NC_GLADIATOR_HEAVY_head", "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_HEAVY_torso", "prob": 50, "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_HEAVY_arms", "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_HEAVY_hands", "prob": 75, "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_HEAVY_legs", "damage": [ 0, 2 ] },
+      { "group": "NC_GLADIATOR_HEAVY_feet", "damage": [ 0, 2 ] }
     ]
   },
   {
@@ -124,41 +124,41 @@
     "type": "item_group",
     "//": "Focuses on spears, plus swords and unarmed weapons.",
     "items": [
-      [ "pitchfork", 30 ],
-      [ "spear_knife", 25 ],
-      [ "spear_forked", 10 ],
-      [ "spear_rebar", 10 ],
-      [ "spear_pipe", 10 ],
-      [ "spear_survivor", 5 ],
-      [ "machete", 30 ],
-      [ "makeshift_machete", 25 ],
-      [ "sword_crude", 20 ],
-      [ "glass_macuahuitl", 15 ],
-      [ "survivor_machete", 5 ],
-      [ "greatsword_makeshift", 5 ],
-      [ "unbio_sword_weapon", 1 ],
-      [ "knuckle_brass", 15 ],
-      [ "knuckle_nail", 10 ],
-      [ "knuckle_steel", 10 ],
-      [ "knuckle_katar", 5 ]
+      { "item": "pitchfork", "prob": 30, "damage": [ 0, 2 ] },
+      { "item": "spear_knife", "prob": 25, "damage": [ 0, 2 ] },
+      { "item": "spear_forked", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "spear_rebar", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "spear_pipe", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "spear_survivor", "prob": 5, "damage": [ 0, 2 ] },
+      { "item": "machete", "prob": 30, "damage": [ 0, 2 ] },
+      { "item": "makeshift_machete", "prob": 25, "damage": [ 0, 2 ] },
+      { "item": "sword_crude", "prob": 20, "damage": [ 0, 2 ] },
+      { "item": "glass_macuahuitl", "prob": 15, "damage": [ 0, 2 ] },
+      { "item": "survivor_machete", "prob": 5, "damage": [ 0, 2 ] },
+      { "item": "greatsword_makeshift", "prob": 5, "damage": [ 0, 2 ] },
+      { "item": "unbio_sword_weapon", "prob": 1, "damage": [ 0, 2 ] },
+      { "item": "knuckle_brass", "prob": 15, "damage": [ 0, 2 ] },
+      { "item": "knuckle_nail", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "knuckle_steel", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "knuckle_katar", "prob": 5, "damage": [ 0, 2 ] }
     ]
   },
   {
     "id": "NC_GLADIATOR_HEAVY_weapon",
     "type": "item_group",
     "//": "Focuses on swords with some unarmed weapons.",
     "items": [
-      [ "machete", 30 ],
-      [ "makeshift_machete", 25 ],
-      [ "sword_crude", 20 ],
-      [ "glass_macuahuitl", 15 ],
-      [ "survivor_machete", 5 ],
-      [ "greatsword_makeshift", 5 ],
-      [ "unbio_sword_weapon", 1 ],
-      [ "knuckle_brass", 15 ],
-      [ "knuckle_nail", 10 ],
-      [ "knuckle_steel", 10 ],
-      [ "knuckle_katar", 5 ]
+      { "item": "machete", "prob": 30, "damage": [ 0, 2 ] },
+      { "item": "makeshift_machete", "prob": 25, "damage": [ 0, 2 ] },
+      { "item": "sword_crude", "prob": 20, "damage": [ 0, 2 ] },
+      { "item": "glass_macuahuitl", "prob": 15, "damage": [ 0, 2 ] },
+      { "item": "survivor_machete", "prob": 5, "damage": [ 0, 2 ] },
+      { "item": "greatsword_makeshift", "prob": 5, "damage": [ 0, 2 ] },
+      { "item": "unbio_sword_weapon", "prob": 1, "damage": [ 0, 2 ] },
+      { "item": "knuckle_brass", "prob": 15, "damage": [ 0, 2 ] },
+      { "item": "knuckle_nail", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "knuckle_steel", "prob": 10, "damage": [ 0, 2 ] },
+      { "item": "knuckle_katar", "prob": 5, "damage": [ 0, 2 ] }
     ]
   }
 ]
diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_item_groups.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_item_groups.json
@@ -98,7 +98,10 @@
     "subtype": "collection",
     "entries": [
       {
-        "distribution": [ { "group": "NC_GLADIATOR_LIGHT_worn", "prob": 50 }, { "group": "NC_GLADIATOR_HEAVY_worn", "prob": 50 } ]
+        "distribution": [
+          { "group": "NC_GLADIATOR_LIGHT_worn", "prob": 50, "damage": [ 1, 4 ] },
+          { "group": "NC_GLADIATOR_HEAVY_worn", "prob": 50, "damage": [ 1, 4 ] }
+        ]
       },
       { "item": "corpse" }
     ]

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_item_groups_vanilla.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_item_groups_vanilla.json
@@ -537,11 +537,11 @@
     "extend": { "items": [ [ "greatsword_makeshift", 5 ] ] }
   },
   {
-    "id": "guns_pistol_common",
-    "copy-from": "guns_pistol_common",
+    "id": "guns_pistol_improvised",
+    "copy-from": "guns_pistol_improvised",
     "type": "item_group",
     "extend": {
-      "items": [ [ "unbio_laser_gun", 2 ], { "item": "surv_battery_pistol", "prob": 10, "charges-min": 0, "charges-max": 50 } ]
+      "items": [ [ "unbio_laser_gun", 5 ], { "item": "surv_battery_pistol", "prob": 25, "charges-min": 0, "charges-max": 50 } ]
     }
   },
   {

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Bio_Weapon_Lab.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Bio_Weapon_Lab.json
@@ -34,8 +34,8 @@
         " ": "t_null",
         ",": "t_grass",
         ".": "t_dirt",
-        "|": "t_chainfence_v",
-        "-": "t_chainfence_h",
+        "|": "t_chainfence",
+        "-": "t_chainfence",
         "&": "t_chainfence_posts"
       },
       "place_loot": [
@@ -93,8 +93,8 @@
         ",.,,,,,,,.,,,,.,,,,,,,.,"
       ],
       "terrain": {
-        "|": "t_chainfence_v",
-        "-": "t_chainfence_h",
+        "|": "t_chainfence",
+        "-": "t_chainfence",
         "&": "t_chainfence_posts",
         ",": "t_grass",
         ".": "t_dirt",
@@ -171,7 +171,7 @@
         "C": "t_card_reader_broken",
         "D": [ "t_door_o", "t_door_b", "t_door_frame" ],
         "E": "t_elevator_control_off",
-        "F": "t_chainfence_v",
+        "F": "t_chainfence",
         "L": "t_metal_floor",
         "S": "t_station_disc",
         "T": "t_metal_floor",

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Mapgen_Variants.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Mapgen_Variants.json
@@ -37,15 +37,15 @@
         "+": "t_chaingate_l",
         "=": "t_chaingate_o",
         ",": "t_floor",
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         "/": "t_concrete_wall",
         "0": "t_window",
         "6": "t_card_military",
         ">": "t_stairs_down",
         "D": "t_door_metal_locked",
         "I": "t_ballistic_glass",
         "M": "t_wall_metal",
-        "|": "t_chainfence_v"
+        "|": "t_chainfence"
       },
       "furniture": { "#": "f_table" },
       "place_monster": [

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Unknown_Lab.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/Unknown_Lab.json
@@ -36,15 +36,15 @@
         "#": [ "t_shrub", "t_underbrush", "t_grass" ],
         "|": "t_concrete_wall",
         "+": "t_door_c",
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         ".": "t_dirt",
         "6": "t_floor",
         "7": [ "t_tree", "t_tree_dead", "t_tree_deadpine", "t_tree_hickory_dead", "t_tree_cottonwood", "t_tree_young", "t_grass" ],
         "I": "t_reinforced_glass",
         "_": "t_floor",
         "c": "t_floor",
         "d": "t_floor",
-        "f": "t_chainfence_v",
+        "f": "t_chainfence",
         "w": "t_floor",
         "x": "t_chaingate_l"
       },
@@ -106,12 +106,12 @@
       "terrain": {
         " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
         "#": [ "t_shrub", "t_underbrush", "t_grass" ],
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         ".": "t_dirt",
         "7": [ "t_tree", "t_tree_dead", "t_tree_deadpine", "t_tree_hickory_dead", "t_tree_cottonwood", "t_tree_young", "t_grass" ],
         "_": "t_pavement",
         "e": "t_pavement_y",
-        "f": "t_chainfence_v"
+        "f": "t_chainfence"
       },
       "place_loot": [ { "group": "map_extra_science", "x": 14, "y": 8, "chance": 75 } ],
       "place_fields": [
@@ -168,7 +168,7 @@
         "#": [ "t_shrub" ],
         "+": "t_door_c",
         "=": "t_door_o",
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         ".": "t_dirt",
         "7": [ "t_tree", "t_tree_dead", "t_tree_deadpine", "t_tree_hickory_dead", "t_tree_cottonwood", "t_tree_young", "t_grass" ],
         "B": "t_floor",
@@ -183,7 +183,7 @@
         "c": "t_floor",
         "d": "t_floor",
         "e": "t_floor",
-        "f": "t_chainfence_v",
+        "f": "t_chainfence",
         "o": "t_floor",
         "s": "t_floor",
         "t": "t_floor",
@@ -283,7 +283,7 @@
         " ": [ "t_grass", "t_grass", "t_grass", "t_dirt" ],
         "#": [ "t_shrub", "t_underbrush", "t_grass" ],
         "+": "t_door_metal_c",
-        "-": "t_chainfence_h",
+        "-": "t_chainfence",
         ".": "t_dirt",
         "6": "t_metal_floor",
         "1": "t_radio_controls",
@@ -293,7 +293,7 @@
         "C": "t_card_reader_broken",
         "_": "t_grass",
         "c": "t_metal_floor",
-        "f": "t_chainfence_v",
+        "f": "t_chainfence",
         "m": "t_metal_floor",
         "|": "t_wall_metal"
       },

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/makeshift_command_center.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Terrain/makeshift_command_center.json
@@ -30,7 +30,7 @@
         "|,,..,,,,,,,,,,,,,,,,,,|",
         "|,,.,,,,.,,,,,,,,,,,,,,|"
       ],
-      "terrain": { "|": "t_chainfence_v", "-": "t_chainfence_h", "&": "t_chaingate_c", ",": "t_grass", ".": "t_dirt" },
+      "terrain": { "|": "t_chainfence", "-": "t_chainfence", "&": "t_chaingate_c", ",": "t_grass", ".": "t_dirt" },
       "place_vehicles": [ { "vehicle": "command_center_rvs", "x": 11, "y": 12, "chance": 99, "fuel": 85, "status": -1, "rotation": 90 } ]
     }
   },
@@ -66,8 +66,8 @@
         ".,,,,,,,,,,,,,,,,,,,,,,,"
       ],
       "terrain": {
-        "|": "t_chainfence_v",
-        "-": "t_chainfence_h",
+        "|": "t_chainfence",
+        "-": "t_chainfence",
         "&": "t_chaingate_c",
         ",": "t_grass",
         ".": "t_dirt",

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ranged.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ranged.json
@@ -453,7 +453,7 @@
     "to_hit": -1,
     "ammo_effects": [ "LIGHTNING" ],
     "flags": [ "NON_FOULING", "NEEDS_NO_LUBE" ],
-    "ammo_to_fire": 6,
+    "ammo_to_fire": 50,
     "ammo": [ "battery" ],
     "pocket_data": [
       {