Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

last christmas #112

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
Open

last christmas #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4aac572
Last Christmas
asiaziola Dec 16, 2024
179df5e
add christmas decorations tilesets
asiaziola Dec 16, 2024
9a06da7
snow map b4m2 winter is coming
Tadeuchi Dec 17, 2024
c005441
frozen
asiaziola Dec 17, 2024
f7c6ec6
christmas music
asiaziola Dec 17, 2024
6538e63
snow map b4m2 - collisions update
Tadeuchi Dec 18, 2024
f268e03
all i want for christmas is you
asiaziola Dec 18, 2024
9808249
snow map b4m3
Tadeuchi Dec 18, 2024
341e8ae
hazard: gift sprite and hohoho music effect
Tadeuchi Dec 19, 2024
26a8112
snow map b2m3se
Tadeuchi Dec 19, 2024
ce7fa51
jingle bells
asiaziola Dec 20, 2024
6be8870
silent night
asiaziola Dec 20, 2024
fbeff54
did I mention Cyberbeavers ($DAM) Collection?
Tadeuchi Dec 20, 2024
1efa4a4
xmas internal testing
Tadeuchi Dec 20, 2024
c322563
xmas internal testing - remove teams from horde and add gifts
asiaziola Dec 20, 2024
2ba4938
xmas internal testing - remove teams from horde and add gifts
asiaziola Dec 20, 2024
ca499a5
christmas B U G
asiaziola Dec 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lua/token/token.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Denomination = Denomination or 0
Balances = Balances or { [ao.id] = 10000000000000000 }
TotalSupply = TotalSupply or 10000000000000000
Name = Name or 'CyberBeaver Coin'
Ticker = Ticker or 'CBCOINS'
Ticker = 'DAM'
Logo = Logo or 'WATOlqtoEaO2IsZyUaG-en3qLxPwUnCKLu3SnEm42SY'

