auto update

linonetwo · Sep 28, 2024 · 8736af1 · 8736af1
1 parent 85b6fb8
commit 8736af1
Show file tree

Hide file tree

Showing 13 changed files with 67 additions and 46 deletions.
diff --git a/Kenan-Structured-Modpack/MST_Extra/furniture_and_terrain/construction.json b/Kenan-Structured-Modpack/MST_Extra/furniture_and_terrain/construction.json
@@ -182,9 +182,9 @@
     "group": "build_wood_windbreak",
     "category": "FURN",
     "required_skills": [ [ "fabrication", 0 ] ],
-    "time": "50 m",
+    "time": "10 m",
     "qualities": [ [ { "id": "HAMMER", "level": 1 } ] ],
-    "components": [ [ [ "stick", 8 ], [ "2x4", 8 ], [ "stick_long", 4 ], [ "log", 2 ] ], [ [ "pointy_stick", 4 ] ] ],
+    "components": [ [ [ "stick", 8 ], [ "2x4", 8 ], [ "stick_long", 4 ] ], [ [ "pointy_stick", 2 ] ] ],
     "pre_note": "Can be deconstructed without tools.",
     "pre_special": "check_empty",
     "post_terrain": "f_barricade_windbreak"

diff --git a/Kenan-Structured-Modpack/MST_Extra/furniture_and_terrain/furniture.json b/Kenan-Structured-Modpack/MST_Extra/furniture_and_terrain/furniture.json
@@ -75,7 +75,7 @@
     "symbol": "#",
     "bgcolor": "brown",
     "looks_like": "t_wall_log_half",
-    "description": "A waist-high barricade made of stout saplings, held in place by poles hammered into the ground.  Primarily used to keep the wind out, but also works to fence in  a campsite.",
+    "description": "A waist-high barricade made of stout saplings, held in place by poles hammered into the ground.  Primarily used to keep the wind out, but also works to fence in a campsite.",
     "move_cost_mod": -1,
     "coverage": 60,
     "required_str": -1,
@@ -92,7 +92,7 @@
       "BLOCK_WIND"
     ],
     "examine_action": "chainfence",
-    "deconstruct": { "items": [ { "item": "stick", "count": 8 }, { "item": "pointy_stick", "count": 4 } ] },
+    "deconstruct": { "items": [ { "item": "stick", "count": 8 }, { "item": "pointy_stick", "count": 2 } ] },
     "bash": {
       "str_min": 6,
       "str_max": 36,
@@ -102,18 +102,18 @@
     }
   },
   {
-    "id": "t_tarptent_leather",
-    "type": "terrain",
+    "id": "f_tarptent_leather",
+    "type": "furniture",
     "name": "leather tarp lean-to",
     "description": "A makeshift shelter made from a lather tarp and stakes driven into the ground.",
     "symbol": ";",
-    "looks_like": "t_tarptent",
+    "looks_like": "f_skin_door",
     "color": [ "brown" ],
-    "move_cost": 2,
+    "move_cost_mod": 0,
+    "required_str": -1,
     "bash": {
       "str_min": 6,
       "str_max": 12,
-      "ter_set": "t_dirt",
       "sound": "crash!",
       "sound_fail": "whack!",
       "items": [
@@ -123,10 +123,9 @@
       ]
     },
     "deconstruct": {
-      "ter_set": "t_dirt",
-      "items": [ { "item": "pointy_stick", "count": 4 }, { "item": "withered", "count": 8 }, { "item": "leather_tarp", "count": 1 } ]
+      "items": [ { "item": "pointy_stick", "count": 4 }, { "item": "cordage_6", "count": 6 }, { "item": "leather_tarp", "count": 1 } ]
     },
-    "flags": [ "TRANSPARENT", "FLAMMABLE", "THIN_OBSTACLE", "INDOORS", "MOUNTABLE", "EASY_DECONSTRUCT" ]
+    "flags": [ "TRANSPARENT", "FLAMMABLE_HARD", "BLOCK_WIND", "INDOORS", "NOCOLLIDE", "SUN_ROOF_ABOVE", "EASY_DECONSTRUCT" ]
   },
   {
     "type": "furniture",

diff --git a/Kenan-Structured-Modpack/MST_Extra/modinfo.json b/Kenan-Structured-Modpack/MST_Extra/modinfo.json
@@ -5,7 +5,7 @@
     "name": "MST Extra",
     "authors": [ "Chaosvolt" ],
     "description": "The sequel to CDDA's old More Survival Tools mod, adding additional useful innawoods content.",
-    "version": "DDA version, update 9/23/2024",
+    "version": "DDA version, update 9/27/2024",
     "category": "items",
     "dependencies": [ "dda" ]
   }

