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

[Innawood] Various improvements based on feedback #54149

Merged
merged 4 commits into from
Jan 8, 2022
Merged

[Innawood] Various improvements based on feedback #54149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1177088
Various innawood improvements
Light-Wave Jan 7, 2022
7389dee
Makes water faucet and pilot light auto learn
Light-Wave Jan 8, 2022
68c5da1
Makes fermenting vats not require water faucets
Light-Wave Jan 8, 2022
6b7cfe6
Minor bugfix
Light-Wave Jan 8, 2022
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
12 changes: 12 additions & 0 deletions data/mods/innawood/construction.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,17 @@
"pre_note": "Can be deconstructed without tools.",
"pre_special": "check_empty",
"post_terrain": "f_bloomery"
},
{
"type": "construction",
"id": "constr_fvat_empty_no_faucet",
"group": "build_fermenting_vat",
"category": "FURN",
"required_skills": [ [ "fabrication", 2 ], [ "cooking", 3 ] ],
"time": "90 m",
"qualities": [ [ { "id": "HAMMER", "level": 2 } ], [ { "id": "SAW_W", "level": 1 } ] ],
"components": [ [ [ "2x4", 14 ] ], [ [ "nail", 12 ] ], [ [ "sheet_metal_small", 13 ] ] ],
"pre_special": "check_empty",
"post_terrain": "f_fvat_empty"
}
]
24 changes: 0 additions & 24 deletions data/mods/innawood/furniture-tools.json
View file
Open in desktop

This file was deleted.

