Merge branch 'master' into master

GMC-Modding-Team · Oct 2, 2023 · 69b32f0 · 69b32f0
2 parents e99e595 + 509363c
commit 69b32f0
Show file tree

Hide file tree

Showing 100 changed files with 971 additions and 1,509 deletions.
diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_guns.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_guns.json
@@ -26,7 +26,7 @@
     "weight": "2000 g",
     "volume": "750 ml",
     "price": "900 USD",
-    "bashing": 15,
+    "melee_damage": { "bash": 15 },
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",

diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_itemgroups.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_itemgroups.json
@@ -3,16 +3,13 @@
     "id": "guns_pistol_obscure",
     "type": "item_group",
     "copy-from": "guns_pistol_obscure",
-    "extend": {
-    "items": [ { "item": "223_pistol", "prob": 175, "charges-min": 0, "charges-max": 5 } ] 
-    }
+    "extend": { "items": [ { "item": "223_pistol", "prob": 175, "charges-min": 0, "charges-max": 5 } ] }
   },
   {
     "id": "mags_pistol_rare",
     "type": "item_group",
     "copy-from": "mags_pistol_rare",
-    "extend": {
-    "items": [ [ "223_speedloader5", 10 ] ]
-    }
+    "extend": { "items": [ [ "223_speedloader5", 10 ] ] }
   }
 ]
+
diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_items.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_items.json
@@ -243,7 +243,7 @@
     "color": "light_cyan",
     "symbol": ",",
     "material": [ "steel", "plastic" ],
-    "bashing": 4,
+    "melee_damage": { "bash": 4 },
     "price": "600 USD",
     "copy-from": "headlight_atomic"
   },

diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_recipes.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_recipes.json
@@ -10,10 +10,16 @@
     "time": "1 h 10 m",
     "autolearn": true,
     "using": [ [ "sewing_standard", 135 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_polymerworking" }
+    ],
     "components": [
       [ [ "coat_rain", 1 ] ],
       [ [ "duster", 1 ], [ "jacket_army", 1 ] ],
-      [ [ "modularvest", 1 ] ],
+      [ [ "ballistic_vest_esapi", 1 ] ],
       [ [ "rag", 19 ] ],
       [
         [ "tacvest", 1 ],
@@ -56,10 +62,16 @@
     "time": "59 m 30 s",
     "autolearn": true,
     "using": [ [ "sewing_standard", 115 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_polymerworking" }
+    ],
     "components": [
       [ [ "coat_rain", 1 ] ],
       [ [ "duster", 1 ], [ "jacket_army", 1 ], [ "sleeveless_duster", 1 ] ],
-      [ [ "modularvest", 1 ] ],
+      [ [ "ballistic_vest_esapi", 1 ] ],
       [ [ "rag", 14 ] ],
       [
         [ "tacvest", 1 ],
@@ -86,10 +98,16 @@
     "time": "1 h 10 m",
     "autolearn": true,
     "using": [ [ "sewing_standard", 100 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_polymerworking" }
+    ],
     "components": [
       [ [ "coat_rain", 1 ] ],
       [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ] ],
-      [ [ "modularvest", 1 ] ],
+      [ [ "ballistic_vest_esapi", 1 ] ],
       [ [ "rag", 14 ] ],
       [
         [ "tacvest", 1 ],
@@ -132,10 +150,16 @@
     "time": "59 m 30 s",
     "autolearn": true,
     "using": [ [ "sewing_standard", 85 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_polymerworking" }
+    ],
     "components": [
       [ [ "coat_rain", 1 ] ],
       [ [ "trenchcoat", 1 ], [ "jacket_army", 1 ], [ "sleeveless_trenchcoat", 1 ] ],
-      [ [ "modularvest", 1 ] ],
+      [ [ "ballistic_vest_esapi", 1 ] ],
       [ [ "rag", 11 ] ],
       [
         [ "tacvest", 1 ],
@@ -162,6 +186,12 @@
     "time": "1 h",
     "autolearn": true,
     "using": [ [ "sewing_standard", 50 ] ],
+    "proficiencies": [
+      { "proficiency": "prof_closures" },
+      { "proficiency": "prof_closures_waterproofing" },
+      { "proficiency": "prof_leatherworking_basic" },
+      { "proficiency": "prof_polymerworking" }
+    ],
     "tools": [ [ [ "welder", 20 ], [ "welder_crude", 30 ], [ "soldering_iron", 30 ], [ "toolset", 30 ] ] ],
     "components": [
       [ [ "rag", 6 ] ],
@@ -202,7 +232,8 @@
     "skills_required": [ "electronics", 3 ],
     "difficulty": 4,
     "time": "12 m",
-    "autolearn": true,
+    "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 } ],
     "components": [
       [ [ "plastic_chunk", 3 ], [ "scrap", 4 ] ],
       [ [ "cable", 10 ] ],
@@ -223,6 +254,7 @@
     "reversible": true,
     "decomp_learn": 1,
     "book_learn": [ [ "manual_electronics", 1 ], [ "mag_electronics", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking", "time_multiplier": 1.5 } ],
     "time": "14 m",
     "components": [
       [ [ "plastic_chunk", 4 ], [ "scrap", 5 ] ],
@@ -242,6 +274,7 @@
     "difficulty": 2,
     "time": "20 m",
     "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "using": [ [ "welding_standard", 2 ] ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "headlight_atomic", 1 ] ], [ [ "wire", 2 ] ], [ [ "superglue", 1 ] ] ]
@@ -256,6 +289,7 @@
     "time": "24 m",
     "book_learn": [ [ "textbook_fabrication", 3 ], [ "textbook_mechanics", 3 ], [ "welding_book", 5 ] ],
     "using": [ [ "welding_standard", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "qualities": [ { "id": "SAW_M", "level": 1 } ],
     "components": [ [ [ "wide_headlight_atomic", 1 ] ], [ [ "wire", 3 ] ], [ [ "superglue", 1 ] ] ]
   },
@@ -271,6 +305,7 @@
     "reversible": true,
     "autolearn": false,
     "book_learn": [ [ "textbook_mechanics", 6 ], [ "manual_mechanics", 6 ], [ "textbook_fabrication", 6 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "using": [ [ "welding_standard", 75 ] ],
     "qualities": [
       { "id": "HAMMER", "level": 2 },
@@ -301,6 +336,7 @@
     "time": "30 m",
     "autolearn": true,
     "using": [ [ "welding_standard", 50 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "byproducts": [
       [ "condensor_coil", 1 ],
       [ "evaporator_coil", 1 ],
@@ -330,6 +366,7 @@
     "autolearn": false,
     "book_learn": [ [ "textbook_mechanics", 6 ], [ "manual_mechanics", 6 ], [ "textbook_fabrication", 6 ] ],
     "using": [ [ "welding_standard", 75 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "qualities": [
       { "id": "HAMMER", "level": 2 },
       { "id": "SAW_M", "level": 1 },
@@ -359,6 +396,7 @@
     "time": "30 m",
     "autolearn": true,
     "using": [ [ "welding_standard", 50 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "time_multiplier": 1.5 } ],
     "byproducts": [
       [ "condensor_coil", 1 ],
       [ "evaporator_coil", 1 ],

diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_vehicle_parts.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_vehicle_parts.json
@@ -4,8 +4,6 @@
     "type": "vehicle_part",
     "name": { "str": "atomic headlight" },
     "item": "headlight_atomic",
-    "symbol": "*",
-    "broken_symbol": "*",
     "color": "light_blue",
     "broken_color": "green",
     "durability": 20,
@@ -14,12 +12,15 @@
     "damage_modifier": 10,
     "folded_volume": "500 ml",
     "breaks_into": [ { "item": "cable", "charges": [ 1, 4 ] }, { "item": "scrap", "count": [ 2, 4 ] } ],
+    "folding_time": "1 minute",
+    "unfolding_time": "1 minute",
     "requirements": {
       "install": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
       "removal": { "skills": [ [ "mechanics", 1 ] ], "time": "200 s", "using": [ [ "vehicle_screw", 1 ] ] },
       "repair": { "skills": [ [ "mechanics", 1 ] ], "time": "20 s", "using": [ [ "adhesive", 1 ] ] }
     },
-    "flags": [ "LEAK_DAM", "RADIOACTIVE", "CONE_LIGHT", "FOLDABLE" ]
+    "flags": [ "LEAK_DAM", "RADIOACTIVE", "CONE_LIGHT" ],
+    "variants": [ { "symbols": "*", "symbols_broken": "*" } ]
   },
   {
     "id": "wide_headlight_atomic",
@@ -29,7 +30,7 @@
     "copy-from": "headlight_atomic",
     "looks_like": "headlight_atomic",
     "description": "A bright light that illuminates a wide cone outside the vehicle when turned on, self-powered by an atomic decay reaction that never stops.  During installation, you can choose what direction to point the light, so multiple headlights can illuminate the sides or rear, as well as the front.",
-    "flags": [ "LEAK_DAM", "RADIOACTIVE", "WIDE_CONE_LIGHT", "FOLDABLE" ]
+    "flags": [ "LEAK_DAM", "RADIOACTIVE", "WIDE_CONE_LIGHT" ]
   },
   {
     "id": "headlight_reinforced_atomic",
@@ -55,9 +56,7 @@
     "id": "megafridge",
     "type": "vehicle_part",
     "name": { "str": "megafridge" },
-    "symbol": "H",
     "color": "light_blue",
-    "broken_symbol": "#",
     "broken_color": "light_blue",
     "looks_like": "minifridge",
     "damage_modifier": 80,
@@ -81,15 +80,14 @@
       { "item": "hose", "prob": 50 },
       { "item": "motor_tiny", "prob": 25 }
     ],
+    "variants": [ { "symbols": "H", "symbols_broken": "#" } ],
     "damage_reduction": { "all": 32 }
   },
   {
     "id": "megafreezer",
     "type": "vehicle_part",
     "name": { "str": "megafreezer" },
-    "symbol": "H",
     "color": "light_blue",
-    "broken_symbol": "#",
     "broken_color": "blue",
     "looks_like": "minifreezer",
     "damage_modifier": 80,
@@ -111,6 +109,7 @@
       { "item": "hose", "prob": 50 },
       { "item": "motor_tiny", "prob": 25 }
     ],
+    "variants": [ { "symbols": "H", "symbols_broken": "#" } ],
     "damage_reduction": { "all": 32 }
   }
 ]
diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_vehicles.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/42sm_vehicles.json
@@ -11,37 +11,45 @@
       [ "O----O" ]
     ],
     "parts": [
-      { "x": 0, "y": 0, "parts": [ "xlframe_vertical_2", "seat", "controls" ] },
-      { "x": 0, "y": 1, "parts": [ "xlframe_vertical_2", "engine_vtwin", "alternator_motorbike" ] },
-      { "x": 0, "y": 1, "part": "battery_motorbike" },
-      { "x": 0, "y": 1, "fuel": "gasoline", "part": "tank_small" },
-      { "x": 0, "y": 2, "parts": [ "xlframe_vertical_2", "seat" ] },
-      { "x": 0, "y": 3, "part": "xlframe_vertical" },
-      { "x": 1, "y": 0, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": 1, "y": 1, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": 1, "y": 2, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": 1, "y": 3, "parts": [ "xlframe_ne", "rail_wheel_steerable" ] },
-      { "x": 1, "y": -1, "parts": [ "xlframe_nw", "rail_wheel_steerable" ] },
-      { "x": -1, "y": 0, "part": "xlframe_horizontal" },
-      { "x": -1, "y": 1, "part": "xlframe_horizontal" },
-      { "x": -1, "y": 2, "part": "xlframe_horizontal" },
-      { "x": -1, "y": 3, "part": "xlframe_vertical" },
-      { "x": -1, "y": -1, "part": "xlframe_vertical" },
-      { "x": -2, "y": 0, "parts": [ "xlframe_vertical_2", "seat" ] },
-      { "x": -2, "y": 1, "part": "xlframe_vertical_2" },
-      { "x": -2, "y": 2, "parts": [ "xlframe_vertical_2", "seat" ] },
-      { "x": -2, "y": 3, "part": "xlframe_vertical" },
-      { "x": -2, "y": -1, "part": "xlframe_vertical" },
-      { "x": -3, "y": 0, "parts": [ "xlframe_vertical_2", "seat" ] },
-      { "x": -3, "y": 1, "part": "xlframe_vertical_2" },
-      { "x": -3, "y": 2, "parts": [ "xlframe_vertical_2", "seat" ] },
-      { "x": -3, "y": 3, "part": "xlframe_vertical" },
-      { "x": -3, "y": -1, "part": "xlframe_vertical" },
-      { "x": -4, "y": 0, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": -4, "y": 1, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": -4, "y": 2, "parts": [ "xlframe_horizontal", "xlhalfboard_horizontal" ] },
-      { "x": -4, "y": 3, "parts": [ "xlframe_se", "rail_wheel" ] },
-      { "x": -4, "y": -1, "parts": [ "xlframe_sw", "rail_wheel" ] }
+      { "x": 0, "y": 0, "parts": [ "xlframe#vertical_2", "seat", "controls" ] },
+      {
+        "x": 0,
+        "y": 1,
+        "parts": [
+          "xlframe#vertical_2",
+          "engine_vtwin",
+          { "part": "tank_small", "fuel": "gasoline" },
+          "alternator_motorbike",
+          "battery_motorbike"
+        ]
+      },
+      { "x": 0, "y": 2, "parts": [ "xlframe#vertical_2", "seat" ] },
+      { "x": 0, "y": 3, "parts": [ "xlframe#vertical" ] },
+      { "x": 1, "y": 0, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": 1, "y": 1, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": 1, "y": 2, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": 1, "y": 3, "parts": [ "xlframe#ne", "rail_wheel_steerable" ] },
+      { "x": 1, "y": -1, "parts": [ "xlframe#nw", "rail_wheel_steerable" ] },
+      { "x": -1, "y": 0, "parts": [ "xlframe#horizontal" ] },
+      { "x": -1, "y": 1, "parts": [ "xlframe#horizontal" ] },
+      { "x": -1, "y": 2, "parts": [ "xlframe#horizontal" ] },
+      { "x": -1, "y": 3, "parts": [ "xlframe#vertical" ] },
+      { "x": -1, "y": -1, "parts": [ "xlframe#vertical" ] },
+      { "x": -2, "y": 0, "parts": [ "xlframe#vertical_2", "seat" ] },
+      { "x": -2, "y": 1, "parts": [ "xlframe#vertical_2" ] },
+      { "x": -2, "y": 2, "parts": [ "xlframe#vertical_2", "seat" ] },
+      { "x": -2, "y": 3, "parts": [ "xlframe#vertical" ] },
+      { "x": -2, "y": -1, "parts": [ "xlframe#vertical" ] },
+      { "x": -3, "y": 0, "parts": [ "xlframe#vertical_2", "seat" ] },
+      { "x": -3, "y": 1, "parts": [ "xlframe#vertical_2" ] },
+      { "x": -3, "y": 2, "parts": [ "xlframe#vertical_2", "seat" ] },
+      { "x": -3, "y": 3, "parts": [ "xlframe#vertical" ] },
+      { "x": -3, "y": -1, "parts": [ "xlframe#vertical" ] },
+      { "x": -4, "y": 0, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": -4, "y": 1, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": -4, "y": 2, "parts": [ "xlframe#horizontal", "xlhalfboard#horizontal" ] },
+      { "x": -4, "y": 3, "parts": [ "xlframe#se", "rail_wheel" ] },
+      { "x": -4, "y": -1, "parts": [ "xlframe#sw", "rail_wheel" ] }
     ]
   }
 ]
diff --git a/data/Unleash_The_Mods/Working_mods/42_small_mod/modinfo.json b/data/Unleash_The_Mods/Working_mods/42_small_mod/modinfo.json
@@ -7,7 +7,7 @@
     "maintainers": [ "42Forty2" ],
     "description": "An eclectic assortment of tweaks and additions, including new start locations, scenarios, clothing mods, etc.",
     "category": "misc_additions",
-    "dependencies": [ "dda", "modularvest" ],
+    "dependencies": [ "dda" ],
     "obsolete": false
   }
 ]