diff --git a/Kenan-Structured-Modpack/MST_Extra/obsolete.json b/Kenan-Structured-Modpack/MST_Extra/obsolete.json
@@ -329,5 +329,32 @@
     "type": "recipe",
     "result": "tea_willow",
     "obsolete": true
+  },
+  {
+    "id": "t_tarptent_leather",
+    "type": "terrain",
+    "name": "leather tarp lean-to",
+    "description": "A makeshift shelter made from a lather tarp and stakes driven into the ground.",
+    "symbol": ";",
+    "looks_like": "t_tarptent",
+    "color": [ "brown" ],
+    "move_cost": 2,
+    "bash": {
+      "str_min": 6,
+      "str_max": 12,
+      "ter_set": "t_dirt",
+      "sound": "crash!",
+      "sound_fail": "whack!",
+      "items": [
+        { "item": "stick", "count": [ 1, 2 ] },
+        { "item": "splinter", "count": [ 1, 4 ] },
+        { "item": "leather", "count": [ 4, 8 ] }
+      ]
+    },
+    "deconstruct": {
+      "ter_set": "t_dirt",
+      "items": [ { "item": "pointy_stick", "count": 4 }, { "item": "withered", "count": 8 }, { "item": "leather_tarp", "count": 1 } ]
+    },
+    "flags": [ "TRANSPARENT", "FLAMMABLE", "THIN_OBSTACLE", "INDOORS", "MOUNTABLE", "EASY_DECONSTRUCT" ]
   }
 ]
diff --git a/Kenan-Structured-Modpack/PM_World/Maps/Mapgen/Lobotomy/Lc_lab_1.json b/Kenan-Structured-Modpack/PM_World/Maps/Mapgen/Lobotomy/Lc_lab_1.json
@@ -96,9 +96,9 @@
       "fill_ter": "t_concrete",
       "rows": [
         "                        ",
-        "         NNN            ",
-        "         N_N            ",
-        "        NNTNN           ",
+        "       NNNNNNN          ",
+        "       N_..._N          ",
+        "       NNNTNNN          ",
         "       NN...NN          ",
         "       N..N..N          ",
         "       NN...NN          ",

diff --git a/Kenan-Structured-Modpack/PM_World/Npc/TheirChores/ZweiMission.json b/Kenan-Structured-Modpack/PM_World/Npc/TheirChores/ZweiMission.json
@@ -75,17 +75,11 @@
     "item": "lc_documents",
     "invisible_on_complete": false,
     "start": {
-      "assign_mission_target": {
-        "om_terrain": "lc_surface",
-        "om_special": "Lob_corp",
-        "reveal_radius": 0,
-        "random": false,
-        "search_range": 2400
-      },
+      "assign_mission_target": { "om_terrain": "lc_surface", "om_special": "Lob_corp", "reveal_radius": 0, "random": false, "search_range": 2400 },
       "update_mapgen": {
         "place_monster": [
-          { "group": "PECCA_GENERAL", "x": [ 3, 20 ], "y": [ 3, 20 ], "repeat": [ 12, 25 ] },
-          { "monster": "mon_luxuriae_zwei_mission", "x": [ 5, 10 ], "y": [ 5, 10 ], "name": "Zwei fixer?" }
+          { "group": "PECCA_GENERAL", "x": [ 5, 20 ], "y": [ 13, 21 ], "repeat": [ 12, 28 ] },
+          { "monster": "mon_luxuriae_zwei_mission", "x": 9, "y": 4, "name": "Zwei fixer?" }
         ]
       }
     },
@@ -100,7 +94,6 @@
       ]
     },
     "origins": [ "ORIGIN_SECONDARY" ],
