Skip to content

Commit

Permalink
add christmas decorations tilesets
Browse files Browse the repository at this point in the history
  • Loading branch information
@asiaziola
asiaziola committed Dec 16, 2024
1 parent 4aac572 commit 179df5e
Show file tree
Hide file tree
Showing 12 changed files with 157 additions and 31 deletions.
121 changes: 106 additions & 15 deletions public/assets/maps/v2/snow/iceicebaby.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@
{
"columns":2,
"firstgid":1,
"image":"tilesets\/48px+MVMZ\/!$door.png",
"image":"tilesets\/!$door.png",
"imageheight":216,
"imagewidth":111,
"margin":0,
Expand All @@ -382,7 +382,7 @@
{
"columns":21,
"firstgid":9,
"image":"tilesets\/48px+MVMZ\/!$lighthouseani.png",
"image":"tilesets\/!$lighthouseani.png",
"imageheight":960,
"imagewidth":1008,
"margin":0,
Expand All @@ -395,7 +395,7 @@
{
"columns":49,
"firstgid":429,
"image":"tilesets\/48px+MVMZ\/non-rm-a1-square.png",
"image":"tilesets\/non-rm-a1-square.png",
"imageheight":480,
"imagewidth":2352,
"margin":0,
Expand All @@ -408,7 +408,7 @@
{
"columns":49,
"firstgid":919,
"image":"tilesets\/48px+MVMZ\/non-rm-a2-square.png",
"image":"tilesets\/non-rm-a2-square.png",
"imageheight":3504,
"imagewidth":2352,
"margin":0,
Expand All @@ -421,7 +421,7 @@
{
"columns":49,
"firstgid":4496,
"image":"tilesets\/48px+MVMZ\/non-rm-a3.png",
"image":"tilesets\/non-rm-a3.png",
"imageheight":336,
"imagewidth":2352,
"margin":0,
Expand All @@ -434,7 +434,7 @@
{
"columns":49,
"firstgid":4839,
"image":"tilesets\/48px+MVMZ\/non-rm-a4-square.png",
"image":"tilesets\/non-rm-a4-square.png",
"imageheight":3504,
"imagewidth":2352,
"margin":0,
Expand All @@ -447,7 +447,7 @@
{
"columns":16,
"firstgid":8416,
"image":"tilesets\/48px+MVMZ\/Snow_A1.png",
"image":"tilesets\/Snow_A1.png",
"imageheight":576,
"imagewidth":768,
"margin":0,
Expand All @@ -460,7 +460,7 @@
{
"columns":16,
"firstgid":8608,
"image":"tilesets\/48px+MVMZ\/Snow_A2.png",
"image":"tilesets\/Snow_A2.png",
"imageheight":576,
"imagewidth":768,
"margin":0,
Expand All @@ -473,7 +473,7 @@
{
"columns":16,
"firstgid":8800,
"image":"tilesets\/48px+MVMZ\/Snow_A3.png",
"image":"tilesets\/Snow_A3.png",
"imageheight":384,
"imagewidth":768,
"margin":0,
Expand All @@ -486,7 +486,7 @@
{
"columns":16,
"firstgid":8928,
"image":"tilesets\/48px+MVMZ\/Snow_A4.png",
"image":"tilesets\/Snow_A4.png",
"imageheight":720,
"imagewidth":768,
"margin":0,
Expand All @@ -499,7 +499,7 @@
{
"columns":8,
"firstgid":9168,
"image":"tilesets\/48px+MVMZ\/Snow_A5.png",
"image":"tilesets\/Snow_A5.png",
"imageheight":768,
"imagewidth":384,
"margin":0,
Expand All @@ -512,7 +512,7 @@
{
"columns":16,
"firstgid":9296,
"image":"tilesets\/48px+MVMZ\/Snow_B.png",
"image":"tilesets\/Snow_B.png",
"imageheight":768,
"imagewidth":768,
"margin":0,
Expand All @@ -525,7 +525,7 @@
{
"columns":16,
"firstgid":9552,
"image":"tilesets\/48px+MVMZ\/Snow_C.png",
"image":"tilesets\/Snow_C.png",
"imageheight":768,
"imagewidth":768,
"margin":0,
Expand All @@ -538,7 +538,7 @@
{
"columns":16,
"firstgid":9808,
"image":"tilesets\/48px+MVMZ\/Snow_D.png",
"image":"tilesets\/Snow_D.png",
"imageheight":768,
"imagewidth":768,
"margin":0,
Expand All @@ -551,7 +551,7 @@
{
"columns":16,
"firstgid":10064,
"image":"tilesets\/48px+MVMZ\/Snow_E.png",
"image":"tilesets\/Snow_E.png",
"imageheight":768,
"imagewidth":768,
"margin":0,
Expand All @@ -560,6 +560,97 @@
"tilecount":256,
"tileheight":48,
"tilewidth":48
},
{
"columns":16,
"firstgid":10320,
"image":"tilesets\/Chr_A2.png",
"imageheight":576,
"imagewidth":768,
"margin":0,
"name":"Chr_A2",
"spacing":0,
"tilecount":192,
"tileheight":48,
"tilewidth":48
},
{
"columns":16,
"firstgid":10512,
"image":"tilesets\/Chr_B.png",
"imageheight":768,
"imagewidth":768,
"margin":0,
"name":"Chr_B",
"spacing":0,
"tilecount":256,
"tileheight":48,
"tilewidth":48
},
{
"columns":49,
"firstgid":10768,
"image":"tilesets\/Chr_non-rm-a2-square.png",
"imageheight":1344,
"imagewidth":2352,
"margin":0,
"name":"Chr_non-rm-a2-square",
"spacing":0,
"tilecount":1372,
"tileheight":48,
"tilewidth":48
},
{
"columns":9,
"firstgid":12140,
"image":"tilesets\/animations\/$oldtruck_tree.png",
"imageheight":576,
"imagewidth":432,
"margin":0,
"name":"$oldtruck_tree",
"spacing":0,
"tilecount":108,
"tileheight":48,
"tilewidth":48
},
{
"columns":9,
"firstgid":12248,
"image":"tilesets\/animations\/$oldtruck.png",
"imageheight":576,
"imagewidth":432,
"margin":0,
"name":"$oldtruck",
"spacing":0,
"tilecount":108,
"tileheight":48,
"tilewidth":48
},
{
"columns":6,
"firstgid":12356,
"image":"tilesets\/animations\/$sleigh.png",
"imageheight":384,
"imagewidth":288,
"margin":0,
"name":"$sleigh",
"spacing":0,
"tilecount":48,
"tileheight":48,
"tilewidth":48
},
{
"columns":9,
"firstgid":12404,
"image":"tilesets\/animations\/$snowglobe.png",
"imageheight":576,
"imagewidth":432,
"margin":0,
"name":"$snowglobe",
"spacing":0,
"tilecount":108,
"tileheight":48,
"tilewidth":48
}],
"tilewidth":48,
"type":"map",
Expand Down
51 changes: 36 additions & 15 deletions public/assets/maps/v2/snow/iceicebaby.tmx
View file
Original file line number Diff line number Diff line change
@@ -1,49 +1,70 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.10.2" orientation="orthogonal" renderorder="right-down" width="40" height="40" tilewidth="48" tileheight="48" infinite="0" nextlayerid="8" nextobjectid="1">
<tileset firstgid="1" name="!$door" tilewidth="48" tileheight="48" tilecount="8" columns="2">
<image source="tilesets/48px+MVMZ/!$door.png" width="111" height="216"/>
<image source="tilesets/!$door.png" width="111" height="216"/>
</tileset>
<tileset firstgid="9" name="!$lighthouseani" tilewidth="48" tileheight="48" tilecount="420" columns="21">
<image source="tilesets/48px+MVMZ/!$lighthouseani.png" width="1008" height="960"/>
<image source="tilesets/!$lighthouseani.png" width="1008" height="960"/>
</tileset>
<tileset firstgid="429" name="non-rm-a1-square" tilewidth="48" tileheight="48" tilecount="490" columns="49">
<image source="tilesets/48px+MVMZ/non-rm-a1-square.png" width="2352" height="480"/>
<image source="tilesets/non-rm-a1-square.png" width="2352" height="480"/>
</tileset>
<tileset firstgid="919" name="non-rm-a2-square" tilewidth="48" tileheight="48" tilecount="3577" columns="49">
<image source="tilesets/48px+MVMZ/non-rm-a2-square.png" width="2352" height="3504"/>
<image source="tilesets/non-rm-a2-square.png" width="2352" height="3504"/>
</tileset>
<tileset firstgid="4496" name="non-rm-a3" tilewidth="48" tileheight="48" tilecount="343" columns="49">
<image source="tilesets/48px+MVMZ/non-rm-a3.png" width="2352" height="336"/>
<image source="tilesets/non-rm-a3.png" width="2352" height="336"/>
</tileset>
<tileset firstgid="4839" name="non-rm-a4-square" tilewidth="48" tileheight="48" tilecount="3577" columns="49">
<image source="tilesets/48px+MVMZ/non-rm-a4-square.png" width="2352" height="3504"/>
<image source="tilesets/non-rm-a4-square.png" width="2352" height="3504"/>
</tileset>
<tileset firstgid="8416" name="Snow_A1" tilewidth="48" tileheight="48" tilecount="192" columns="16">
<image source="tilesets/48px+MVMZ/Snow_A1.png" width="768" height="576"/>
<image source="tilesets/Snow_A1.png" width="768" height="576"/>
</tileset>
<tileset firstgid="8608" name="Snow_A2" tilewidth="48" tileheight="48" tilecount="192" columns="16">
<image source="tilesets/48px+MVMZ/Snow_A2.png" width="768" height="576"/>
<image source="tilesets/Snow_A2.png" width="768" height="576"/>
</tileset>
<tileset firstgid="8800" name="Snow_A3" tilewidth="48" tileheight="48" tilecount="128" columns="16">
<image source="tilesets/48px+MVMZ/Snow_A3.png" width="768" height="384"/>
<image source="tilesets/Snow_A3.png" width="768" height="384"/>
</tileset>
<tileset firstgid="8928" name="Snow_A4" tilewidth="48" tileheight="48" tilecount="240" columns="16">
<image source="tilesets/48px+MVMZ/Snow_A4.png" width="768" height="720"/>
<image source="tilesets/Snow_A4.png" width="768" height="720"/>
</tileset>
<tileset firstgid="9168" name="Snow_A5" tilewidth="48" tileheight="48" tilecount="128" columns="8">
<image source="tilesets/48px+MVMZ/Snow_A5.png" width="384" height="768"/>
<image source="tilesets/Snow_A5.png" width="384" height="768"/>
</tileset>
<tileset firstgid="9296" name="Snow_B" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="tilesets/48px+MVMZ/Snow_B.png" width="768" height="768"/>
<image source="tilesets/Snow_B.png" width="768" height="768"/>
</tileset>
<tileset firstgid="9552" name="Snow_C" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="tilesets/48px+MVMZ/Snow_C.png" width="768" height="768"/>
<image source="tilesets/Snow_C.png" width="768" height="768"/>
</tileset>
<tileset firstgid="9808" name="Snow_D" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="tilesets/48px+MVMZ/Snow_D.png" width="768" height="768"/>
<image source="tilesets/Snow_D.png" width="768" height="768"/>
</tileset>
<tileset firstgid="10064" name="Snow_E" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="tilesets/48px+MVMZ/Snow_E.png" width="768" height="768"/>
<image source="tilesets/Snow_E.png" width="768" height="768"/>
</tileset>
<tileset firstgid="10320" name="Chr_A2" tilewidth="48" tileheight="48" tilecount="192" columns="16">
<image source="tilesets/Chr_A2.png" width="768" height="576"/>
</tileset>
<tileset firstgid="10512" name="Chr_B" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="tilesets/Chr_B.png" width="768" height="768"/>
</tileset>
<tileset firstgid="10768" name="Chr_non-rm-a2-square" tilewidth="48" tileheight="48" tilecount="1372" columns="49">
<image source="tilesets/Chr_non-rm-a2-square.png" width="2352" height="1344"/>
</tileset>
<tileset firstgid="12140" name="$oldtruck_tree" tilewidth="48" tileheight="48" tilecount="108" columns="9">
<image source="tilesets/animations/$oldtruck_tree.png" width="432" height="576"/>
</tileset>
<tileset firstgid="12248" name="$oldtruck" tilewidth="48" tileheight="48" tilecount="108" columns="9">
<image source="tilesets/animations/$oldtruck.png" width="432" height="576"/>
</tileset>
<tileset firstgid="12356" name="$sleigh" tilewidth="48" tileheight="48" tilecount="48" columns="6">
<image source="tilesets/animations/$sleigh.png" width="288" height="384"/>
</tileset>
<tileset firstgid="12404" name="$snowglobe" tilewidth="48" tileheight="48" tilecount="108" columns="9">
<image source="tilesets/animations/$snowglobe.png" width="432" height="576"/>
</tileset>
<layer id="1" name="Tile Layer 1" width="40" height="40">
<data encoding="csv">
Expand Down
Binary file added public/assets/maps/v2/snow/tilesets/$oldtruck.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/$oldtruck_tree.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/$sleigh.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/$snowglobe.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/Chr_A2.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/Chr_B.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/maps/v2/snow/tilesets/Chr_non-rm-a2-square.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/game/common/mapsLayersConst.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const DEV_MAP = 'ice';

const maps_snow = {
ice: {
txId: '26RNvNr3dA0UHmftRz4T5fvwRGRm0rAk4jNKmzYviWs',
txId: 'cgdenV9nHYPjqvdc6oIBXhNM5enoOPMbYQXndvQ2WMA',
music: 'backgroundMusicMetal',
},
};
Expand Down
7 changes: 7 additions & 0 deletions src/game/scenes/main-scene/maps.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,13 @@ export function doCreateTileMap(mainScene) {
mainScene.tileMap.addTilesetImage('Snow_C', 'Snow_C'),
mainScene.tileMap.addTilesetImage('Snow_D', 'Snow_D'),
mainScene.tileMap.addTilesetImage('Snow_E', 'Snow_E'),
mainScene.tileMap.addTilesetImage('$oldtruck_tree', '$oldtruck_tree'),
mainScene.tileMap.addTilesetImage('$oldtruck', '$oldtruck'),
mainScene.tileMap.addTilesetImage('$snowglobe', '$snowglobe'),
mainScene.tileMap.addTilesetImage('$sleigh', '$sleigh'),
mainScene.tileMap.addTilesetImage('Chr_A2', 'Chr_A2'),
mainScene.tileMap.addTilesetImage('Chr_B', 'Chr_B'),
mainScene.tileMap.addTilesetImage('Chr_non-rm-a2-square', 'Chr_non-rm-a2-square'),
];
const layers = mainScene.tileMap.getTileLayerNames();
let frontLayerDepth = FRONT_LAYER_DEPTH;
Expand Down
7 changes: 7 additions & 0 deletions src/game/scenes/main-scene/preload.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,4 +210,11 @@ function preloadHauntedMapAssets(mainScene) {
loadSpriteSheet(mainScene, 'Snow_C', 'assets/maps/v2/snow/tilesets/Snow_C.png');
loadSpriteSheet(mainScene, 'Snow_D', 'assets/maps/v2/snow/tilesets/Snow_D.png');
loadSpriteSheet(mainScene, 'Snow_E', 'assets/maps/v2/snow/tilesets/Snow_E.png');
loadSpriteSheet(mainScene, '$oldtruck_tree', 'assets/maps/v2/snow/tilesets/$oldtruck_tree.png');
loadSpriteSheet(mainScene, '$oldtruck', 'assets/maps/v2/snow/tilesets/$oldtruck.png');
loadSpriteSheet(mainScene, '$snowglobe', 'assets/maps/v2/snow/tilesets/$snowglobe.png');
loadSpriteSheet(mainScene, '$sleigh', 'assets/maps/v2/snow/tilesets/$sleigh.png');
loadSpriteSheet(mainScene, 'Chr_A2', 'assets/maps/v2/snow/tilesets/Chr_A2.png');
loadSpriteSheet(mainScene, 'Chr_B', 'assets/maps/v2/snow/tilesets/Chr_B.png');
loadSpriteSheet(mainScene, 'Chr_non-rm-a2-square', 'assets/maps/v2/snow/tilesets/Chr_non-rm-a2-square.png');
}

0 comments on commit 179df5e

Please sign in to comment.