58 changes: 58 additions & 0 deletions data/mods/innawood/furniture_and_terrain/furniture-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
[
{
"type": "furniture",
"id": "f_bloomery",
"name": "bloomery",
"looks_like": "f_forge_rock",
"description": "A type of metallurgical furnace for smelting iron from its oxides.",
"symbol": "U",
"color": "light_red",
"move_cost_mod": -1,
"coverage": 40,
"required_str": -1,
"crafting_pseudo_item": "bloomery",
"flags": [ "SEALED", "CONTAINER", "NOITEM", "EASY_DECONSTRUCT", "MINEABLE" ],
"deconstruct": { "items": [ { "item": "rock", "count": 30 } ] },
"bash": {
"str_min": 18,
"str_max": 50,
"sound": "crash!",
"sound_fail": "whump.",
"items": [ { "item": "rock", "count": [ 10, 20 ] } ]
}
},
{
"type": "furniture",
"id": "f_fvat_empty",
"name": "fermenting vat",
"looks_like": "f_standing_tank",
"description": "A sealable vat for fermenting vinegar and various alcoholic brews.",
"symbol": "O",
"color": "brown",
"move_cost_mod": -1,
"required_str": -1,
"flags": [ "NOITEM", "SEALED", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "DONT_REMOVE_ROTTEN" ],
"examine_action": "fvat_empty",
"deconstruct": {
"items": [
{ "item": "2x4", "count": 14 },
{ "item": "nail", "charges": [ 6, 12 ] },
{ "item": "sheet_metal_small", "count": [ 4, 10 ] },
{ "item": "scrap", "count": [ 5, 10 ] }
]
},
"bash": {
"str_min": 3,
"str_max": 45,
"sound": "smash!",
"sound_fail": "whump.",
"items": [
{ "item": "2x4", "count": [ 4, 8 ] },
{ "item": "nail", "charges": [ 4, 8 ] },
{ "item": "sheet_metal_small", "count": [ 2, 6 ] },
{ "item": "scrap", "count": [ 5, 10 ] },
{ "item": "splinter", "count": 1 }
]
}
}
]
0 ...ods/innawood/terrain-floors-outdoors.json → ..._and_terrain/terrain-floors-outdoors.json
View file
Open in desktop
File renamed without changes.
0 data/mods/innawood/terrain-flora.json → .../furniture_and_terrain/terrain-flora.json
View file
Open in desktop
File renamed without changes.
0 data/mods/innawood/terrain-walls.json → .../furniture_and_terrain/terrain-walls.json
View file
Open in desktop
File renamed without changes.
28 changes: 18 additions & 10 deletions data/mods/innawood/mapgen/cave.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@
".....~~~~~~.....~~~.....",
"....~~~~~~~~....~~~~....",
"......~~~~~~~..~~~~~....",
"....~~~~~~~~..~~~~~~....",
"....~~~~W~~~..~~~~~~....",
"....~~~~~~~~..~~~~~.....",
".....~~~~~~~..~~~~~.....",
"..............~~~~~~....",
Expand Down Expand Up @@ -507,7 +507,13 @@
],
"terrain": { ".": "t_soil", ",": "t_dirt_underground", ">": "t_slope_up" },
"furniture": { },
"items": { "~": [ { "item": "monparts", "chance": 2 }, { "item": "trash_forest", "chance": 2 } ] }
"items": {
"~": [
{ "item": "monparts", "chance": 2 },
{ "item": "trash_forest", "chance": 2 },
{ "item": "cave_minerals", "chance": 20 }
]
}
}
},
{
Expand Down Expand Up @@ -583,7 +589,8 @@
"...........,,,..........",
"............>..........."
],
"terrain": { ".": "t_soil", ",": "t_dirt_underground", "!": "t_dirt_underground", ">": "t_slope_up" },
"terrain": { ".": "t_soil", ",": "t_dirt_underground", ">": "t_slope_up" },
"items": { "!": { "item": "cave_minerals", "chance": 100, "repeat": [ 1, 3 ] } },
"furniture": { }
}
},
Expand All @@ -598,9 +605,9 @@
"rows": [
"........................",
"........................",
"..... 11 13 1111111..",
".....a 11 13 1111111..",
"...11 ......... ..",
"...11 ......... ...",
"...11 a ......... a ...",
"....1 ..........1111..",
"....... ..........4....",
"........ ...... ....",
Expand All @@ -609,19 +616,20 @@
"......... ....1........",
"........ .....5........",
".......11......1........",
".... ..... .11...",
".... a ..... .11...",
"... .... ..",
"...11 ... ...",
"...11 a ... a ...",
"..... ........ ..",
"...111111............ .",
"... ..... ... .",
".... ..... .",
"............ .... .",
"... a ..... ... .",
".... a ..... .",
"............ .... a .",
"............6.... .",
"............ .... . .",
"............>..........."
],
"terrain": { ".": "t_soil", " ": "t_dirt_underground", ">": "t_slope_up" },
"items": { "a": { "item": "cave_minerals", "chance": 40, "repeat": [ 1, 3 ] } },
"furniture": { },
"fields": {
"1": { "field": "fd_web", "intensity": 1, "age": 10 },
Expand Down
67 changes: 67 additions & 0 deletions data/mods/innawood/mapgen/crater.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
[
{
"om_terrain": "crater_core",
"type": "mapgen",
"method": "json",
"weight": 250000,
"object": {
"rows": [
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........00000000........",
"........00000000........",
"........00000000........",
"........00000000........",
"........00000000........",
"........00000000........",
"........00000000........",
"........00000000........",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................",
"........................"
],
"//": "It's important that the bombs get placed on tiles without wreckage, otherwise they can get destroyed before they explode",
"place_item": [
{ "item": "crater_bomb", "x": [ 8, 11 ], "y": [ 8, 11 ], "amount": 1, "custom-flags": [ "ACTIVATE_ON_PLACE" ] },
{
"item": "crater_bomb",
"x": [ 8, 11 ],
"y": [ 12, 15 ],
"amount": 1,
"custom-flags": [ "ACTIVATE_ON_PLACE" ]
},
{
"item": "crater_bomb",
"x": [ 12, 15 ],
"y": [ 8, 11 ],
"amount": 1,
"custom-flags": [ "ACTIVATE_ON_PLACE" ]
},
{
"item": "crater_bomb",
"x": [ 12, 15 ],
"y": [ 12, 15 ],
"amount": 1,
"custom-flags": [ "ACTIVATE_ON_PLACE" ]
}
],
"place_items": [ { "item": "wreckage", "repeat": 3, "x": [ 0, 23 ], "y": [ 0, 23 ] } ],
"rubble": { ".": { "rubble_type": "f_rubble_rock" } },
"terrain": {
".": [ [ "t_region_groundcover_barren", 10 ], "t_region_groundcover" ],
"0": [ [ "t_region_groundcover_barren", 10 ], "t_region_groundcover" ]
}
}
}
]
31 changes: 31 additions & 0 deletions data/mods/innawood/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
[
{
"type": "material",
"id": "cotton",
"name": "Cotton",
"density": 3,
"specific_heat_liquid": 0.02,
"specific_heat_solid": 0.02,
"latent_heat": 205,
"soft": true,
"reinforces": true,
"bash_resist": 1,
"cut_resist": 1,
"bullet_resist": 1,
"acid_resist": 3,
"fire_resist": 0,
"elec_resist": 2,
"chip_resist": 6,
"wind_resist": 70,
"repaired_with": "rag",
"salvaged_into": "cotton_patchwork",
"dmg_adj": [ "ripped", "torn", "shredded", "tattered" ],
"bash_dmg_verb": "ripped",
"cut_dmg_verb": "cut",
"burn_data": [
{ "fuel": 1, "smoke": 1, "burn": 1, "volume_per_turn": "1250 ml" },
{ "fuel": 1, "smoke": 1, "burn": 1 },
{ "fuel": 1, "smoke": 1, "burn": 2 }
]
}
]
17 changes: 17 additions & 0 deletions data/mods/innawood/recipes/armor_arms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
[
{
"result": "2byarm_guard",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"category": "CC_ARMOR",
"subcategory": "CSC_ARMOR_ARMS",
"skill_used": "fabrication",
"difficulty": 1,
"time": "15 m",
"autolearn": true,
"reversible": true,
"using": [ [ "cordage_short", 2 ] ],
"qualities": [ { "id": "CUT", "level": 2 } ],
"components": [ [ [ "2x4", 1 ], [ "stick", 2 ] ], [ [ "rag", 1 ] ] ]
}
]
Loading