From 16f1a6ac460d14cc2f4ec49b1d0163a652fe5767 Mon Sep 17 00:00:00 2001 From: Alexey Kim Date: Tue, 6 Oct 2020 22:21:31 +0300 Subject: [PATCH] Add LIQUIDCONT on gas pumps, remove terrain swap shenanigans --- data/json/furniture_and_terrain/terrain-manufactured.json | 8 ++++---- src/iexamine.cpp | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/data/json/furniture_and_terrain/terrain-manufactured.json b/data/json/furniture_and_terrain/terrain-manufactured.json index d990b44b525c2..4b213cb976994 100644 --- a/data/json/furniture_and_terrain/terrain-manufactured.json +++ b/data/json/furniture_and_terrain/terrain-manufactured.json @@ -34,7 +34,7 @@ "color": "red", "move_cost": 0, "coverage": 65, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ], + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ], "examine_action": "gaspump", "bash": { "str_min": 8, @@ -56,7 +56,7 @@ "color": "yellow_red", "move_cost": 0, "coverage": 65, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ], + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "LIQUIDCONT" ], "examine_action": "gaspump" }, { @@ -94,7 +94,7 @@ "looks_like": "t_gas_pump", "move_cost": 0, "coverage": 65, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ], + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ], "examine_action": "gaspump", "bash": { "str_min": 8, @@ -116,7 +116,7 @@ "looks_like": "t_gas_pump_a", "move_cost": 0, "coverage": 65, - "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE" ], + "flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT", "PERMEABLE", "LIQUIDCONT" ], "examine_action": "gaspump", "bash": { "str_min": 8, diff --git a/src/iexamine.cpp b/src/iexamine.cpp index 4786288bc676c..6b99c8fca7d01 100644 --- a/src/iexamine.cpp +++ b/src/iexamine.cpp @@ -4237,10 +4237,7 @@ bool iexamine::toPumpFuel( const tripoint &src, const tripoint &dst, int units ) item liq_d( item_it->type, calendar::turn, units ); - const auto backup_pump = here.ter( dst ); - here.ter_set( dst, ter_str_id::NULL_ID() ); here.add_item_or_charges( dst, liq_d ); - here.ter_set( dst, backup_pump ); if( item_it->charges < 1 ) { items.erase( item_it );