Prepare for 0.F (part 1) (#132)

* Prepare Alchemic_bomb for 0.F stable * Prepare Car_color_variation for 0.F stable * Prepare OSRS for 0.F stable * Prepare OP_Pack for 0.F stable * Prepare Pizza_Delivery for 0.F stable * Prepare Standalone_Salvaged_Robots for 0.F stable * Move working mods to Unleash_the_mods/Working_mods
GMC-Modding-Team · Jul 14, 2021 · b6f9aa9 · b6f9aa9
1 parent be02278
commit b6f9aa9
Show file tree

Hide file tree

Showing 118 changed files with 3,925 additions and 3,420 deletions.
diff --git a/..._mods/Alchemic_bomb/alc_construction.json → ..._mods/Alchemic_bomb/alc_construction.json b/..._mods/Alchemic_bomb/alc_construction.json → ..._mods/Alchemic_bomb/alc_construction.json
@@ -1,4 +1,14 @@
 [
+  {
+    "type": "construction_group",
+    "id": "Blow_up_walls_or_doors",
+    "name": "Blow Up Walls or Doors"
+  },
+  {
+    "type": "construction_group",
+    "id": "Blow_up_the_ground",
+    "name": "Blow Up The Ground"
+  },
   {
     "id": "plactic_bomb_alc",
     "type": "construction",

diff --git a/data/broken_mods/Alchemic_bomb/alc_item.json → .../Working_mods/Alchemic_bomb/alc_item.json b/data/broken_mods/Alchemic_bomb/alc_item.json → .../Working_mods/Alchemic_bomb/alc_item.json
@@ -87,10 +87,8 @@
           "10mm": 2000,
           "44": 2000,
           "45": 2000,
-          "42000": 2000,
           "454": 2000,
           "45colt": 2000,
-          "2000": 2000,
           "57": 2000,
           "46": 2000,
           "762": 2000,
@@ -136,9 +134,8 @@
     "thrown_damage": [ { "damage_type": "bash", "amount": 13 } ],
     "ammo_type": "thrown",
     "count": 5,
-    "effects": [ "BEANBAG" ],
+    "effects": [ "BEANBAG", "NEVER_MISFIRES" ],
     "qualities": [ [ "HAMMER", 1 ] ],
-    "ammo_effects": [ "NEVER_MISFIRES" ],
     "flags": [ "UNARMED_WEAPON", "NOGIB", "TRADER_AVOID", "NO_REPAIR" ]
   },
   {
@@ -365,7 +362,7 @@
       "type": "explosion",
       "fields_type": "fd_toxic_gas",
       "fields_radius": 2,
-      "fields_min_density": 14,
+      "fields_min_intensity": 14,
       "sound_volume": 0,
       "sound_msg": "Hiss.",
       "no_deactivate_msg": "You've already armed the %s, try throwing it instead."
@@ -391,7 +388,7 @@
       "do_flashbang": true,
       "fields_type": "fd_electricity",
       "fields_radius": 4,
-      "fields_min_density": 200,
+      "fields_min_intensity": 200,
       "sound_volume": -20
     },
     "flags": [ "BOMB", "GRENADE", "ACT_ON_RANGED_HIT", "TRADER_AVOID", "NO_REPAIR" ]
@@ -475,11 +472,10 @@
     "color": "green",
     "use_action": {
       "type": "explosion",
-      "distance_factor": 0.1,
       "sound_volume": 0,
       "sound_msg": "Tick.",
       "no_deactivate_msg": "You've already pulled the %s's pin, try throwing it instead.",
-      "explosion": { "power": 10, "shrapnel": { "casing_mass": 35, "fragment_mass": 1.0 } }
+      "explosion": { "power": 10, "shrapnel": { "casing_mass": 35, "fragment_mass": 1.0 }, "distance_factor": 0.1 }
     },
     "flags": [ "BOMB", "GRENADE", "ACT_ON_RANGED_HIT", "TRADER_AVOID", "NO_REPAIR" ]
   },
@@ -499,11 +495,10 @@
     "color": "green",
     "use_action": {
       "type": "explosion",
-      "distance_factor": 0.2,
       "sound_volume": 0,
       "sound_msg": "Tick.",
       "no_deactivate_msg": "You've already pulled the %s's pin, try throwing it instead.",
-      "explosion": { "power": 20, "shrapnel": { "casing_mass": 30, "fragment_mass": 5.0 } }
+      "explosion": { "power": 20, "shrapnel": { "casing_mass": 30, "fragment_mass": 5.0 }, "distance_factor": 0.2 }
     },
     "flags": [ "BOMB", "GRENADE", "ACT_ON_RANGED_HIT", "TRADER_AVOID", "NO_REPAIR" ]
   },

