Skip to content

edit fire and cactus #9

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

Open
wants to merge 1 commit into
base: saarthak
Choose a base branch
from
Open

edit fire and cactus #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file modified .github/makecode/blocks.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.
20 changes: 10 additions & 10 deletions images.g.jres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,16 +49,6 @@
"mimeType": "image/x-mkcd-f4",
"displayName": "Temporary asset3"
},
"image14": {
"data": "hwQQABAAAAAA8PAADw9wd/AADwDwAPB3AP//8PDwd3fwf/d/f3d3d/9/d/d/93d/cH9/93d/d3fwd3d/93d/d//393d39/d3f3d3f393d3dwf393f3/3f3B3d/d3d/d38Hd3f/f3d3fw939/d3d3dw8PDw8AD393AA8P8AAP8HfwAPAA8PBwdw==",
"mimeType": "image/x-mkcd-f4",
"displayName": "cactus_img"
},
"image4": {
"data": "hwQQABAAAAAAUCVVIlUiggBQIkUiJSKCAFVFQlIlIoJQRSRCVCIiglBEJCJEVSKCAAAkVFUlIoIAQCRUIiIiggBAIkIiIiKCAEBEIkQiUoIAAEUiRCIiggBVJSJSIiKCVVUiQlUiUoJQUiVUJSIiggBVQlIiIiKCAFBFUlUiIoIAACVEUiIigg==",
"mimeType": "image/x-mkcd-f4",
"displayName": "fire_img"
},
"image16": {
"data": "hwQYABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFBVVQUAAAAAAAAAUFUzM1UFAAAAAAAAVTMzMzNVAAAAAAAANTMzMzNTBQAAAAAAVTMzMzMzVQAAAAAAUDUzMzMzUwUAAAAAAFU1MzMzM1UAAAAAAABVMzMzM1UAAAAAAABVMzMzM1UAAAAAAFU1MzMzUwUAAAAAUDUzMzMzVQAAAAAAVTMzMzNTBQAAAAAANTMzMzNVAAAAAAAAVTMzM1MFAAAAAAAAUFUzM1UAAAAAAAAAAFBVVQUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
"mimeType": "image/x-mkcd-f4",
Expand All @@ -80,6 +70,16 @@
"mimeType": "image/x-mkcd-f4",
"displayName": "jump right 1"
},
"image4": {
"data": "hwQQABAAAAAAAAAAAAAiggAAIEUiJCKCAABFQlIkIoJQRSRCVCIiglBEJCJEVSKCAAAkVFUlIoIAUCRUIiIiggBAIkIiIiKCAEBEIkQiUoIAAEUiRCIiggBVJSJSIiKCVVUiQlUiUoJQUiVUJSIiggAAQlIiIiKCAAAAUkQiIoIAAAAAACAigg==",
"mimeType": "image/x-mkcd-f4",
"displayName": "fire_img"
},
"image14": {
"data": "hwQQABAAAAAA8PAADw9wd/AADwDwAPB3APD/8PDwd3cAf/d/f3d3d/9/d3d393d/cH9/93d3d3fwd3d/93d/d//3d3d39/d3f3d3f393d3dwf393d3d3d3B3d/d3d/d38Hd3f/f3d3fw939/d3d3dw8PDw8AD393AA8P8AAP8HfwAPAA8PBwdw==",
"mimeType": "image/x-mkcd-f4",
"displayName": "cactus_img"
},
"anim4": {
"namespace": "myAnimations",
"id": "anim4",
Expand Down
76 changes: 38 additions & 38 deletions images.g.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,44 +576,6 @@ dddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd
................................................................................
................................................................................
................................................................................
`;
case "image14":
case "cactus_img":return img`
. . . . f . . f f . . . . f . .
. f . f f 7 f f 7 7 7 f f . . f
. . f f f f 7 7 7 f 7 7 7 f f .
f . f 7 7 7 7 f 7 7 7 7 f . . .
. f f 7 7 f 7 7 7 f 7 7 f f f .
f . f f 7 7 7 f 7 7 7 7 7 . . f
. . . f 7 7 f 7 f 7 7 f f f . .
. . f 7 f f 7 7 7 7 f 7 7 . f .
f . . f f 7 7 7 f f 7 7 7 . . .
. f f 7 7 7 f 7 7 7 7 f 7 . . f
f . . 7 7 f 7 7 7 f 7 7 7 f f .
. . f 7 f 7 7 f 7 7 7 f 7 . . f
. . 7 7 7 7 f 7 7 7 7 7 7 f . .
7 f 7 7 7 7 7 f 7 f f 7 7 7 f 7
7 7 7 7 f 7 7 7 7 f 7 7 7 7 7 7
7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
`;
case "image4":
case "fire_img":return img`
. . . . . . . . . . . 5 . . . .
. . . 5 5 . . . . . . 5 5 . . .
. . 5 5 4 . . . . . 5 5 2 5 . .
5 5 5 4 4 . 4 4 4 . 5 5 5 5 5 .
5 2 5 4 4 4 4 2 4 5 5 2 5 2 5 5
2 2 4 2 2 2 2 2 4 4 2 2 2 4 4 2
5 5 2 2 2 4 4 2 2 2 2 2 4 2 2 4
5 4 4 4 2 5 5 4 2 2 2 4 5 5 5 4
2 2 2 4 4 5 2 2 4 4 2 5 5 2 5 2
2 2 5 5 4 5 2 2 4 4 5 5 2 2 5 5
5 5 5 2 5 5 2 2 2 2 2 2 2 2 2 2
5 2 2 2 5 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 5 2 2 5 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8
`;
case "image16":
case "image17":return img`
Expand Down Expand Up @@ -1120,6 +1082,44 @@ e e e e b b b b b b e e
................................................................................
................................................................................
................................................................................
`;
case "image4":
case "fire_img":return img`
. . . . . . . . . . . 5 . . . .
. . . 5 5 . . . . . . 5 5 . . .
. . . 5 4 . . . . . 5 5 2 . . .
. . . 4 4 . 5 4 4 . 5 5 5 . . .
. . 5 4 4 4 4 2 4 5 5 2 5 2 . .
. 2 4 2 2 2 2 2 4 4 2 2 2 4 . .
. 5 2 2 2 4 4 2 2 2 2 2 4 2 2 .
. 4 4 4 2 5 5 4 2 2 2 4 5 5 5 .
. 2 2 4 4 5 2 2 4 4 2 5 5 2 4 .
. 2 5 5 4 5 2 2 4 4 5 5 2 2 4 .
. 4 4 2 5 5 2 2 2 2 2 2 2 2 2 .
. 2 2 2 5 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
2 2 2 2 2 2 2 2 5 2 2 5 2 2 2 2
2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8
`;
case "image14":
case "cactus_img":return img`
. . . . f . . f f . . . . f . .
. f . . f 7 f f 7 7 7 f f . . f
. . . f f f 7 7 7 f 7 7 7 f f .
f . f 7 7 7 7 f 7 7 7 7 f . . .
. f f 7 7 f 7 7 7 f 7 7 f f f .
f . f f 7 7 7 7 7 7 7 7 7 . . f
. . . f 7 7 f 7 f 7 7 f f f . .
. . f 7 7 f 7 7 7 7 f 7 7 . f .
f . . f 7 7 7 7 f 7 7 7 7 . . .
. f f 7 7 7 f 7 7 7 7 f 7 . . f
f . . 7 7 7 7 7 7 7 7 7 7 f f .
. . f 7 f 7 7 f 7 7 7 f 7 . . f
. . 7 7 7 7 f 7 7 7 7 7 7 f . .
7 f 7 7 7 7 7 f 7 7 f 7 7 7 f 7
7 7 7 7 f 7 7 7 7 7 7 7 7 7 7 7
7 7 7 7 7 7 7 7 7 7 7 7 7 7 7 7
`;
}
return null;
Expand Down
6 changes: 3 additions & 3 deletions main.blocks
View file
Open in desktop

Large diffs are not rendered by default.

32 changes: 23 additions & 9 deletions main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,20 @@ def on_up_pressed():
elif cnt == 1:
hacker.vy = -120
cnt += 2
if hacker.vx < 0:
animation.run_image_animation(hacker,
assets.animation("""
left jump animation
"""),
300,
False)
else:
animation.run_image_animation(hacker,
assets.animation("""
right jump animation
"""),
300,
False)
controller.up.on_event(ControllerButtonEvent.PRESSED, on_up_pressed)

def on_left_pressed():
Expand All @@ -20,8 +34,8 @@ def on_right_pressed():
"""))
controller.right.on_event(ControllerButtonEvent.PRESSED, on_right_pressed)

stone: Sprite = None
projectile: Sprite = None
stone: Sprite = None
cnt = 0
hacker: Sprite = None
scene.set_background_image(img("""
Expand Down Expand Up @@ -170,17 +184,17 @@ def on_on_update():
game.on_update(on_on_update)

def on_update_interval():
global stone
stone = sprites.create_projectile_from_side(assets.image("""
cactus_img
"""), 0, 55)
stone.x = hacker.x + 5
game.on_update_interval(5000, on_update_interval)

def on_update_interval2():
global projectile
projectile = sprites.create_projectile_from_side(assets.image("""
smartCloud
"""), -19, 0)
projectile.y = 50
game.on_update_interval(5000, on_update_interval)

def on_update_interval2():
global stone
stone = sprites.create_projectile_from_side(assets.image("""
image14
"""), 0, 55)
stone.x = hacker.x + 5
game.on_update_interval(5000, on_update_interval2)
22 changes: 17 additions & 5 deletions main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,30 @@ controller.up.onEvent(ControllerButtonEvent.Pressed, function () {
hacker.vy = -120
cnt += 2
}
if (hacker.vx > 0) {
animation.runImageAnimation(
hacker,
assets.animation`left jump animation`,
200,
false
)
} else {
animation.runImageAnimation(
hacker,
assets.animation`right jump animation`,
200,
false
)
}
})
controller.left.onEvent(ControllerButtonEvent.Pressed, function () {
hacker.setImage(assets.image`Temporary asset3`)
})
controller.right.onEvent(ControllerButtonEvent.Pressed, function () {
hacker.setImage(assets.image`Temporary asset2`)
})
scene.onHitWall(SpriteKind.Projectile, function (sprite, location) {
stone.destroy(effects.disintegrate, 200)
})
let projectile: Sprite = null
let stone: Sprite = null
let projectile: Sprite = null
let cnt = 0
let hacker: Sprite = null
scene.setBackgroundImage(img`
Expand Down Expand Up @@ -153,7 +165,7 @@ scene.cameraFollowSprite(hacker)
// hacker.vy = 0
game.onUpdate(function () {
if (hacker.y < 50) {
hacker.vy = 30
hacker.vy = 50
hacker.ay = 150
} else if (hacker.y <= 90) {
hacker.ay = 150
Expand Down
12 changes: 6 additions & 6 deletions tilemap.g.jres
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@
"tilemapTile": true,
"displayName": "tile5"
},
"tile5": {
"data": "hwQQABAAAAAA8PAADw9wd/AADwDwAPB3AP//8PDwd3fwf/d/f3d3d/9/d/d/93d/cH9/93d/d3fwd3d/93d/d//393d39/d3f3d3f393d3dwf393f3/3f3B3d/d3d/d38Hd3f/f3d3fw939/d3d3dw8PDw8AD393AA8P8AAP8HfwAPAA8PBwdw==",
"tile6": {
"data": "hwQQABAAAAAAAAAAAAAiAAAAAAAgJCICAABQRVIkIiIAVVVCVCIi7lBVJSJEVeLiAEAlVFUlIiUAUCRUIiIi4gBAIkIiIiIuAEBEIkQiUuIAAEUiRCIiIgBVJSJSIiIuVVUiQlUiUuIAUCVUJSIi7gAAAFIiIiIuAAAAAEAiIgIAAAAAACAiAA==",
"mimeType": "image/x-mkcd-f4",
"tilemapTile": true,
"displayName": "cactus"
"displayName": "fire"
},
"tile6": {
"data": "hwQQABAAAAAAUCVVIlUiggBQIkUiJSKCAFVFQlIlIoJQRSRCVCIiglBEJCJEVSKCAAAkVFUlIoIAQCRUIiIiggBAIkIiIiKCAEBEIkQiUoIAAEUiRCIiggBVJSJSIiKCVVUiQlUiUoJQUiVUJSIiggBVQlIiIiKCAFBFUlUiIoIAACVEUiIigg==",
"tile5": {
"data": "hwQQABAAAAAADwAAAA8AAPAAD/DwAPBwAA//8PDwd3fwf/d3f3d3d393d/d393d/cH9/d3d3d3fwd3d/93d/d//393d39/d3f3d3f393d3dwf393d393f3B3d/d3d/d38Hd3f/f3d3fw939/d3d3dw8PDw8AD393AA8P8AAP8HAAAAAA8PAAAA==",
"mimeType": "image/x-mkcd-f4",
"tilemapTile": true,
"displayName": "fire"
"displayName": "cactus"
},
"level2": {
"id": "level2",
Expand Down
8 changes: 4 additions & 4 deletions tilemap.g.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ namespace myTiles {
//% fixedInstance jres blockIdentity=images._tile
export const tile4 = image.ofBuffer(hex``);
//% fixedInstance jres blockIdentity=images._tile
export const tile5 = image.ofBuffer(hex``);
//% fixedInstance jres blockIdentity=images._tile
export const tile6 = image.ofBuffer(hex``);
//% fixedInstance jres blockIdentity=images._tile
export const tile5 = image.ofBuffer(hex``);

helpers._registerFactory("tilemap", function(name: string) {
switch(helpers.stringTrim(name)) {
Expand Down Expand Up @@ -107,10 +107,10 @@ namespace myTiles {
case "tile3":return tile3;
case "tile5":
case "tile4":return tile4;
case "cactus":
case "tile5":return tile5;
case "fire":
case "tile6":return tile6;
case "cactus":
case "tile5":return tile5;
}
return null;
})
Expand Down