From 25328f992d9d0d288a37198ac4de78a5592421cd Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Wed, 22 Jun 2022 17:36:44 -0400 Subject: [PATCH 1/7] Update supplies.json --- data/json/itemgroups/supplies.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 526dab449d97..78821159cd82 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -519,7 +519,8 @@ "entries": [ { "item": "gasoline", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 30 }, { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, - { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 } + { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 }, + { "item": "jp8", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 20 } ] }, { From db3d8ad8ee8dae61e239d66c11f7332ddb208f05 Mon Sep 17 00:00:00 2001 From: Zach <82045140+thelonestander@users.noreply.github.com> Date: Thu, 23 Jun 2022 08:38:55 -0400 Subject: [PATCH 2/7] Update data/json/itemgroups/supplies.json Co-authored-by: Chaosvolt --- data/json/itemgroups/supplies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 78821159cd82..2a5b20949980 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -520,7 +520,7 @@ { "item": "gasoline", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 30 }, { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 }, - { "item": "jp8", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 20 } + { "item": "jp8", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 20 } ] }, { From da28a14076d4a6a39c926a5cfe823f2e07cd42c2 Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Thu, 30 Jun 2022 10:24:28 -0400 Subject: [PATCH 3/7] Update supplies.json --- data/json/itemgroups/supplies.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 2a5b20949980..bee54a80c8c0 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -520,7 +520,7 @@ { "item": "gasoline", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 30 }, { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 }, - { "item": "jp8", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 20 } + { "item": "jp8", "charges": [ 0, 10000 ], "container-item": "30gal_drum", "prob": 20 } ] }, { From eaf96757e116086aae772e29494fa7781d3b6040 Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Thu, 30 Jun 2022 11:03:44 -0400 Subject: [PATCH 4/7] Update supplies.json --- data/json/itemgroups/supplies.json | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index bee54a80c8c0..eff60680d959 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -517,10 +517,9 @@ "//": "barrel with gasoline, diesel or motor oil like you would find at fuel depot", "subtype": "distribution", "entries": [ - { "item": "gasoline", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 30 }, + { "item": "gasoline", "charges": [ 0, 35000 ], "container-item": "30gal_drum", "prob": 30 }, { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, - { "item": "motor_oil", "charges": [ 0, 10000 ], "container-item": "jerrycan", "prob": 5 }, - { "item": "jp8", "charges": [ 0, 10000 ], "container-item": "30gal_drum", "prob": 20 } + { "item": "jp8", "charges": [ 0, 45000 ], "container-item": "30gal_drum", "prob": 20 } ] }, { From 09390732a2ed73b9061160b25932383aa6349146 Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Thu, 30 Jun 2022 17:41:34 -0400 Subject: [PATCH 5/7] New group Added a new group for full 30 gallon drums. Three types should spawn. Full, partial, and empty. --- data/json/itemgroups/supplies.json | 19 +++++++++++++++---- data/json/mapgen/helipad.json | 4 ++-- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index eff60680d959..3a88877f8fe3 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -514,14 +514,25 @@ { "id": "fuel_barrel", "type": "item_group", - "//": "barrel with gasoline, diesel or motor oil like you would find at fuel depot", + "//": "barrel with gasoline, diesel or Jp8 fuel like you would find at fuel depot", "subtype": "distribution", "entries": [ - { "item": "gasoline", "charges": [ 0, 35000 ], "container-item": "30gal_drum", "prob": 30 }, - { "item": "diesel", "charges": [ 0, 50000 ], "container-item": "30gal_drum", "prob": 10 }, + { "item": "gasoline", "charges": [ 0, 25000 ], "container-item": "30gal_drum", "prob": 20 }, + { "item": "diesel", "charges": [ 0, 12000 ], "container-item": "30gal_drum", "prob": 10 }, { "item": "jp8", "charges": [ 0, 45000 ], "container-item": "30gal_drum", "prob": 20 } ] }, + { + "id": "fuel_barrel_full", + "type": "item_group", + "//": "barrel with gasoline, diesel or Jp8 fuel like you would find at fuel depot", + "subtype": "distribution", + "entries": [ + { "item": "gasoline" , "container-item": "30gal_drum", "prob": 20 }, + { "item": "diesel" , "container-item": "30gal_drum", "prob": 10 }, + { "item": "jp8" , "container-item": "30gal_drum", "prob": 20 } + ] + }, { "id": "autodoc_supplies", "type": "item_group", @@ -544,4 +555,4 @@ "//": "GParts for military helicopter", "items": [ [ "medium_turbine_engine", 30 ], [ "large_turbine_engine", 20 ], [ "heavy_duty_military_rotor", 50 ] ] } -] +] \ No newline at end of file diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index a47caecf083c..db4571c5c46e 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -63,7 +63,7 @@ "B": { "item": { "subtype": "distribution", - "entries": [ { "group": "fuel_barrel", "prob": 30 }, { "item": "30gal_drum", "prob": 70 } ] + "entries": [ { "item": "30gal_drum", "prob": 50 }, { "group": "fuel_barrel", "prob": 20 }, { "group": "fuel_barrel_full", "prob": 30 } ] }, "chance": 75 }, @@ -212,4 +212,4 @@ ] } } -] +] \ No newline at end of file From b4c2cdb6d16cbf7d02ed03582edee636e3e0aade Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Thu, 30 Jun 2022 17:58:32 -0400 Subject: [PATCH 6/7] Forgot newline --- data/json/itemgroups/supplies.json | 2 +- data/json/mapgen/helipad.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 3a88877f8fe3..fa6cd23a5457 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -555,4 +555,4 @@ "//": "GParts for military helicopter", "items": [ [ "medium_turbine_engine", 30 ], [ "large_turbine_engine", 20 ], [ "heavy_duty_military_rotor", 50 ] ] } -] \ No newline at end of file +] diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index db4571c5c46e..70aa8fb4bbf4 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -212,4 +212,4 @@ ] } } -] \ No newline at end of file +] From f9fd06afe681ac5f82e773f4e644196ebb6a1204 Mon Sep 17 00:00:00 2001 From: thelonestander <82045140+thelonestander@users.noreply.github.com> Date: Fri, 1 Jul 2022 17:12:12 -0400 Subject: [PATCH 7/7] Linted --- data/json/itemgroups/supplies.json | 6 +++--- data/json/mapgen/helipad.json | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index fa6cd23a5457..4cabea9c968d 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -528,9 +528,9 @@ "//": "barrel with gasoline, diesel or Jp8 fuel like you would find at fuel depot", "subtype": "distribution", "entries": [ - { "item": "gasoline" , "container-item": "30gal_drum", "prob": 20 }, - { "item": "diesel" , "container-item": "30gal_drum", "prob": 10 }, - { "item": "jp8" , "container-item": "30gal_drum", "prob": 20 } + { "item": "gasoline", "container-item": "30gal_drum", "prob": 20 }, + { "item": "diesel", "container-item": "30gal_drum", "prob": 10 }, + { "item": "jp8", "container-item": "30gal_drum", "prob": 20 } ] }, { diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index 70aa8fb4bbf4..a5deff2f4f72 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -63,7 +63,11 @@ "B": { "item": { "subtype": "distribution", - "entries": [ { "item": "30gal_drum", "prob": 50 }, { "group": "fuel_barrel", "prob": 20 }, { "group": "fuel_barrel_full", "prob": 30 } ] + "entries": [ + { "item": "30gal_drum", "prob": 50 }, + { "group": "fuel_barrel", "prob": 20 }, + { "group": "fuel_barrel_full", "prob": 30 } + ] }, "chance": 75 },