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.

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

[Xedra Evolved] Paraclesian altar wall rework #72008

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions data/mods/Xedra_Evolved/connect_groups.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[
{
"type": "connect_group",
"id": "OBSIDIANFLOOR"
}
]
12 changes: 11 additions & 1 deletion data/mods/Xedra_Evolved/field_type.json
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,6 @@
{
"id": "fd_pollen_arvore_weaken",
"type": "field_type",
"legacy_enum_id": 51,
"intensity_levels": [
{
"name": "pollen cloud",
Expand Down Expand Up @@ -194,5 +193,16 @@
"display_items": false,
"display_field": true,
"looks_like": "fd_nuke_gas"
},
{
"id": "fd_sylph_solid_fog",
"type": "field_type",
"looks_like": "fd_fog",
"intensity_levels": [ { "name": "solid fog", "sym": "*", "translucency": 99, "move_cost": -1, "transparent": false, "light_override": 0 } ],
"half_life": 999999999999,
"percent_spread": 0,
"phase": "gas",
"display_items": false,
"display_field": true
}
]
109 changes: 109 additions & 0 deletions data/mods/Xedra_Evolved/furniture_and_terrain/terrain-eruption.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
[
{
"type": "terrain",
"id": "t_solid_fog",
"name": "wall of fog",
"looks_like": "fd_fog",
"description": "A wall of swirling fog. Despite its constant movement, it never spreads out or escapes the rough wall-shape it's in.",
"symbol": "LINE_OXOX",
"color": "light_gray",
"move_cost": 0,
"coverage": 100,
"flags": [ "NOITEM", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "CONNECT_WITH_WALL", "BLOCK_WIND" ]
},
{
"type": "terrain",
"id": "t_obsidian_wall",
"name": "obsidian rock",
"looks_like": "t_rock",
"description": "A rough wall of igneous stone. It does not look like polished obsidian but you can see some resemblance.",
"symbol": "LINE_OXOX",
"//": "use pillars, 't_column_obsidian', as a compliment.",
"color": "white",
"move_cost": 0,
"coverage": 100,
"roof": "t_obsidian_roof",
"flags": [ "NOITEM", "SUPPORTS_ROOF", "WALL", "NO_SCENT", "AUTO_WALL_SYMBOL", "CONNECT_WITH_WALL", "MINEABLE", "BLOCK_WIND" ],
"bash": {
"str_min": 120,
"str_max": 400,
"sound": "crash!",
"sound_fail": "whump!",
"ter_set": "t_rock_floor",
"items": [ { "item": "obsidian_rock", "count": [ 6, 12 ] }, { "item": "material_rocksalt", "count": [ 0, 1 ], "prob": 10 } ]
}
},
{
"type": "terrain",
"id": "t_obsidian_floor",
"name": "obsidian floor",
"description": "A relatively flat area of igneous rock. Looks stable enough to be mined with the proper mining gear.",
"symbol": ".",
"color": "light_gray",
"connect_groups": "OBSIDIANFLOOR",
"connects_to": "OBSIDIANFLOOR",
"move_cost": 2,
"roof": "t_obsidian_roof",
"flags": [ "TRANSPARENT", "INDOORS", "COLLAPSES", "SUPPORTS_ROOF", "FLAT", "ROAD" ],
"bash": { "ter_set": "t_null", "str_min": 75, "str_max": 400, "str_min_supported": 100, "bash_below": true }
},
{
"type": "terrain",
"id": "t_column_obsidian",
"name": "column",
"looks_like": "t_rock_wall",
"description": "A natural column of igneous rock.",
"symbol": "1",
"color": "light_gray",
"move_cost": 0,
"coverage": 80,
"flags": [ "WALL", "PERMEABLE", "MINEABLE" ],
"bash": {
"str_min": 120,
"str_max": 200,
"sound": "crash!",
"sound_fail": "whump!",
"ter_set": "t_reb_cage",
"items": [ { "item": "obsidian_rock", "count": [ 10, 22 ] } ]
}
},
{
"type": "terrain",
"id": "t_obsidian_roof",
"name": "obsidian roof",
"description": "A section of flat igneous rock.",
"looks_like": "t_rock_floor",
"symbol": ".",
"color": "brown",
"move_cost": 2,
"flags": [ "TRANSPARENT", "FLAT" ],
"bash": { "str_min": 100, "str_max": 210, "sound": "crash!", "sound_fail": "whump!", "ter_set": "t_hole", "bash_below": false }
},
{
"type": "terrain",
"id": "t_salamander_veins",
"name": "salamander vein",
"looks_like": "t_pillar",
"description": "A vein of rare materials that appear during an eruption.",
"symbol": "1",
"color": "light_gray",
"move_cost": 0,
"coverage": 80,
"flags": [ "WALL", "PERMEABLE", "MINEABLE" ],
"bash": {
"str_min": 120,
"str_max": 200,
"sound": "crash!",
"sound_fail": "whump!",
"ter_set": "t_obsidian_floor",
"items": [
{ "item": "obsidian_rock", "count": [ 10, 22 ] },
{ "item": "copper", "count": [ 0, 750 ], "prob": 80 },
{ "item": "silver_small", "count": [ 0, 250 ], "prob": 60 },
{ "item": "gold_small", "count": [ 0, 100 ], "prob": 40 },
{ "item": "platinum_small", "count": [ 0, 25 ], "prob": 20 },
{ "item": "scrap_moon_tears", "count": [ 0, 10 ], "prob": 10 }
]
}
}
]
8 changes: 8 additions & 0 deletions data/mods/Xedra_Evolved/items/resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -235,5 +235,13 @@
"color": "brown",
"name": { "str": "treesung log" },
"description": "A large log of living wood, sung from a tree by elemental magick."
},
{
"type": "GENERIC",
"id": "obsidian_rock",
"copy-from": "rock",
"name": { "str": "chunk of obsidian", "str_pl": "chunks of obsidian" },
"color": "black",
"description": "A chunk of obsidian, smashed from a larger rock vein. It has several wickedly sharp edges and could probably be formed into a weapon with some work."
}
]
40 changes: 23 additions & 17 deletions data/mods/Xedra_Evolved/mapgen/genius_locum.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,13 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
"#": "t_rock_wall",
"|": [ [ "t_rock", 1 ], [ "t_soil", 1 ] ]
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand Down Expand Up @@ -138,12 +139,13 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
"#": "t_rock_wall",
"|": "t_water_cube"
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand Down Expand Up @@ -216,12 +218,13 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
"#": "t_rock_wall",
"|": "t_region_tree_shade"
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand Down Expand Up @@ -297,12 +300,13 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
"#": "t_rock_wall",
"|": [ [ "t_obsidian_wall", 50 ], [ "t_salamander_veins", 10 ], [ "t_lava", 1 ] ]
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand Down Expand Up @@ -375,12 +379,12 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand All @@ -389,6 +393,7 @@
"3": "f_topiary_abstract",
"4": "f_topiary_dragon"
},
"fields": { "|": { "field": "fd_sylph_solid_fog", "intensity": 1 } },
"item": { "X": { "item": "mutagen_airkin" } }
}
},
Expand Down Expand Up @@ -453,12 +458,13 @@
".": "t_rock_floor",
"X": "t_rock_floor",
"b": "t_rock_floor",
"1": "t_rock_floor",
"1": "t_dirt",
"4": "t_dirt",
"-": [ [ "t_region_groundcover_urban", 5 ], "t_region_tree_shade", 2 ],
"#": "t_rock_wall"
"#": "t_rock_wall",
"|": [ [ "t_scrap_wall", 10 ], [ "t_scrap_wall_halfway", 2 ], [ "t_brick_wall", 10 ], [ "t_brick_wall_halfway", 2 ] ]
},
"furniture": {
"|": "f_hedge_tall",
"b": "f_bench",
"h": "f_bench",
"X": "f_elemental_altar",
Expand Down
2 changes: 1 addition & 1 deletion doc/JSON_INFO.md
Original file line number Diff line number Diff line change
Expand Up @@ -6116,7 +6116,7 @@ Fields can exist on top of terrain/furniture, and support different intensity le
"has_elec": false, // See has_fire
"has_fume": false, // See has_fire, non-breathing monsters are immune to this field
"display_items": true, // If the field should obscure items on this tile
"display_field": true, // If the field should obscure other fields
"display_field": true, // If the field has a visible sprite or symbol, default false
"description_affix": "covered_in", // Description affix for items in this field, possible values are "in", "covered_in", "on", "under", and "illuminated_by"
"wandering_field": "fd_toxic_gas", // Spawns the defined field in an `intensity-1` radius, or increases the intensity of such fields until their intensity is the same as the parent field
"decrease_intensity_on_contact": true, // Decrease the field intensity by one each time a character walk on it.
Expand Down
Loading