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

Ratkin lab fixes #70520

Merged
merged 8 commits into from
Dec 31, 2023
Merged

Ratkin lab fixes #70520

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a8a2efb
Swap microlab_rock_border for relevant special terrains
Procyonae Dec 30, 2023
de98f8e
Slightly less sticky out ratkin lab
Procyonae Dec 30, 2023
1820eb4
Linted
Procyonae Dec 30, 2023
8155130
Realised the extra conditionals are no longer necessary
Procyonae Dec 30, 2023
66ce0ce
DinoMod
Procyonae Dec 30, 2023
395d653
DinoMod
Procyonae Dec 30, 2023
55cc602
Merge branch 'RatkinLabFixes' of https://github.com/Procyonae/Catacly…
Procyonae Dec 30, 2023
1fd0b5f
Isolation Protocol
Procyonae Dec 30, 2023
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
103 changes: 65 additions & 38 deletions data/json/mapgen/microlab/microlab_connector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,44 +38,7 @@
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_rock_border" ],
"weight": 1000,
"object": {
"fill_ter": "t_concrete",
"rows": [
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################",
"########################"
],
"palettes": [ "microlab" ]
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_sub_station", "microlab_sub_station_ratkin" ],
"weight": 1000,
"om_terrain": [ "microlab_sub_station" ],
"object": {
"fill_ter": "t_strconc_floor",
"rows": [
Expand Down Expand Up @@ -116,6 +79,70 @@
}
}
},
{
"type": "mapgen",
"method": "json",
"om_terrain": [ "microlab_sub_station_ratkin" ],
"object": {
"fill_ter": "t_strconc_floor",
"rows": [
"######## ########",
"######## ########",
"######## ########",
"######## ########",
"######## ########",
"######## ########",
"######## ########",
"###||||| ########",
"###|l h ( |#########",
"###|l ( YY |#########",
"###|l ( YY |#########",
"###||2|||| |#########",
"###| | |#########",
"###| hd|G55||#########",
"###| ddd| ^|#########",
"###||5(((| ^|||||||###",
"###|B VV ^^|###",
"###|B YY ?|###",
"###|B dddd YY t ?|###",
"###|B d hd ?|###",
"###|B t? ^^|###",
"###|||||||| ||||||||###",
"##########|22|##########",
"##########| |##########"
],
"place_nested": [
{ "chunks": [ "ratkin_sewer_entrance" ], "x": 8, "y": 0 },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } }
],
"palettes": [ "microlab_generic" ],
"terrain": { "#": "t_soil", "G": "t_card_science" },
"items": {
"l": [ { "item": "guns_milspec", "chance": 10 }, { "item": "ammo_milspec", "chance": 70 } ],
"t": { "item": "magazines", "chance": 90 }
}
}
},
{
"type": "mapgen",
"method": "json",
"nested_mapgen_id": "ratkin_sewer_entrance",
"object": {
"mapgensize": [ 8, 8 ],
"rows": [
"|o-~~-o|",
"|o-~~-o|",
"|o-~~-o|",
"|o-~~-o|",
"|o-~~-o|",
"|o-~~-o|",
"|p-~~-p|",
"||----||"
],
"palettes": [ "sewers" ]
}
},
{
"type": "mapgen",
"method": "json",
Expand Down
4 changes: 0 additions & 4 deletions data/json/mapgen/microlab/microlab_distorted/microlab_distorted.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
{ "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 0 },
{ "chunks": [ "microlab_distorted_chunk" ], "x": 0, "y": 12 },
{ "chunks": [ "microlab_distorted_chunk" ], "x": 12, "y": 12 },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand Down
4 changes: 0 additions & 4 deletions data/json/mapgen/microlab/microlab_distorted/microlab_distorted_hallway.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@
{ "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 0 },
{ "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 0, "y": 12 },
{ "chunks": [ "microlab_distorted_hallway_chunk" ], "x": 12, "y": 12 },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand Down
4 changes: 0 additions & 4 deletions data/json/mapgen/microlab/microlab_generic_edge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,6 @@
"x": 0,
"y": 0
},
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand Down
6 changes: 0 additions & 6 deletions data/json/mapgen/microlab/microlab_hallway_start.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_end_tile" ], "x": 0, "y": 0 },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand Down Expand Up @@ -207,8 +203,6 @@
"||||||||||||||||||||||||"
],
"place_nested": [
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab" } },
{ "else_chunks": [ "concrete_corner" ], "x": 0, "y": 0, "neighbors": { "north_west": "microlab" } },
Expand Down
4 changes: 0 additions & 4 deletions data/json/mapgen/microlab/microlab_ratkin/microlab_ratkin_generic.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
"fill_ter": "t_strconc_floor",
"place_nested": [
{ "chunks": [ "microlab_generic_edge_tile" ], "x": 0, "y": 0 },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab_rock_border" } },
{ "chunks": [ "concrete_wall_ns" ], "x": 0, "y": 0, "neighbors": { "west": "microlab_rock_border" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 0, "neighbors": { "north": "microlab" } },
{ "else_chunks": [ "concrete_wall_ns" ], "x": 23, "y": 0, "neighbors": { "east": "microlab" } },
{ "else_chunks": [ "concrete_wall_ew" ], "x": 0, "y": 23, "neighbors": { "south": "microlab" } },
Expand Down
5 changes: 5 additions & 0 deletions data/json/obsoletion/migration_oter_ids.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6458,5 +6458,10 @@
"lab_surface_brick_basementD4_west": "special_earth",
"lab_surface_brick_basementE4_west": "special_earth"
}
},
{
"type": "oter_id_migration",
"//": "migrated in 0.H",
"oter_ids": { "microlab_rock_border": "special_rock" }
}
]
20 changes: 10 additions & 10 deletions data/json/overmap/overmap_mutable/microlab_mutable.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"south": "microlab_to_microlab",
"west": "microlab_to_microlab"
},
"microlab_rock_border": { "overmap": "microlab_rock_border" },
"special_rock": { "overmap": "special_rock" },
"microlab": {
"overmap": "microlab_generic",
"north": { "id": "microlab_to_microlab", "alternatives": [ "microlab_to_hallway" ] },
Expand Down Expand Up @@ -193,7 +193,7 @@
"north": { "id": "hallway_to_hallway", "alternatives": [ "dhallway_to_dhallway" ] }
},
"rock_divisor": {
"overmap": "microlab_rock_border",
"overmap": "special_rock",
"north": "microlab_to_microlab",
"south": "dmicrolab_to_dmicrolab",
"east": { "id": "dmicrolab_to_dmicrolab", "type": "available", "alternatives": [ "microlab_to_microlab" ] },
Expand Down Expand Up @@ -238,10 +238,10 @@
"//": "This is the main elevator and core mapgen piece for the portal lab, goes all the way down to hell.",
"chunk": [
{ "overmap": "microlab_portal_dressroom", "pos": [ 0, 0, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ 1, 0, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ 2, 0, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ -1, 0, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ -2, 0, 0 ] },
{ "overmap": "special_rock", "pos": [ 1, 0, 0 ] },
{ "overmap": "special_rock", "pos": [ 2, 0, 0 ] },
{ "overmap": "special_rock", "pos": [ -1, 0, 0 ] },
{ "overmap": "special_rock", "pos": [ -2, 0, 0 ] },
{ "overmap": "firebreak", "pos": [ 0, 1, 0 ] },
{ "overmap": "portal_elevator", "pos": [ 0, 2, 0 ] },
{ "overmap": "portal_elevator", "pos": [ 0, 2, -2 ] },
Expand All @@ -268,10 +268,10 @@
{ "overmap": "nether", "pos": [ -1, 0, -8 ] },
{ "overmap": "nether", "pos": [ 0, 0, -8 ] },
{ "overmap": "nether", "pos": [ 1, 0, -8 ] },
{ "overmap": "microlab_rock_border", "pos": [ 1, 1, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ 2, 1, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ -1, 1, 0 ] },
{ "overmap": "microlab_rock_border", "pos": [ -2, 1, 0 ] }
{ "overmap": "special_rock", "pos": [ 1, 1, 0 ] },
{ "overmap": "special_rock", "pos": [ 2, 1, 0 ] },
{ "overmap": "special_rock", "pos": [ -1, 1, 0 ] },
{ "overmap": "special_rock", "pos": [ -2, 1, 0 ] }
],
"max": 1
}
Expand Down
Loading
Loading