diff --git a/.github/workflows/Altica_ci_build.yml b/.github/workflows/Altica_ci_build.yml index 928d4e01ab..c724670dc2 100644 --- a/.github/workflows/Altica_ci_build.yml +++ b/.github/workflows/Altica_ci_build.yml @@ -63,4 +63,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: ${{ steps.build.outputs.artifact_name }} - path: ${{ steps.build.outputs.artifact_name }} \ No newline at end of file + path: ${{ steps.build.outputs.artifact_name }} diff --git a/.github/workflows/Ultica_ci_build.yml b/.github/workflows/Ultica_ci_build.yml index 3ffc6fa5ea..4d24832811 100644 --- a/.github/workflows/Ultica_ci_build.yml +++ b/.github/workflows/Ultica_ci_build.yml @@ -54,6 +54,7 @@ jobs: mv "${BUILD_DIR}"/*.png "$artifact_name" mv "$BUILD_DIR/tile_config.json" "$artifact_name" mv "gfx/$TILESET/tileset.txt" "$artifact_name" + mv "gfx/$TILESET/layering.json" "$artifact_name" echo ::set-output name=artifact_name::"$artifact_name" diff --git a/gfx/UltimateCataclysm/layering.json b/gfx/UltimateCataclysm/layering.json new file mode 100644 index 0000000000..0d959ab3ef --- /dev/null +++ b/gfx/UltimateCataclysm/layering.json @@ -0,0 +1,79 @@ +{ +"item_variants": [ + { + "context": "f_desk", + "variants": [ + { + "item": "laptop", + "sprite": [{"id": "desk_laptop", "weight": 1}], + "layer": 90 + }, + { + "item": "pen", + "sprite": [{"id": "desk_pen_1", "weight": 2}, {"id": "desk_pen_2", "weight": 2}], + "layer": 100 + } + ] + }, + { + "context": "f_oven", + "variants": [ + { + "item": "pan", + "sprite": [{"id": "oven_pan_1", "weight": 1}, {"id": "oven_pan_2", "weight": 1}], + "layer": 100 + } + ] + }, + { + "context": "f_cupboard", + "variants": [ + { + "item": "battery_charger", + "sprite": [{"id": "cupboard_battery_charger", "weight": 1}], + "layer": 90 + }, + { + "item": "box_small", + "sprite": [{"id": "cupboard_box_small", "weight": 1}], + "layer": 90 + }, + { + "item": "candle", + "sprite": [{"id": "cupboard_candle", "weight": 1}], + "layer": 90 + }, + { + "item": "matches", + "sprite": [{"id": "cupboard_matches", "weight": 1}], + "layer": 90 + } + ] + }, + { + "context": "f_sink", + "variants": [ + { + "item": "box_small", + "sprite": [{"id": "sink_box_small", "weight": 1}], + "layer": 90 + }, + { + "item": "brush", + "sprite": [{"id": "sink_brush", "weight": 1}], + "layer": 90 + }, + { + "item": "dish_towel", + "sprite": [{"id": "sink_dish_towel", "weight": 1}], + "layer": 90 + }, + { + "item": "sponge", + "sprite": [{"id": "sink_sponge", "weight": 1}], + "layer": 90 + } + ] + } +] +} diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_battery_charger.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_battery_charger.png new file mode 100644 index 0000000000..7fa7b04c5d Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_battery_charger.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_box_small.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_box_small.png new file mode 100644 index 0000000000..2430d38f46 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_box_small.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_candle.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_candle.png new file mode 100644 index 0000000000..e371a963a1 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_candle.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_matches.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_matches.png new file mode 100644 index 0000000000..b50cdb7d39 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/cupboard_matches.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_1.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_1.png new file mode 100644 index 0000000000..1c7b158e0e Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_1.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_2.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_2.png new file mode 100644 index 0000000000..332d0cd650 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/desk_pen_2.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_box_small.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_box_small.png new file mode 100644 index 0000000000..378965d36c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_box_small.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_brush.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_brush.png new file mode 100644 index 0000000000..8b7602549c Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_brush.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_dish_towel.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_dish_towel.png new file mode 100644 index 0000000000..2dca143555 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_dish_towel.png differ diff --git a/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_sponge.png b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_sponge.png new file mode 100644 index 0000000000..45be0199af Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_incomplete_32x32/layers/sink_sponge.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/layers/desk_laptop.png b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/desk_laptop.png new file mode 100644 index 0000000000..0de545ae30 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/desk_laptop.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_1.png b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_1.png new file mode 100644 index 0000000000..886fc421d2 Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_1.png differ diff --git a/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_2.png b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_2.png new file mode 100644 index 0000000000..cfb492da2f Binary files /dev/null and b/gfx/UltimateCataclysm/pngs_tall_32x64/layers/oven_pan_2.png differ