Skip to content

Commit

Permalink
[Larwick] Solar corpse (#2212)
Browse files Browse the repository at this point in the history
* added: skull sprites [light red and blue]; [wip] corpse_tentacle sprites
connected: corpse_surface to light red skull; corpse_tentacle_*entry to blue skull; corpse_tentacle to various corpse_tentacle sprites

* added: light blue skull
changed: various corpse_tentacle sprites
removed: (effectively) unused tentacle sprites

* added: red pond, light red pond, red skull
connected: various 'corpse_bowels' to light red pond; 'corpse_bowels_tentacle_edge' to red pond, various corpse head related overmap tiles to red skull

* connected: various bee hive hives to yellow hive

* added: yellow square
connected: barber shop to light blue shop; solar farm to yellow square; residential hunting lodge basement 3 and 4 to big brown house
  • Loading branch information
Golfavel authored Nov 28, 2023
1 parent 598d004 commit d828924
Show file tree
Hide file tree
Showing 22 changed files with 118 additions and 3 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
82 changes: 82 additions & 0 deletions gfx/Larwick_Overmap/pngs_overmap_16x16/go_overmap_corpse.json
Original file line number Diff line number Diff line change
@@ -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"
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -1703,6 +1703,13 @@
],
"fg": "shop_pink"
},
{
"id": [
"barber_shop",
"barber_shop_roof"
],
"fg": "shop_light_blue"
},
{
"id": [
"farm_supply_looted_1",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1147,6 +1147,10 @@
],
"fg": "big_building_red"
},
{
"id": "solar_farm",
"fg": "square_yellow"
},
{
"id": [
"wind_turbine_ground",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit d828924

Please sign in to comment.