Skip to content

Commit

Permalink
Done.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pagoru
pagoru committed May 1, 2020
1 parent fb4db64 commit 5831053
Show file tree
Hide file tree
Showing 26 changed files with 498 additions and 87 deletions.
12 changes: 12 additions & 0 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
"html-webpack-plugin": "4.2.0",
"only-ttf-loader": "1.0.0",
"pathfinding": "^0.4.18",
"pixi-sound": "^3.0.4",
"pixi.js": "5.2.2",
"source-map-loader": "0.2.4",
"stats.js": "0.17.0",
Expand Down
Binary file modified src/assets/assets.xcf
View file
Binary file not shown.
Binary file added src/assets/gameover.mp3
View file
Binary file not shown.
196 changes: 176 additions & 20 deletions src/assets/map.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,192 @@
"x": 0,
"y": 0,
"tiles": [
[ 6, 3, 1, 1, 0, 2, 1, 3, 8],
[ 6, 0, 0, 0, 0, 0, 1, 0, 3],
[ 6, 0, 0, 1, 1, 0, 1, 0, 0],
[ 6, 0, 0, 0, 0, 0, 0, 0, 12],
[ 11, 9, 0, 12, 5, 0, 5, 5, 10],
[ -1, 6, 0, 3, 1, 1, 1, 1, 1]
]
[ 6, 3, 1, 1, 1, 1, 1, 2, 8 ],
[ 6, 0, 0, 0, 0, 0, 0, 0, 3 ],
[ 6, 0, 0, 0, 0, 0, 4, 0, 0 ],
[ 6, 0, 4, 0, 0, 0, 0, 0, 0 ],
[ 6, 0, 0, 0, 0, 0, 0, 0, 12 ],
[ 11, 5, 9, 0, 12, 5, 5, 5, 10 ]
]
},
{
"x": 1,
"y": 0,
"tiles": [
[ 6, 3, 1, 1, 1, 2, 0, 3, 8],
[ 6, 0, 0, 0, 0, 0, 0, 0, 3],
[ 0, 0, 0, 0, 1, 0, 0, 0, 0],
[ 6, 0, 0, 0, 0, 0, 0, 0, 12],
[ 10, 9, 0, 12, 5, 5, 5, 5, 11],
[ -1, 6, 0, 3, 1, 1, 1, 1, 1]
]
[ 6, 3, 1, 1, 1, 1, 1, 2, 8 ],
[ 2, 0, 0, 0, 0, 0, 0, 0, 8 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 8 ],
[ 0, 0, 0, 3, 1, 1, 1, 1, 1 ],
[ 9, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 11, 5, 5, 5, 5, 5, 5, 5, 5 ]
]
},
{
"x": 2,
"y": 0,
"tiles": [
[ -1, -1, -1, -1, -1, 6, 3, 1, 1 ],
[ 6, 3, 1, 2, 8, 6, 0, 0, 0 ],
[ 6, 0, 0, 0, 3, 2, 0, 4, 0 ],
[ 2, 0, 13, 0, 0, 0, 0, 0, 0 ],
[ 0, 0, 17, 0, 12, 9, 0, 0, 0 ],
[ 5, 5, 18, 5, 10, 11, 5, 5, 5 ]
]
},
{
"x": 3,
"y": 0,
"tiles": [
[1,1,1,1,1,1,1,2,8],
[0,0,0,0,0,0,0,0,8],
[0,0,4,0,0,0,4,0,8],
[0,0,0,0,0,0,0,0,8],
[0,0,0,0,0,0,0,0,8],
[5,5,5,5,5,5,5,5,10]
]
},
{
"x": 0,
"y": 1,
"tiles": [
[ 6, 3, 0, 1, 1, 2, 0, 3, 8],
[ 6, 0, 0, 0, 0, 0, 0, 0, 3],
[ 0, 0, 0, 0, 1, 0, 0, 0, 0],
[ 6, 0, 0, 0, 0, 0, 0, 0, 12],
[ 10, 9, 0, 12, 5, 5, 5, 5, 11],
[ -1, 6, 0, 3, 1, 1, 1, 1, 1]
[ -1, -1, 6, 0, 3, 2, 8, -1, -1 ],
[ -1, -1, 6, 0, 0, 0, 8, -1, -1 ],
[ -1, -1, 6, 0, 13, 0, 8, -1, -1 ],
[ -1, -1, 6, 0, 17, 0, 3, 1, 1 ],
[ -1, -1, 6, 0, 17, 0, 0, 0, 0 ],
[ -1, -1, 6, 0, 8, 5, 5, 5, 5 ]
]
},
{
"x": 1,
"y": 1,
"tiles": [
[ 6, 3, 1, 2, -1, 3, 1, 2, 8 ],
[ 6, 0, 0, 0, 17, 0, 0, 0, 8 ],
[ 6, 0, 0, 0, 17, 0, 0, 0, 8 ],
[ 1, 2, 0, 3, 1, 2, 0, 3, 1 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 5, 5, 5, 5, 5, 5, 5, 5, 5 ]
]
},
{
"x": 2,
"y": 1,
"tiles": [
[ 6, 3, 1, 2, -1, 3, 1, 2, 8 ],
[ 6, 0, 0, 0, 17, 0, 0, 0, 8 ],
[ 6, 0, 0, 0, 17, 0, 0, 0, 8 ],
[ 1, 2, 0, 3, 1, 2, 0, 3, 1 ],
[ 0, 0, 0, 0, 0, 0, 0, 0, 0 ],
[ 5, 5, 5, 5, 5, 5, 5, 5, 5 ]
]
},
{
"x": 3,
"y": 1,
"tiles": [
[-1,6,3,1,1,1,1,2,8],
[-1,6,0,0,0,0,0,0,8],
[-1,6,0,13,3,1,2,0,8],
[1,2,0,17,0,0,0,0,8],
[0,0,0,17,0,12,5,5,10],
[5,5,5,6,0,8,-1,-1,-1]
]
},
{
"x": 0,
"y": 2,
"tiles": [
[-1,6,4,0,3,1,1,1,1],
[-1,6,0,0,0,0,0,0,0],
[-1,6,0,13,0,13,0,12,5],
[-1,6,0,4,0,4,0,8,-1],
[-1,6,0,0,0,0,0,8,-1],
[-1,6,0,12,5,9,0,8,-1]
]
},
{
"x": 1,
"y": 2,
"tiles": [
[1,1,1,1,1,1,1,1,1],
[0,0,0,0,0,0,0,0,0],
[9,0,4,13,0,4,13,3,1],
[6,0,0,17,0,0,17,0,0],
[6,0,0,17,0,0,17,0,0],
[11,5,5,18,5,5,18,5,5]
]
},
{
"x": 2,
"y": 2,
"tiles": [
[1,1,1,1,1,1,1,1,1],
[0,0,0,0,0,0,0,0,0],
[0,4,13,0,4,13,0,4,12],
[0,0,17,0,0,17,0,0,8],
[0,0,17,0,0,17,0,0,8],
[5,5,18,5,5,18,5,5,10]
]
},
{
"x": 3,
"y": 2,
"tiles": [
[1,2,17,4,0,3,1,2,8],
[0,0,17,0,0,0,0,0,8],
[9,0,17,0,0,0,0,0,8],
[6,0,17,0,0,0,0,0,8],
[6,0,17,0,0,0,0,0,8],
[6,0,8,5,5,9,0,12,10]
]
},
{
"x": 0,
"y": 3,
"tiles": [
[6,4,0,4,17,4,0,3,1],
[6,0,0,0,17,0,0,0,0],
[6,0,0,0,17,0,0,0,0],
[6,0,0,0,17,0,0,0,0],
[6,0,0,0,17,0,0,0,0],
[11,5,5,5,18,5,5,5,5]
]
},
{
"x": 1,
"y": 3,
"tiles": [
[1,1,1,2,-1,-1,-1,-1,-1],
[0,0,0,0,3,1,2,8,-1],
[0,0,0,0,0,0,0,8,-1],
[0,0,0,0,0,0,0,8,-1],
[0,0,0,0,13,0,0,8,-1],
[5,5,5,5,6,0,0,8,-1]
]
},
{
"x": 2,
"y": 3,
"tiles": [
[6,3,2,17,3,1,1,2,8],
[6,0,0,17,0,0,0,0,8],
[6,0,0,17,0,0,0,0,8],
[6,0,3,2,0,3,1,1,1],
[6,0,0,0,0,0,0,0,0],
[11,5,5,5,5,5,5,5,5]
]
},
{
"x": 3,
"y": 3,
"tiles": [
[6,0,17,3,1,2,0,4,8],
[6,0,17,0,0,0,0,0,8],
[6,0,17,0,0,0,0,0,8],
[2,0,17,0,0,0,0,0,8],
[0,0,17,0,0,0,0,0,8],
[5,5,18,5,5,5,5,5,10]
]
}
]
Binary file added src/assets/map.xlsx
View file
Binary file not shown.
Binary file added src/assets/object.mp3
View file
Binary file not shown.
25 changes: 25 additions & 0 deletions src/assets/sprites.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,14 @@
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
"sourceSize": {"w":16,"h":16}
},
"tile_18":
{
"frame": {"x":144,"y":16,"w":16,"h":16},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":16,"h":16},
"sourceSize": {"w":16,"h":16}
},