--[[
Expand Down
Binary file added public/assets/audio/christmas_1.mp3
View file
Open in desktop
Binary file not shown.
Binary file added public/assets/audio/christmas_2.mp3
View file
Open in desktop
Binary file not shown.
Binary file added public/assets/audio/hohoho.mp3
View file
Open in desktop
Binary file not shown.
Binary file added public/assets/images/christmas.jpg
View file
Open in desktop
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/images/christmas_ice.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/game_objects.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified public/assets/images/game_objects.xcf
View file
Open in desktop
Binary file not shown.
109 changes: 108 additions & 1 deletion public/assets/maps/v2/city/b2m3.tmx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="48" tileheight="48" infinite="0" nextlayerid="15" nextobjectid="1">
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="right-down" width="30" height="30" tilewidth="48" tileheight="48" infinite="0" nextlayerid="17" nextobjectid="1">
<editorsettings>
<export target="b2m3.json" format="json"/>
</editorsettings>
Expand All @@ -18,6 +18,45 @@
<tileset firstgid="3929" name="CC_City_Exterior__A4" tilewidth="48" tileheight="48" tilecount="240" columns="16">
<image source="tilesets/CC_City_Exterior__A4.png" width="768" height="720"/>
</tileset>
<tileset firstgid="4169" name="non-rm-a1-square" tilewidth="48" tileheight="48" tilecount="490" columns="49">
<image source="../snow/tilesets/non-rm-a1-square.png" width="2352" height="480"/>
</tileset>
<tileset firstgid="4659" name="non-rm-a2-square" tilewidth="48" tileheight="48" tilecount="3577" columns="49">
<image source="../snow/tilesets/non-rm-a2-square.png" width="2352" height="3504"/>
</tileset>
<tileset firstgid="8236" name="non-rm-a3" tilewidth="48" tileheight="48" tilecount="343" columns="49">
<image source="../snow/tilesets/non-rm-a3.png" width="2352" height="336"/>
</tileset>
<tileset firstgid="8579" name="non-rm-a4-square" tilewidth="48" tileheight="48" tilecount="3577" columns="49">
<image source="../snow/tilesets/non-rm-a4-square.png" width="2352" height="3504"/>
</tileset>
<tileset firstgid="12156" name="Snow_A1" tilewidth="48" tileheight="48" tilecount="192" columns="16">
<image source="../snow/tilesets/Snow_A1.png" width="768" height="576"/>
</tileset>
<tileset firstgid="12348" name="Snow_A2" tilewidth="48" tileheight="48" tilecount="192" columns="16">
<image source="../snow/tilesets/Snow_A2.png" width="768" height="576"/>
</tileset>
<tileset firstgid="12540" name="Snow_A3" tilewidth="48" tileheight="48" tilecount="128" columns="16">
<image source="../snow/tilesets/Snow_A3.png" width="768" height="384"/>
</tileset>
<tileset firstgid="12668" name="Snow_A4" tilewidth="48" tileheight="48" tilecount="240" columns="16">
<image source="../snow/tilesets/Snow_A4.png" width="768" height="720"/>
</tileset>
<tileset firstgid="12908" name="Snow_A5" tilewidth="48" tileheight="48" tilecount="128" columns="8">
<image source="../snow/tilesets/Snow_A5.png" width="384" height="768"/>
</tileset>
<tileset firstgid="13036" name="Snow_B" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="../snow/tilesets/Snow_B.png" width="768" height="768"/>
</tileset>
<tileset firstgid="13292" name="Snow_C" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="../snow/tilesets/Snow_C.png" width="768" height="768"/>
</tileset>
<tileset firstgid="13548" name="Snow_D" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="../snow/tilesets/Snow_D.png" width="768" height="768"/>
</tileset>
<tileset firstgid="13804" name="Snow_E" tilewidth="48" tileheight="48" tilecount="256" columns="16">
<image source="../snow/tilesets/Snow_E.png" width="768" height="768"/>
</tileset>
<layer id="11" name="ground" width="30" height="30">
<data encoding="csv">
723,723,723,723,723,723,723,723,723,723,723,723,723,2260,723,723,723,723,4,723,723,723,723,723,723,723,723,723,723,723,
Expand Down Expand Up @@ -152,6 +191,40 @@
3428,3429,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3458,3458,0,0,3458,3458,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,3865,0,0,3866,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,3473,3473,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<layer id="15" name="xmas_deco" width="30" height="30">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13269,13270,0,0,0,0,13269,13270,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13285,13286,0,0,0,0,13285,13286,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,12372,0,12372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,12372,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,12372,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,12378,12379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,12394,12395,12378,12379,0,0,0,0,12372,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,12394,12395,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,12378,12379,0,0,0,0,0,0,0,0,0,0,0,0,8392,8393,8394,8392,8393,8394,0,0,0,0,
0,0,0,0,0,0,12394,12395,0,0,0,0,0,0,0,0,0,0,0,0,8392,8393,8394,8392,8393,8394,0,0,0,0,
0,0,0,0,0,0,12378,12379,0,12378,12379,0,0,0,0,0,0,0,0,0,8392,8393,8394,8392,8393,8394,0,0,0,0,
0,0,0,0,0,0,12394,12395,0,12394,12395,0,0,0,0,0,0,0,0,0,8392,8393,8394,8392,8393,8394,0,0,0,0,
0,12378,12379,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13092,13252,13096,13096,13097,13098,13094,13095,0,0,0,
0,12394,12395,0,0,0,0,0,0,0,0,0,0,12356,0,0,0,0,12356,0,13268,0,0,0,0,0,0,0,12356,12356,
0,0,0,0,0,0,0,0,0,0,0,0,0,12372,0,0,0,0,12372,0,13284,0,0,0,0,0,0,0,12372,12372,
0,0,0,0,12378,12379,0,0,0,0,0,0,0,12388,0,0,0,0,12356,12356,12356,12356,12356,12356,12356,12356,12356,12356,12388,12388,
0,0,0,0,12394,12395,0,0,0,0,0,0,0,12372,0,0,0,0,12372,12372,12372,12372,12372,12372,12372,12372,12372,12372,12372,12372,
0,0,0,0,12378,12379,0,0,0,0,0,0,0,12388,0,0,0,0,12356,12356,12388,12388,12388,12388,12388,12388,12388,12388,12388,12388,
0,0,0,0,12394,12395,0,0,0,12378,12379,0,0,12372,0,0,0,0,12372,12356,12388,0,0,0,0,0,0,12356,12372,12356,
0,0,0,0,0,0,0,0,0,12394,12395,0,0,12388,0,0,0,0,12356,12372,12356,0,0,0,0,0,0,12372,12388,12372,
0,0,0,0,0,0,0,0,0,0,0,0,0,12372,0,0,0,0,12372,12356,12372,0,0,0,0,0,0,12388,12388,12388,
13111,13113,13098,13092,13093,13098,13096,13097,13092,13093,13097,13098,13110,12388,0,0,0,0,12388,12372,12388,0,0,0,0,0,0,12356,12356,12372,
13127,13129,0,0,0,0,0,0,0,0,0,0,13126,12356,0,0,0,0,12356,12356,0,0,0,0,0,0,0,12372,12356,12388,
13143,13145,0,0,0,0,0,0,0,0,0,0,0,12372,0,0,0,0,12356,12356,12356,0,0,0,12356,0,0,12388,12356,12356,
0,0,0,0,0,0,0,0,0,0,0,0,0,12388,0,0,0,0,12372,12372,12372,12356,12356,12356,12372,12356,12356,12372,12372,12372,
0,0,0,0,0,0,0,0,0,0,0,0,0,12388,0,0,0,0,12388,12388,12388,12372,12372,12372,12388,12372,12372,12388,12388,12388
</data>
</layer>
<layer id="9" name="items" width="30" height="30">
Expand Down Expand Up @@ -254,6 +327,40 @@
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
3730,3730,3730,3730,3730,3730,3730,3730,3730,3730,3730,3730,3730,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
3731,3730,3731,3730,3731,3731,3730,3730,3731,3731,3731,3731,3731,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<layer id="16" name="fonrt_xmas" width="30" height="30">
<data encoding="csv">
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,13096,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
13094,13095,0,13220,13221,13222,0,0,13220,13222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,13236,13237,13238,0,0,13236,13238,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
</data>
</layer>
<layer id="13" name="collisions" width="30" height="30" visible="0">
Expand Down
Loading