diff --git a/...n_mods/Alchemic_bomb/alc_professions.json → ...g_mods/Alchemic_bomb/alc_professions.json b/...n_mods/Alchemic_bomb/alc_professions.json → ...g_mods/Alchemic_bomb/alc_professions.json
diff --git a/...broken_mods/Alchemic_bomb/alc_recipe.json → ...orking_mods/Alchemic_bomb/alc_recipe.json b/...broken_mods/Alchemic_bomb/alc_recipe.json → ...orking_mods/Alchemic_bomb/alc_recipe.json
diff --git a/...s/Alchemic_bomb/mod_tileset/item_tile.png → ...s/Alchemic_bomb/mod_tileset/item_tile.png b/...s/Alchemic_bomb/mod_tileset/item_tile.png → ...s/Alchemic_bomb/mod_tileset/item_tile.png
diff --git a/...lchemic_bomb/mod_tileset/mod_tileset.json → ...lchemic_bomb/mod_tileset/mod_tileset.json b/...lchemic_bomb/mod_tileset/mod_tileset.json → ...lchemic_bomb/mod_tileset/mod_tileset.json
@@ -18,7 +18,6 @@
       "MXplus12_for_cosmetics",
       "ChestHole16"
     ],
-    "tile_info": [ { "height": 32, "width": 32 } ],
     "tiles-new": [
       {
         "file": "mod_tileset/item_tile.png",

diff --git a/...ods/Alchemic_bomb/mod_tileset/tileset.txt → ...ods/Alchemic_bomb/mod_tileset/tileset.txt b/...ods/Alchemic_bomb/mod_tileset/tileset.txt → ...ods/Alchemic_bomb/mod_tileset/tileset.txt
diff --git a/data/broken_mods/Alchemic_bomb/modinfo.json → ...s/Working_mods/Alchemic_bomb/modinfo.json b/data/broken_mods/Alchemic_bomb/modinfo.json → ...s/Working_mods/Alchemic_bomb/modinfo.json
diff --git a/...ods/Car_color_variation/Vehicle image.png → ...ods/Car_color_variation/Vehicle image.png b/...ods/Car_color_variation/Vehicle image.png → ...ods/Car_color_variation/Vehicle image.png
diff --git a/...or_variation/mod_tileset/mod_tileset.json → ...or_variation/mod_tileset/mod_tileset.json b/...or_variation/mod_tileset/mod_tileset.json → ...or_variation/mod_tileset/mod_tileset.json
diff --git a/...mod_tileset/tiles_Car_coror_variation.png → ...mod_tileset/tiles_Car_coror_variation.png b/...mod_tileset/tiles_Car_coror_variation.png → ...mod_tileset/tiles_Car_coror_variation.png
diff --git a/...ken_mods/Car_color_variation/modinfo.json → ...ing_mods/Car_color_variation/modinfo.json b/...ken_mods/Car_color_variation/modinfo.json → ...ing_mods/Car_color_variation/modinfo.json
diff --git a/...roken_mods/Car_color_variation/readme.txt → ...rking_mods/Car_color_variation/readme.txt b/...roken_mods/Car_color_variation/readme.txt → ...rking_mods/Car_color_variation/readme.txt
diff --git a/...ds/Car_color_variation/road_vehicles.json → ...ds/Car_color_variation/road_vehicles.json b/...ds/Car_color_variation/road_vehicles.json → ...ds/Car_color_variation/road_vehicles.json
@@ -4,254 +4,239 @@
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_white", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_white", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_silver", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_silver", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_gray", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_gray", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_black", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_black", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_orange", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_orange", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_yellow", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_yellow", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_lime", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_lime", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_gleen", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_gleen", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_aqua", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_aqua", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_dodgerblue", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_dodgerblue", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_blue", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_blue", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_navy", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_navy", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_violet", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_violet", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_purple", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_purple", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   },
   {
     "id": "default_city",
     "type": "vehicle_spawn",
     "spawn_types": [
       {
-        "description": "Randomly-distributed wrecks",
+        "//": "Randomly-distributed wrecks",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_red", "placement": "%t_wrecks", "number": [ 1, 3 ], "fuel": -1, "status": 1 }
       },
       {
-        "description": "Parked vehicles",
+        "//": "Parked vehicles",
         "weight": 11,
         "vehicle_json": { "vehicle": "city_vehicles_red", "placement": "%t_parked", "number": 1, "fuel": -1, "status": 1 }
       }
-    ],
-    "parts": [  ]
+    ]
   }
 ]
diff --git a/...s/Car_color_variation/vehicle_groups.json → ...s/Car_color_variation/vehicle_groups.json b/...s/Car_color_variation/vehicle_groups.json → ...s/Car_color_variation/vehicle_groups.json