Replace all fuel that spawns in military bases with jp8

[hexagonrecursion]

Summary

SUMMARY: Content "Switch fuel pumps in military bases from diesel to JP8"

Purpose of change

Fixes: #46746. Many of the cars inside of a mil base are filled with jp8 by default, but the pump only has diesel.

Describe the solution

Replace the fuel in the pump and jerrycans that spawn in a mil base with jp8.

Describe alternatives you've considered

Leave as is

Testing

1. The game loads
2. The pump in a military base contains jp8

Additional context

Currently blocked by this: no longer blocked

Cataclysm-DDA/src/mapgen.cpp

Lines 1091 to 1094 in 941d5fd

	// may want to not force this, if we want to support other fuels for some reason
	if( fuel != "gasoline" && fuel != "diesel" ) {
	jsi.throw_error( "invalid fuel", "fuel" );
	}

[Cyprex]

Note that (one of the?) military helipads have a warehouse with 100L steel drums, of the ones that were filled I found 2 with JP8, one with diesel and one with gasoline, I guess this is nice to have?

[actual-nh]

The above "Update mapgen.cpp" is to, well, hopefully fix the C++ code issue.

[hexagonrecursion]

@actual-nh

I tried it out. Now I get an error when visiting a military base (see below) and instead of a pump I get a puddle of jp8 where the pump should be.

DEBUG : invalid terrain id ""

FUNCTION : int_id generic_factory<ter_t>::convert(const string_id &, const int_id &, const bool) const [T = ter_t]
FILE : src/generic_factory.h
LINE : 467

[hexagonrecursion]

I think I figured out why this happens: jp8 is missing pump_terrain:

Cataclysm-DDA/data/json/materials.json

Lines 755 to 775 in a149ceb

	{
	"type": "material",
	"id": "diesel",
	"name": "Diesel",
	"copy-from": "hydrocarbons",
	"fuel_data": {
	"energy": 35.8,
	"pump_terrain": "t_diesel_pump",
	"explosion_data": { "chance_hot": 20, "chance_cold": 1000, "factor": 0.2, "fiery": false, "size_factor": 0.1 }
	}
	},
	{
	"type": "material",
	"id": "jp8",
	"name": "JP8",
	"copy-from": "hydrocarbons",
	"fuel_data": {
	"energy": 34.7,
	"explosion_data": { "chance_hot": 20, "chance_cold": 1000, "factor": 0.2, "fiery": false, "size_factor": 0.1 }
	}
	},

[actual-nh]

Looks like a new "t_jp8_pump" terrain is needed - probably just copy from the diesel variety.

[hexagonrecursion]

Looks like a new "t_jp8_pump" terrain is needed - probably just copy from the diesel variety.

Done. Will push in a moment.

[actual-nh]

Suggested change

	"description": "This pump is filled with JP8. If this gas dispenser doesn't give up the goods for free, you may have to pay at a nearby terminal.",
	"description": "This pump is filled with JP8. If this gas dispenser doesn't give up the goods for free, you may have to pay at a nearby terminal.",

Is this actually true of military bases and pumps meant for military vehicles, BTW (the charging)?

[hexagonrecursion]

Is this actually true of military bases and pumps meant for military vehicles, BTW (the charging)?

It does not look like it is. I was thinking this pump might at some point be added in other places.

[kevingranade]

This pull request has been mentioned on Cataclysm: Dark Days Ahead. There might be relevant details there:

https://discourse.cataclysmdda.org/t/no-hope-mod-v2-1/24971/22