-    "followup": "MISSION_NONE",
     "dialogue": {
       "describe": "It seems we have found those who may know what is happening in this world, we sent one of our people there but he still hasn't returned.",
       "offer": " The last we know is that he found interesting papers that could be useful to us. Your task is to get our fixer out of there or at least take the papers and bring them to me.",

diff --git a/Kenan-Structured-Modpack/PM_World/Roadmap.txt b/Kenan-Structured-Modpack/PM_World/Roadmap.txt
@@ -102,9 +102,9 @@ ________________________________________________________________________________
 ??. Релиз +
 _________________________________________________________________________________________________
 Второй цикл
-1. Э.Г.О (Телепол, Клюв +, Сода+, 9:2)
+1. Э.Г.О (Телепол, Клюв +, Сода+, 9:2+) +
 2. Диалоги и квесты для уже имеющихся фракций
-3. Способы получения Э.Г.О (бои, крафт, события)
+3. Способы получения Э.Г.О (бои, крафт, события) +
 4. Испытания Green Dawn
 5. Добавление киборгов и подземелья с ними
 6. Введение энкефалина в игру, его способов добычи и использования

diff --git a/Kenan-Structured-Modpack/PM_World/notes.txt b/Kenan-Structured-Modpack/PM_World/notes.txt
@@ -59,3 +59,6 @@
             2. Иметь сложных врагов на каждой стадии игры, но что бы их можно было избежать или победить с нужной подготовкой
             3. Сделать возможность достигать некоторых чекпоинтов при помощи решения испытаний не связаных с врагами
                 Но тут остается проблема в рандомности загадок ибо игроки прошедшие их могут достигать чекпоинтов быстрее обходя часть прогресса и контента
+
+x - длина
+y - высота
diff --git a/Kenan-Structured-Modpack/Tankmod_Revived/items.json b/Kenan-Structured-Modpack/Tankmod_Revived/items.json
@@ -621,7 +621,7 @@
     "skill": "launcher",
     "ammo": "25mm",
     "weight": "120 kg",
-    "volume": "10 L",
+    "volume": "15 L",
     "longest_side": "265 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -1,
@@ -655,7 +655,7 @@
     "skill": "rifle",
     "ammo": "25mm",
     "weight": "50 kg",
-    "volume": "8250 ml",
+    "volume": "6 L",
     "longest_side": "210 cm",
     "melee_damage": { "bash": 10 },
     "to_hit": -1,
@@ -690,7 +690,7 @@
     "skill": "launcher",
     "ammo": "25mm",
     "weight": "60 kg",
-    "volume": "5 L",
+    "volume": "7500 ml",
     "longest_side": "160 cm",
     "melee_damage": { "bash": 10 },
     "to_hit": -1,
@@ -718,7 +718,7 @@
     "skill": "launcher",
     "ammo": "120mm_usable",
     "weight": "3000 kg",
-    "volume": "8750 ml",
+    "volume": "175 L",
     "longest_side": "530 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -6,
@@ -746,7 +746,7 @@
     "skill": "launcher",
     "ammo": "120mm_usable",
     "weight": "3300 kg",
-    "volume": "10 L",
+    "volume": "200 L",
     "longest_side": "550 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -6,
@@ -773,7 +773,7 @@
     "skill": "launcher",
     "ammo": "120mm_usable",
     "weight": "1000 kg",
-    "volume": "4500 ml",
+    "volume": "87500 ml",
     "longest_side": "312 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -6,
@@ -803,7 +803,7 @@
     "skill": "launcher",
     "ammo": "105mm",
     "weight": "1500 kg",
-    "volume": "5750 ml",
+    "volume": "150 L",
     "longest_side": "546 cm",
     "melee_damage": { "bash": 10 },
     "to_hit": -6,
@@ -831,7 +831,7 @@
     "skill": "launcher",
     "ammo": "105mm",
     "weight": "750 kg",
-    "volume": "2900 ml",
+    "volume": "75 L",
     "longest_side": "330 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -6,
@@ -860,7 +860,7 @@
     "skill": "launcher",
     "ammo": "155mm",
     "weight": "4300 kg",
-    "volume": "10 L",
+    "volume": "200 L",
     "longest_side": "604 cm",
     "melee_damage": { "bash": 13 },
     "to_hit": -6,
@@ -887,7 +887,7 @@
     "skill": "launcher",
     "ammo": "155mm",
     "weight": "1500 kg",
-    "volume": "5 L",
+    "volume": "100 L",
     "longest_side": "370 cm",
     "melee_damage": { "bash": 12 },
     "to_hit": -6,

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Char_creation/c_classes_r.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Char_creation/c_classes_r.json
@@ -50,7 +50,7 @@
           { "item": "tank_top", "variant": "tank_top_camo" },
           { "item": "knife_rambo", "container-item": "scabbard" },
           {
-            "item": "light_battery_cell",
+            "item": "light_disposable_cell",
             "ammo-item": "battery",
             "charges": 300,
             "container-item": "wearable_light"

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Recipe/c_recipes.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Recipe/c_recipes.json
@@ -1059,10 +1059,7 @@
     "qualities": [ { "id": "SCREW_FINE", "level": 1 }, { "id": "GLARE", "level": 1 } ],
     "tools": [ [ [ "welder", 10 ], [ "welding_kit", 10 ], [ "welder_crude", 10 ], [ "soldering_iron", 10 ], [ "toolset", 10 ] ] ],
     "components": [
-      [
-        [ "light_battery_cell", 6 ],
-        [ "light_minus_battery_cell", 12 ]
-      ],
+      [ [ "light_battery_cell", 6 ], [ "light_minus_battery_cell", 12 ] ],
       [ [ "amplifier", 2 ] ],
       [ [ "e_scrap", 1 ] ],
       [ [ "cable", 10 ] ],
@@ -1581,7 +1578,9 @@
     "time": "90 s",
     "batch_time_factors": [ 60, 5 ],
     "book_learn": [ [ "manual_rifle", 3 ], [ "manual_pistol", 3 ], [ "recipe_bullets", 3 ], [ "recipe_surv", 3 ] ],
+    "autolearn": true,
     "charges": 1,
+    "reversible": true,
     "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 15 ] ],
     "qualities": [ { "id": "CUT", "level": 1 } ],
     "components": [ [ [ "gunpowder", 5 ], [ "chem_black_powder", 8 ] ], [ [ "paper", 1 ] ] ]

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_tools.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Surv_help/c_tools.json
@@ -396,7 +396,7 @@
     "volume": "1250 ml",
     "melee_damage": { "bash": 8, "stab": 6 },
     "to_hit": -1,
-    "charges_per_use": 10,
+    "charges_per_use": 100,
     "ammo": [ "battery" ],
     "category": "weapons",
     "use_action": "TAZER",
@@ -429,7 +429,7 @@
     "melee_damage": { "bash": 16, "stab": 12 },
     "to_hit": -1,
     "//": "Tazer use action can't really be tweaked to justify power consumption changing, since no dual-tazing.  Plus, battery amounts mean keeping it an even 100 is sanest.",
-    "charges_per_use": 10,
+    "charges_per_use": 100,
     "ammo": [ "battery" ],
     "category": "weapons",
     "use_action": "TAZER",

diff --git a/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ammo.json b/Kenan-Structured-Modpack/nocts_cata_mod_DDA/Weapons/c_ammo.json
@@ -10,7 +10,7 @@
     "price": "25 USD",
     "price_postapoc": "15 USD",
     "damage": { "damage_type": "bullet", "armor_penetration": 12 },
-    "proportional": { "range": 4.0, "dispersion": 0.89, "recoil": 2.0 },
+    "proportional": { "range": 2.0, "dispersion": 0.89, "recoil": 2.0 },
     "extend": { "effects": [ "RECYCLED" ] }
   },
   {