Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(done) Migrate some terrains that should be furnitures into furniture #41731

Merged
merged 23 commits into from
Jul 14, 2020
Merged

(done) Migrate some terrains that should be furnitures into furniture #41731

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c017206
migrate gas_tank and diesel_tank to furniture, update palettes
I-am-Erk Jul 1, 2020
b6d048b
continue migration
I-am-Erk Jul 1, 2020
aded9fd
replace all t_machinery variants and also t_plut_generator
I-am-Erk Jul 1, 2020
802472f
Begin converting t_console and t_console_broken
I-am-Erk Jul 1, 2020
0d32165
consoles and consoles and linting
I-am-Erk Jul 2, 2020
7d19458
still more consoles and regional terrains
I-am-Erk Jul 2, 2020
b419def
Complete t_console replacement
I-am-Erk Jul 2, 2020
7175909
first playtest error catch list
I-am-Erk Jul 2, 2020
03302b5
errors caught on playtest
I-am-Erk Jul 2, 2020
eeed17f
fix a few hard coded instances of t_console overwriting any furniture…
I-am-Erk Jul 2, 2020
a3cc211
allow electronics xp gain for dismantling furniture consoles and elec…
I-am-Erk Jul 2, 2020
3a24c79
Update mapdata.h
I-am-Erk Jul 2, 2020
0dbbcad
linting + mapdata
I-am-Erk Jul 3, 2020
2a34f40
Merge remote-tracking branch 'upstream/master' into migrate-terrain-t…
I-am-Erk Jul 3, 2020
b331141
update furniture strings to proper references
I-am-Erk Jul 3, 2020
4df1d45
The last remnants of the Old Republic have been swept away.
I-am-Erk Jul 4, 2020
6715015
astyle
I-am-Erk Jul 4, 2020
1ec7ece
connects_to doesn't work for furniture yet
I-am-Erk Jul 4, 2020
fefb9d9
can't do furn_set in terrain
I-am-Erk Jul 4, 2020
201f88f
Merge branch 'master' into migrate-terrain-to-furniture-1
I-am-Erk Jul 10, 2020
64287d4
accidentally deleted sewage
I-am-Erk Jul 10, 2020
07e72c1
Merge branch 'master' into migrate-terrain-to-furniture-1
I-am-Erk Jul 10, 2020
85bb240
Restore a few furnitures to palettes (#20)
wapcaplet Jul 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 94 additions & 0 deletions data/json/furniture_and_terrain/furniture-storage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -878,6 +878,100 @@
"items": [ { "item": "scrap", "count": [ 8, 32 ] }, { "item": "water_faucet", "prob": 50 } ]
}
},
{
"type": "terrain",
I-am-Erk marked this conversation as resolved.
Show resolved Hide resolved
"id": "f_gas_tank",
"name": "fuel tank",
"description": "A tank filled with gasoline.",
"looks_like": "f_standing_tank",
"symbol": "Q",
"color": "brown_red",
"move_cost_mod": -1,
"coverage": 70,
"required_str": -1,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 20,
"sound": "metal screeching!",
"sound_fail": "clang!",
"furn_set": "f_gas_tank_smashed"
}
},
{
"type": "terrain",
"id": "f_gas_tank_smashed",
"name": "broken fuel tank",
"description": "A broken tank which was filled with gasoline.",
"looks_like": "f_wreckage",
"symbol": "Q",
"color": "light_red",
"move_cost_mod": 6,
"coverage": 30,
"required_str": -1,
"flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [
{ "item": "steel_lump", "count": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 1, 4 ] },
{ "item": "sheet_metal", "count": [ 1, 4 ] },
{ "item": "scrap", "count": [ 3, 7 ] }
]
}
},
{
"type": "terrain",
"id": "f_diesel_tank",
"name": "fuel tank",
"description": "A tank filled with diesel.",
"looks_like": "f_standing_tank",
"symbol": "Q",
"color": "brown_green",
"move_cost_mod": -1,
"coverage": 70,
"required_str": -1,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 20,
"sound": "metal screeching!",
"sound_fail": "clang!",
"furn_set": "f_diesel_tank_smashed"
}
},
{
"type": "terrain",
"id": "f_diesel_tank_smashed",
"name": "broken fuel tank",
"description": "A broken tank which was filled with diesel.",
"looks_like": "f_wreckage",
"symbol": "Q",
"color": "light_green",
"move_cost_mod": 6,
"coverage": 30,
"required_str": -1,
"flags": [ "TRANSPARENT", "NOITEM", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"items": [
{ "item": "steel_lump", "count": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 1, 4 ] },
{ "item": "sheet_metal", "count": [ 1, 4 ] },
{ "item": "scrap", "count": [ 3, 7 ] }
]
}
},
{
"type": "furniture",
"id": "f_dumpster",
Expand Down
90 changes: 0 additions & 90 deletions data/json/furniture_and_terrain/terrain-manufactured.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,51 +24,6 @@
]
}
},
{
"type": "terrain",
"id": "t_gas_tank",
"name": "fuel tank",
"description": "A tank filled with gasoline.",
"looks_like": "f_standing_tank",
"symbol": "Q",
"color": "brown_red",
"move_cost": 0,
"coverage": 50,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_gas_tank_smashed"
}
},
{
"type": "terrain",
"id": "t_gas_tank_smashed",
"name": "broken fuel tank",
"description": "A broken tank which was filled with gasoline.",
"looks_like": "f_wreckage",
"symbol": "Q",
"color": "light_red",
"move_cost": 0,
"coverage": 50,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_pavement",
"items": [
{ "item": "steel_lump", "count": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 1, 4 ] },
{ "item": "scrap", "count": [ 3, 7 ] }
]
}
},
{
"type": "terrain",
"id": "t_gas_pump",
Expand Down Expand Up @@ -129,51 +84,6 @@
]
}
},
{
"type": "terrain",
"id": "t_diesel_tank",
"name": "fuel tank",
"description": "A tank filled with diesel.",
"looks_like": "f_standing_tank",
"symbol": "Q",
"color": "brown_green",
"move_cost": 0,
"coverage": 50,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "SEALED", "CONTAINER", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_diesel_tank_smashed"
}
},
{
"type": "terrain",
"id": "t_diesel_tank_smashed",
"name": "broken fuel tank",
"description": "A broken tank which was filled with diesel.",
"looks_like": "f_wreckage",
"symbol": "Q",
"color": "light_green",
"move_cost": 0,
"coverage": 50,
"flags": [ "TRANSPARENT", "FLAMMABLE", "NOITEM", "REDUCE_SCENT" ],
"bash": {
"str_min": 40,
"str_max": 100,
"explosive": 40,
"sound": "metal screeching!",
"sound_fail": "clang!",
"ter_set": "t_pavement",
"items": [
{ "item": "steel_lump", "count": [ 1, 4 ] },
{ "item": "steel_chunk", "count": [ 1, 4 ] },
{ "item": "scrap", "count": [ 3, 7 ] }
]
}
},
{
"type": "terrain",
"id": "t_diesel_pump",
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/regional_airport.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
"************************"
],
"palettes": [ "airport_palette" ],
"place_terrain": [ { "ter": "t_gas_tank", "x": 13, "y": 4 } ],
"place_furniture": [ { "furn": "f_gas_tank", "x": 13, "y": 4 } ],
"place_liquids": [ { "liquid": "avgas", "x": 13, "y": 4, "repeat": [ 100, 500 ] } ],
"gaspumps": { "J": { } },
"place_monsters": [ { "monster": "GROUP_SMALL_STATION", "x": [ 4, 23 ], "y": [ 5, 23 ], "density": 0.05 } ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/mapgen/s_gas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"...s9s...........s9s....",
"........................"
],
"place_terrain": [ { "ter": "t_gas_tank", "x": 2, "y": 3 }, { "ter": "t_diesel_tank", "x": 4, "y": 3 } ],
"place_furniture": [ { "furn": "f_gas_tank", "x": 2, "y": 3 }, { "furn": "f_diesel_tank", "x": 4, "y": 3 } ],
"terrain": {
"&": "t_atm",
"+": "t_chaingate_l",
Expand Down
5 changes: 3 additions & 2 deletions data/json/mapgen_palettes/military/mil_base_palette.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"&": "t_grate",
"e": "t_gates_mech_control",
"5": "t_card_military",
"*": "t_gas_tank",
"*": "t_pavement",
"%": "t_pit_corpsed",
"8": "t_wall_metal",
"9": "t_metal_floor",
Expand All @@ -66,6 +66,7 @@
"#": "f_desk",
"[": "f_table",
":": "f_table",
"*": "f_gas_tank",
"h": "f_chair",
"$": "f_filing_cabinet",
"`": "f_shredder",
Expand Down Expand Up @@ -96,7 +97,7 @@
"L": "f_shower",
"6": "f_water_heater",
"7": "f_standing_tank",
"H": "f_standing_tank",
"H": "f_diesel_tank",
"j": "f_home_furnace",
"q": "f_drill_press",
"Q": "f_bandsaw",
Expand Down
46 changes: 46 additions & 0 deletions data/json/obsolete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1231,5 +1231,51 @@
"install": { "skills": [ [ "mechanics", 5 ], [ "electronics", 5 ] ] },
"removal": { "skills": [ [ "mechanics", 3 ] ] }
}
},
{
"type": "terrain",
"id": "t_gas_tank",
"name": "fuel tank",
"description": "A tank filled with gasoline.",
"looks_like": "f_gas_tank",
"symbol": "Q",
"color": "brown_red",
"move_cost": 0,
"coverage": 50
},
{
"type": "terrain",
"id": "t_gas_tank_smashed",
"name": "broken fuel tank",
"description": "A broken tank which was filled with gasoline.",
"looks_like": "f_gas_tank_smashed",
"symbol": "Q",
"color": "light_red",
"move_cost": 0,
"coverage": 50
}
},
{
"type": "terrain",
"id": "t_diesel_tank",
"name": "fuel tank",
"description": "A tank filled with diesel.",
"looks_like": "f_diesel_tank",
"symbol": "Q",
"color": "brown_red",
"move_cost": 0,
"coverage": 50
},
{
"type": "terrain",
"id": "t_diesel_tank_smashed",
"name": "broken diesel tank",
"description": "A broken tank which was filled with diesel.",
"looks_like": "f_diesel_tank_smashed",
"symbol": "Q",
"color": "light_red",
"move_cost": 0,
"coverage": 50
}
}
]