Skip to content

Commit

Permalink
Fix mod errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@Milopetilo
Milopetilo committed Nov 14, 2024
1 parent 6abfc20 commit ebdb50b
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 58 deletions.
68 changes: 34 additions & 34 deletions data/mods/DinoMod/mapgen/dinoexhibit.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,23 +13,23 @@
".................~~~~~..",
".................y~~~y..",
"yyyyyyyyyyyyyyyyyy~~~yy^",
"###############|||o*ooo|",
"#..............|t|D |",
"#.#############| |JJJ Q|",
"#.#...#...#...#|j* D Q|",
"#.#I..#...#.I.#||||*||||",
"#.#...#..I#...#.j......#",
"#.##u###u###u##........#",
"#......................#",
"#.####u#####u##.. .#",
"#.#.....#.....#..HH .#",
"#.#.....#.....#..HH .#",
"#.#.....#.....#.%%%%*%%#",
"#.#.....#.....#.%.....%#",
"#.#....I#...I.#.%PPPPP%#",
"#.#############.%%%%%%%#",
"#......................#",
"########################"
"ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ###o*ooo#",
"Ŧ..............#t#D #",
"Ŧ.ŦŦŦŦŦŦŦŦŦŦŦŦŦ# #JJJ Q#",
"Ŧ.Ŧ...Ŧ...Ŧ...Ŧ#j* D Q#",
"Ŧ.ŦI..Ŧ...Ŧ.I.Ŧ####*####",
"Ŧ.Ŧ...Ŧ..IŦ...Ŧ.j......Ŧ",
"Ŧ.ŦŦuŦŦŦuŦŦŦuŦŦ........Ŧ",
"Ŧ......................Ŧ",
"Ŧ.ŦŦŦŦuŦŦŦŦŦuŦŦ.. .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ..HH .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ..HH .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ.||||*||Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ.|.....|Ŧ",
"Ŧ.Ŧ....IŦ...I.Ŧ.|PPPPP|Ŧ",
"Ŧ.ŦŦŦŦŦŦŦŦŦŦŦŦŦ.|||||||Ŧ",
"Ŧ......................Ŧ",
"ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ"
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "city_block_foundation_palette" ],
Expand Down Expand Up @@ -83,23 +83,23 @@
".................~~~~~..",
".................y~~~y..",
"yyyyyyyyyyyyyyyyyy~~~yy^",
"###############|||o*ooo|",
"#..............|t|D |",
"#.#############| |JJJ Q|",
"#.#...#...#...#|j* D Q|",
"#.#I..#...#.I.#||||*||||",
"#.#...#..I#...#.j......#",
"#.##u###u###u##........#",
"#......................#",
"#.####u#####u##.. .#",
"#.#.....#.....#..HH .#",
"#.#.....#.....#..HH .#",
"#.#.....#.....#.%%%%*%%#",
"#.#.....#.....#.%.....%#",
"#.#....I#...I.#.%PPPPP%#",
"#.#############.%%%%%%%#",
"#......................#",
"########################"
"ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ###o*ooo#",
"Ŧ..............#t#D #",
"Ŧ.ŦŦŦŦŦŦŦŦŦŦŦŦŦ# #JJJ Q#",
"Ŧ.Ŧ...Ŧ...Ŧ...Ŧ#j* D Q#",
"Ŧ.ŦI..Ŧ...Ŧ.I.Ŧ####*####",
"Ŧ.Ŧ...Ŧ..IŦ...Ŧ.j......Ŧ",
"Ŧ.ŦŦuŦŦŦuŦŦŦuŦŦ........Ŧ",
"Ŧ......................Ŧ",
"Ŧ.ŦŦŦŦuŦŦŦŦŦuŦŦ.. .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ..HH .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ..HH .Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ.||||*||Ŧ",
"Ŧ.Ŧ.....Ŧ.....Ŧ.|.....|Ŧ",
"Ŧ.Ŧ....IŦ...I.Ŧ.|PPPPP|Ŧ",
"Ŧ.ŦŦŦŦŦŦŦŦŦŦŦŦŦ.|||||||Ŧ",
"Ŧ......................Ŧ",
"ŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦŦ"
],
"flags": [ "ERASE_ALL_BEFORE_PLACING_TERRAIN" ],
"palettes": [ "city_block_foundation_palette" ],
Expand Down
10 changes: 7 additions & 3 deletions data/mods/No_Hope/mapgen_palettes/house_general_palette.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@
}
}
},
"palettes": [ "standard_domestic_palette", { "param": "damage_palette" }, { "param": "tidyness_palette" } ]
"palettes": [
"standard_domestic_palette",
{ "param": "damage_palette" },
{ "param": "tidyness_palette" },
"parametrized_walls_palette"
]
},
{
"type": "palette",
"id": "standard_domestic_palette",
"palettes": [ "parametrized_walls_palette" ],
"//": "Adjusts vanilla palette to make houses not using the above more damaged.",
"//1": "TODO: Would ideally copy-from the vanilla palette and only override what it changes if #73299 is resolved",
"toilets": { "t": { } },
Expand Down Expand Up @@ -116,8 +122,6 @@
"t_door_c"
],
"^": "t_gutter_downspout",
"|": "t_wall_w",
"#": "t_brick_wall",
":": "t_wall_glass",
"¶": "t_door_glass_c",
"-": "t_sidewalk",
Expand Down
25 changes: 4 additions & 21 deletions data/mods/No_Hope/mapgen_palettes/other_palettes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"type": "palette",
"id": "house_w_foundation_palette",
"//1": "TODO: These would ideally copy-from the vanilla palettes and only override what it changes if #73299 is resolved",
"palettes": [ "parametrized_walls_palette" ],
"furniture": {
"A": "f_stool",
"B": "f_rotary_clothesline",
Expand Down Expand Up @@ -50,7 +51,6 @@
"p": "t_region_groundcover_urban",
"X": "t_region_groundcover_urban",
" ": "t_floor",
"|": "t_wall_w",
"<": "t_wood_stairs_up",
">": "t_wood_stairs_down",
"o": [
Expand Down Expand Up @@ -277,10 +277,10 @@
{
"type": "palette",
"id": "office_doctor",
"palettes": [ "parametrized_walls_palette" ],
"terrain": {
" ": "t_region_groundcover_urban",
"!": "t_door_locked_interior",
"#": "t_wall_w",
"$": "t_floor",
"&": "t_floor",
"+": [ [ "t_door_b", 20 ], [ "t_door_frame", 10 ], [ "t_door_o", 70 ], [ "t_door_c", 5 ], [ "t_door_locked_interior", 3 ] ],
Expand Down Expand Up @@ -863,33 +863,16 @@
"type": "palette",
"id": "gun_store_palette",
"//": " P, U, S, h, F, e, |, o, k, z, c, and > are all still available for more terrain or furniture",
"palettes": [ "parametrized_walls_palette" ],
"toilets": { "&": { } },
"parameters": {
"interior_wall_type": {
"type": "ter_str_id",
"default": {
"distribution": [
[ "t_wall_b", 1 ],
[ "t_wall_g", 1 ],
[ "t_wall_p", 1 ],
[ "t_wall_P", 1 ],
[ "t_wall_r", 1 ],
[ "t_wall_w", 6 ],
[ "t_wall_y", 1 ]
]
}
}
},
"terrain": {
"-": "t_wall_w",
"#": "t_brick_wall",
"q": "t_thconc_floor",
"&": "t_thconc_floor",
":": "t_window_bars_alarm",
"+": [ [ "t_door_metal_pickable", 90 ], [ "t_door_metal_o", 5 ], [ "t_door_metal_c", 15 ] ],
"D": [ [ "t_door_o", 40 ], [ "t_door_c", 40 ], [ "t_door_locked_interior", 20 ] ],
",": [ [ "t_region_groundcover_urban", 100 ], [ "t_region_shrub", 10 ] ],
"I": { "param": "interior_wall_type", "fallback": "t_brick_wall" },
"@": "t_region_shrub_decorative",
"u": "t_region_shrub",
"B": "t_region_groundcover_barren",
Expand Down Expand Up @@ -949,7 +932,7 @@
"m": "f_rack",
"Y": "f_rack",
"y": "f_rack",
"|": "f_locker",
"F": "f_locker",
"Q": "f_rack",
"K": "f_rack",
"L": [ [ "f_rack_l", 65 ], [ "f_rack", 35 ] ],
Expand Down

0 comments on commit ebdb50b

Please sign in to comment.