From 5e5e24fe4471d955dab008f2c1183cba64f8984f Mon Sep 17 00:00:00 2001 From: Zach <82045140+thelonestander@users.noreply.github.com> Date: Wed, 6 Jul 2022 16:10:36 -0400 Subject: [PATCH] Allows jp8 fuel to be found at military helipads (#1641) * Update supplies.json * Update data/json/itemgroups/supplies.json Co-authored-by: Chaosvolt * Update supplies.json * Update supplies.json * New group Added a new group for full 30 gallon drums. Three types should spawn. Full, partial, and empty. * Forgot newline * Linted Co-authored-by: Chaosvolt --- data/json/itemgroups/supplies.json | 19 +++++++++++++++---- data/json/mapgen/helipad.json | 6 +++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/data/json/itemgroups/supplies.json b/data/json/itemgroups/supplies.json index 526dab449d97..4cabea9c968d 100644 --- a/data/json/itemgroups/supplies.json +++ b/data/json/itemgroups/supplies.json @@ -514,12 +514,23 @@ { "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, 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": "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 } ] }, { diff --git a/data/json/mapgen/helipad.json b/data/json/mapgen/helipad.json index a47caecf083c..a5deff2f4f72 100644 --- a/data/json/mapgen/helipad.json +++ b/data/json/mapgen/helipad.json @@ -63,7 +63,11 @@ "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 },