diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_ne.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_ne.png new file mode 100644 index 0000000000..5e254f4b7f Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_ne.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_nw.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_nw.png new file mode 100644 index 0000000000..b8e52592e5 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_nw.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_se.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_se.png new file mode 100644 index 0000000000..955ea3f342 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_se.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_sw.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_sw.png new file mode 100644 index 0000000000..32a515e4a5 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_corner_sw.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ew.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ew.png new file mode 100644 index 0000000000..1621619503 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ew.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ns.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ns.png new file mode 100644 index 0000000000..7ffc1b8e28 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_edge_ns.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_e.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_e.png new file mode 100644 index 0000000000..1ef2262de9 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_e.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_n.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_n.png new file mode 100644 index 0000000000..b39506fa80 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_n.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_s.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_s.png new file mode 100644 index 0000000000..34fbea3720 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_s.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_w.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_w.png new file mode 100644 index 0000000000..18c5578c20 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/corpse_tentacle/tentacle_end_piece_w.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json new file mode 100644 index 0000000000..0f6f4671cf --- /dev/null +++ b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json @@ -0,0 +1,82 @@ +[ + { + "id": [ + "corpse_surface" + ], + "fg": "skull_light_red" + }, + { + "id": [ + "corpse_tentacle_surface_entry", + "corpse_tentacle_entry" + ], + "fg": "skull_blue" + }, + { + "id": "corpse_tentacle", + "fg": "skull_light_blue", + "multitile": true, + "additional_tiles": [ + { + "id": "corner", + "fg": [ + "tentacle_corner_nw", + "tentacle_corner_sw", + "tentacle_corner_se", + "tentacle_corner_ne" + ] + }, + { + "id": "edge", + "fg": [ + "tentacle_edge_ns", + "tentacle_edge_ew" + ] + }, + { + "id": "end_piece", + "fg": [ + "tentacle_end_piece_n", + "tentacle_end_piece_w", + "tentacle_end_piece_s", + "tentacle_end_piece_e" + ] + } + ] + }, + { + "id": [ + "corpse_bowels_mid", + "corpse_bowels_empty_edge", + "corpse_bowels_lcorner", + "corpse_bowels_rcorner", + "corpse_bowels_neck_left", + "corpse_bowels_neck_right", + "corpse_bowels_neck_edge_center" + ], + "fg": "pond_light_red" + }, + { + "id": [ + "corpse_bowels_tentacle_edge" + ], + "fg": "pond_red" + }, + { + "id": [ + "corpse_neck", + "corpse_neck_center", + "corpse_head_neck_center", + "corpse_head_neck_l", + "corpse_head_neck_r", + "corpse_head", + "corpse_head_lcorner", + "corpse_head_rcorner", + "corpse_head_edge", + "corpse_under_brain", + "corpse_brain", + "corpse_head_fin" + ], + "fg": "skull_red" + } +] diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json index a95c57bec3..a2e155e931 100644 --- a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json +++ b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_commercial.json @@ -1703,6 +1703,13 @@ ], "fg": "shop_pink" }, + { + "id": [ + "barber_shop", + "barber_shop_roof" + ], + "fg": "shop_light_blue" + }, { "id": [ "farm_supply_looted_1", diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json index 1888f0f594..9636e8276d 100644 --- a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json +++ b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_hardcoded.json @@ -86,8 +86,28 @@ "fg": "cave_brown" }, { - "id": "hive", - "fg": "hive_yellow" + "id": [ + "hive", + "hive_edge_00", + "hive_edge_01", + "hive_edge_02", + "hive_edge_10", + "hive_edge_12", + "hive_edge_20", + "hive_edge_21", + "hive_edge_22", + "hive_roof", + "hive_edge_00_roof", + "hive_edge_01_roof", + "hive_edge_02_roof", + "hive_edge_10_roof", + "hive_edge_12_roof", + "hive_edge_20_roof", + "hive_edge_21_roof", + "hive_edge_22_roof" + ], + "fg": "hive_yellow", + "//": "i dont believe this is actually hardcoded terrain now" }, { "id": "spider_pit", diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json index aabdce65af..3f37a92e3f 100644 --- a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json +++ b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_industrial.json @@ -1147,6 +1147,10 @@ ], "fg": "big_building_red" }, + { + "id": "solar_farm", + "fg": "square_yellow" + }, { "id": [ "wind_turbine_ground", diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json index 048b454310..848a38d059 100644 --- a/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json +++ b/gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_terrain_recreational.json @@ -848,7 +848,9 @@ "lodge_roof1", "lodge_roof2", "lodge_basement_residential1", - "lodge_basement_residential2" + "lodge_basement_residential2", + "lodge_basement_residential3", + "lodge_basement_residential4" ], "fg": "big_house_brown" }, diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_light_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_light_red.png new file mode 100644 index 0000000000..1eae761125 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_light_red.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_red.png new file mode 100644 index 0000000000..db144c0bbb Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/pond/pond_red.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_blue.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_blue.png new file mode 100644 index 0000000000..1464c65cc2 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_blue.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_blue.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_blue.png new file mode 100644 index 0000000000..e1d4889feb Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_blue.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_red.png new file mode 100644 index 0000000000..bd6cc452b9 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_light_red.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_red.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_red.png new file mode 100644 index 0000000000..fab7ac0b22 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/skull/skull_red.png differ diff --git a/gfx/Larwick_Overmap/pngs_overmap_16x16/square/square_yellow.png b/gfx/Larwick_Overmap/pngs_overmap_16x16/square/square_yellow.png new file mode 100644 index 0000000000..b8f9049cf8 Binary files /dev/null and b/gfx/Larwick_Overmap/pngs_overmap_16x16/square/square_yellow.png differ