Skip to content

Commit 2026943

Browse files
Change character
1 parent f755ea3 commit 2026943

8 files changed

Lines changed: 173 additions & 112 deletions

File tree

.github/makecode/blocks.png

-753 Bytes
Loading

images.g.jres

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"image2": {
3+
"data": "hwQBAAEAAAAAAAAA",
4+
"mimeType": "image/x-mkcd-f4",
5+
"displayName": "camera_reference"
6+
},
7+
"image1": {
8+
"data": "hwQMAAwAAAAAAAAAAAAAAAAAAAAAAAAAAMzMzMwAAAAAvLu7ywAAAAC8zLvLAAAAALy7u8sAAAAAvLu7ywAAAAC8zLvLAAAAALy7u8sAAAAAzMzMzAAAAAAAAAAAAAAAAAAAAAAAAAA=",
9+
"mimeType": "image/x-mkcd-f4",
10+
"displayName": "character"
11+
},
12+
"*": {
13+
"mimeType": "image/x-mkcd-f4",
14+
"dataEncoding": "base64",
15+
"namespace": "myImages"
16+
}
17+
}

images.g.ts

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// Auto-generated code. Do not edit.
2+
namespace myImages {
3+
4+
helpers._registerFactory("image", function(name: string) {
5+
switch(helpers.stringTrim(name)) {
6+
case "image2":
7+
case "camera_reference":return img`
8+
.
9+
`;
10+
case "image1":
11+
case "character":return img`
12+
. . . . . . . . . . . .
13+
. . . . . . . . . . . .
14+
. . c c c c c c c c . .
15+
. . c b b b b b b c . .
16+
. . c b c b b c b c . .
17+
. . c b c b b c b c . .
18+
. . c b b b b b b c . .
19+
. . c b b b b b b c . .
20+
. . c b b b b b b c . .
21+
. . c c c c c c c c . .
22+
. . . . . . . . . . . .
23+
. . . . . . . . . . . .
24+
`;
25+
}
26+
return null;
27+
})
28+
29+
helpers._registerFactory("animation", function(name: string) {
30+
switch(helpers.stringTrim(name)) {
31+
32+
}
33+
return null;
34+
})
35+
36+
}
37+
// Auto-generated code. Do not edit.

main.blocks

Lines changed: 1 addition & 32 deletions
Large diffs are not rendered by default.

main.ts