"p1":
{
Expand Down Expand Up @@ -293,6 +301,15 @@
"sourceSize": {"w":16,"h":16}
},

"uwu":
{
"frame": {"x":0,"y":52,"w":17,"h":12},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":17,"h":12},
"sourceSize": {"w":17,"h":12}
},

"text_score":
{
"frame": {"x":64,"y":128,"w":30,"h":7},
Expand Down Expand Up @@ -397,6 +414,14 @@
"spriteSourceSize": {"x":0,"y":0,"w":8,"h":9},
"sourceSize": {"w":8,"h":9}
},
"splash":
{
"frame": {"x":48,"y":48,"w":48,"h":15},
"rotated": false,
"trimmed": true,
"spriteSourceSize": {"x":0,"y":0,"w":48,"h":15},
"sourceSize": {"w":48,"h":15}
},

"text_marta":
{
Expand Down
Binary file modified src/assets/sprites.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 modified src/assets/sprites.xcf
View file
Binary file not shown.
Binary file added src/assets/theme.mp3
View file
Binary file not shown.
Binary file added src/assets/uwu.mp3
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions src/game/Camera.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ export class Camera {

canvas.stage().position.copyFrom(position);
canvas.uiLayout.position.copyFrom(canvasPosition);
canvas.insertCoinInterface.position.copyFrom(canvasPosition);
canvas.gameOverInterface.position.copyFrom(canvasPosition);
}

}
Loading

0 comments on commit 5831053

Please sign in to comment.