Lines changed: 23 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
namespace StatusBarKind {
22
export const Progress = StatusBarKind.create()
33
}
4-
scene.onOverlapTile(SpriteKind.Player, myTiles.tile3, function (sprite, location) {
5-
sprite.destroy(effects.disintegrate, 100)
6-
})
74
controller.up.onEvent(ControllerButtonEvent.Pressed, function () {
85
jump(sprite_player, constants_gravity, constants_tiles_high_jump)
96
})
@@ -12,38 +9,12 @@ scene.onHitWall(SpriteKind.Player, function (sprite, location) {
129
jumps = 0
1310
}
1411
})
15-
function level1 () {
16-
tiles.setSmallTilemap(tiles.createTilemap(hex`c8000f00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020202000000000000000000000000000000000000000000000002000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001030100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000103010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000202020000000000000000000000000000000000000000000000000000000200000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000010301000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020202000000000000000001030303000000030303010000000000000000000002000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000100000000000000000000000000000000000000020000000000000000000000000002000000000000000000000000000000000000000000000000000000000202020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000020202000000000000000000000000000000000000000000000000000202020000000000000000000000000000010202020000000000000000000000000000000200000000000000000000000000000002000000000000000000000000000000000000000000020202000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000000000000000202020000000000000000000000000000000000020202000000000000000000000000000000000001000000020202000000000000000000000002000000000000000000000000000000000002000000000000000000000000000002020200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002020200000000000000000000000000000000000000000000000000000002020200000000000000000002020200000000000000000000000000000000000000000100000000000002020200000000000000020000000000000000000000000000000000000002000000000000000202020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000101010101010101010101010101010103030301010101010101010303030101010101010101010303030303030303030303030303030303030303030303030303030303030101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101030303030303030303030303030303030303030101010101010101030303010101030303010101030303010101030303010101030303010101030303030303030303030303030303030303030303`, img`
17-
........................................................................................................................................................................................................
18-
........................................................................................................................................................................................................
19-
........................................................................................................................................................................................................
20-
........................................................................................................................................................................................................
21-
..................................................................................................................................2.2...................................................................
22-
.................................................................................................................................2...2...............................................................222
23-
......................................................................................................222.......................2.....2........................................................2.2......
24-
...................................................................................................222...................................................................................2.2....2.......
25-
................................................................................................222...........................2.........2..........................................2.2....2.............
26-
.............................................................................................222........2.........2..........2...........2...................................222....2...................
27-
......................................................222.................................222...........2222...222..........2.............2............................222..............................
28-
.................................................222.......222.........................222..............2222...............2...............2.....................222....................................
29-
............................................222.................222.................222.................2...222...........2.................2..............222..........................................
30-
.......................................222...........................222.........222....................2......222.......2...................2.......222................................................
31-
2222222222222222...22222222...222222222..............................22222222222222222222222222222222222222222222222222222...................22222222...222...222...222...222...222.....................
32-
`, [myTiles.transparency8,myTiles.tile1,myTiles.tile2,myTiles.tile3,myTiles.tile4,myTiles.tile5], TileScale.Eight))
33-
scene.setBackgroundColor(13)
34-
tiles.placeOnTile(sprite_player, tiles.getTileLocation(1, 13))
35-
tiles.placeOnTile(sprite_player_cam, tiles.getTileLocation(1, 13))
36-
sprite_player.setVelocity(48, 0)
37-
sprite_player_cam.setVelocity(48, 0)
38-
sprite_player.ay = constants_gravity
39-
create_status_bar(sprite_player, tiles.tilemapColumns() * tiles.tileWidth())
40-
}
41-
scene.onOverlapTile(SpriteKind.Player, myTiles.tile4, function (sprite, location) {
42-
win()
43-
})
4412
controller.A.onEvent(ControllerButtonEvent.Pressed, function () {
4513
jump(sprite_player, constants_gravity, constants_tiles_high_jump)
4614
})
15+
scene.onOverlapTile(SpriteKind.Player, assets.tile`top_spike`, function (sprite, location) {
16+
sprite.destroy(effects.disintegrate, 100)
17+
})
4718
function win () {
4819
sprite_player_cam.setVelocity(0, 0)
4920
won = true
@@ -75,29 +46,20 @@ function create_status_bar (sprite: Sprite, tilemap_length: number) {
7546
}
7647
})
7748
}
49+
scene.onOverlapTile(SpriteKind.Player, assets.tile`flag_bottom`, function (sprite, location) {
50+
win()
51+
})
52+
scene.onOverlapTile(SpriteKind.Player, assets.tile`flag_top`, function (sprite, location) {
53+
win()
54+
})
7855
function make_player () {
79-
sprite_player = sprites.create(img`
80-
. . . . . . . . . . . .
81-
. . . . . . . . . . . .
82-
. . c c c c c c c c . .
83-
. . c b b b b b b c . .
84-
. . c b c b b c b c . .
85-
. . c b c b b c b c . .
86-
. . c b b b b b b c . .
87-
. . c b c c c c b c . .
88-
. . c b b b b b b c . .
89-
. . c c c c c c c c . .
90-
. . . . . . . . . . . .
91-
. . . . . . . . . . . .
92-
`, SpriteKind.Player)
93-
sprite_player_cam = sprites.create(img`
94-
.
95-
`, SpriteKind.Player)
56+
sprite_player = sprites.create(assets.image`character`, SpriteKind.Player)
57+
sprite_player_cam = sprites.create(assets.image`camera_reference`, SpriteKind.Player)
9658
sprite_player.setFlag(SpriteFlag.AutoDestroy, true)
9759
sprite_player_cam.setFlag(SpriteFlag.Ghost, true)
9860
scene.cameraFollowSprite(sprite_player_cam)
9961
}
100-
scene.onOverlapTile(SpriteKind.Player, myTiles.tile7, function (sprite, location) {
62+
scene.onOverlapTile(SpriteKind.Player, assets.tile`bottom_spike`, function (sprite, location) {
10163
sprite.destroy(effects.disintegrate, 100)
10264
})
10365
function jump (sprite: Sprite, gravity: number, tiles2: number) {
@@ -124,15 +86,22 @@ function fade (_in: boolean, duration: number, block: boolean) {
12486
color.pauseUntilFadeDone()
12587
}
12688
}
127-
scene.onOverlapTile(SpriteKind.Player, myTiles.tile5, function (sprite, location) {
128-
win()
129-
})
13089
sprites.onDestroyed(SpriteKind.Player, function (sprite) {
13190
sprite_player_cam.setVelocity(0, 0)
13291
timer.after(2000, function () {
13392
game.over(false)
13493
})
13594
})
95+
function level_1 () {
96+
tiles.setSmallTilemap(tilemap`level1`)
97+
scene.setBackgroundColor(13)
98+
tiles.placeOnTile(sprite_player, tiles.getTileLocation(1, 13))
99+
tiles.placeOnTile(sprite_player_cam, tiles.getTileLocation(1, 13))
100+
sprite_player.setVelocity(48, 0)
101+
sprite_player_cam.setVelocity(48, 0)
102+
sprite_player.ay = constants_gravity
103+
create_status_bar(sprite_player, tiles.tilemapColumns() * tiles.tileWidth())
104+
}
136105
let percent_traveled = 0
137106
let sprite_progress_bar: StatusBarSprite = null
138107
let sprite_player_cam: Sprite = null
@@ -151,7 +120,7 @@ constants_max_jumps = 2
151120
jumps = 0
152121
won = false
153122
make_player()
154-
level1()
123+
level_1()
155124
fade(false, 2000, false)
156125
game.onUpdate(function () {
157126
sprite_player.vx = 48

pxt.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,15 @@
1515
"main.ts",
1616
"README.md",
1717
"tilemap.g.jres",
18-
"tilemap.g.ts"
18+
"tilemap.g.ts",
19+
"images.g.jres",
20+
"images.g.ts"
1921
],
2022
"testFiles": [
2123
"test.ts"
2224
],
2325
"targetVersions": {
24-
"target": "1.2.16",
26+
"target": "1.3.42",
2527
"targetId": "arcade"
2628
},
2729
"supportedTargets": [

0 commit comments

Comments
 (0)