Skip to content

Commit ce0d1f8

Browse files
committed
Update main.blocks, images.g.jres, images.g.ts, tilemap.g.jres, tilemap.g.ts
1 parent 3212b8d commit ce0d1f8

7 files changed

Lines changed: 130 additions & 232 deletions

File tree

.github/makecode/blocks.png

1.49 KB
Loading

.github/makecode/blocksdiff.png

-441 KB
Loading

images.g.jres

Lines changed: 7 additions & 13 deletions
Large diffs are not rendered by default.

images.g.ts

Lines changed: 94 additions & 218 deletions
Original file line numberDiff line numberDiff line change
@@ -591,166 +591,42 @@ dddd....555555ddd.............
591591
..............................
592592
..............................
593593
`];
594-
case "anim5":return [img`
595-
..............................
596-
..............................
597-
..............................
598-
..............................
599-
..............................
600-
..........22222333............
601-
..........33333333............
602-
..........3333333322..........
603-
..........ffffffff............
604-
..........ffdddddd............
605-
..........ddddddfd............
606-
..........ddddddddd...........
607-
..........dddddfff............
608-
.............ddd..............
609-
.............ddd..............
610-
..........555555555.......dd..
611-
........dd555555555d......dd..
612-
.......ddd555555555dd....ddd..
613-
......ddd.555555555dddd.ddd...
614-
......dd..555555555.dddddd....
615-
.....ddd..555555555...ddd.....
616-
.....ddd..555555555...........
617-
.....ddd..555555555...........
618-
......ddd.666666666...........
619-
......ddddd66..66666..........
620-
........ddd66...66666.........
621-
.........dd66....66666........
622-
..fff6...666......66666.......
623-
..fff66.6666.......6666.......
624-
..fff666666.......6666........
625-
..fff666666......6666.........
626-
..ff..6666.......6666.........
627-
..ff.............ffff.........
628-
.................ffffff.......
629-
.................ffffff.......
630-
..............................
631-
..............................
632-
..............................
594+
case "anim9":return [img`
633595
..............................
634596
..............................
635-
`, img`
636-
..............................
637597
..............................
638598
..............................
639599
..............................
640-
..........22222333............
641-
..........33333333............
642-
..........3333333322..........
643-
..........ffffffff............
644-
..........ffdddddd............
645-
..........ddddddfd............
646-
..........ddddddddd...........
647-
..........dddddfff............
648-
.............ddd..............
649-
.............ddd..............
650-
........dddd5555555...........
651-
......dddddddd55555..dd.......
652-
.....dddd.5ddddd555.ddd.......
653-
....dddd..55ddddd55.ddd.......
654-
....ddd...555ddddddddd........
655-
...ddd....55555ddddddd........
656-
..dddd....555555ddd...........
657-
....ddd...555555555...........
658-
.....ddd..666666666...........
659-
.....ddd..6666666666666.......
660-
.....dd...6666..666666666.....
661-
..........6666.....666666.....
662-
.........666666......6666.....
663-
.........666666.....6666......
664-
.........66666.....66666......
665-
........666666..fff6666.......
666-
.......66666....fff666........
667-
.......6666.....fff66.........
668-
.......ffff.....fff6..........
669-
.......ffffff...ff............
670-
.......ffffff...ff............
671-
..............................
672-
..............................
673-
..............................
674-
..............................
675-
..............................
676-
`, img`
677-
..............................
678-
..............................
679-
..............................
680-
.........22222333.............
681-
.........33333333.............
682-
.........3333333322...........
683-
.........ffffffff.............
684-
.........ffdddddd.............
685-
.........ddddddfd.............
686-
.........ddddddddd............
687-
.........dddddfff.............
688-
............ddd...............
689-
............ddd...............
690-
.........555555555.......dd...
691-
.......dd555555555d......dd...
692-
......ddd555555555dd....ddd...
693-
.....ddd.555555555dddd.ddd....
694-
.....dd..555555555.dddddd.....
695-
....ddd..555555555...ddd......
696-
....ddd..555555555............
697-
....ddd..555555555............
698-
.....ddd.666666666............
699-
.....ddddd66..66666...........
700-
.......ddd66...66666..........
701-
........dd66....66666.........
702-
.fff6...666......66666........
703-
.fff66.6666.......6666........
704-
.fff666666.......6666.........
705-
.fff666666......6666..........
706-
.ff..6666.......6666..........
707-
.ff.............ffff..........
708-
................ffffff........
709-
................ffffff........
710-
..............................
711-
..............................
712-
..............................
713-
..............................
714-
..............................
715-
..............................
716-
..............................
717-
`];
718-
case "anim6":return [img`
719-
..............................
720-
..............................
721-
..............................
722-
..............................
723-
..............................
724-
..........22222333............
725-
..........33333333............
726-
..........3333333322..........
727-
..........ffffffff............
728-
..........ffdddddd............
729-
..........ddddddfd............
730-
..........ddddddddd...........
731-
..........dddddfff............
732-
.............ddd..............
733-
.............ddd..............
734-
..........555555555.......dd..
735-
........dd555555555d......dd..
736-
.......ddd555555555dd....ddd..
737-
......ddd.555555555dddd.ddd...
738-
......dd..555555555.dddddd....
739-
.....ddd..555555555...ddd.....
740-
.....ddd..555555555...........
741-
.....ddd..555555555...........
742-
......ddd.666666666...........
743-
......ddddd66..66666..........
744-
........ddd66...66666.........
745-
.........dd66....66666........
746-
..fff6...666......66666.......
747-
..fff66.6666.......6666.......
748-
..fff666666.......6666........
749-
..fff666666......6666.........
750-
..ff..6666.......6666.........
751-
..ff.............ffff.........
752-
.................ffffff.......
753-
.................ffffff.......
600+
............33322222..........
601+
............33333333..........
602+
..........2233333333..........
603+
............ffffffff..........
604+
............ddddddff..........
605+
............dfdddddd..........
606+
...........ddddddddd..........
607+
............fffddddd..........
608+
..............ddd.............
609+
..............ddd.............
610+
..dd.......555555555..........
611+
..dd......d555555555dd........
612+
..ddd....dd555555555ddd.......
613+
...ddd.dddd555555555.ddd......
614+
....dddddd.555555555..dd......
615+
.....ddd...555555555..ddd.....
616+
...........555555555..ddd.....
617+
...........555555555..ddd.....
618+
...........666666666.ddd......
619+
..........66666..66ddddd......
620+
.........66666...66ddd........
621+
........66666....66dd.........
622+
.......66666......666...6fff..
623+
.......6666.......6666.66fff..
624+
........6666.......666666fff..
625+
.........6666......666666fff..
626+
.........6666.......6666..ff..
627+
.........ffff.............ff..
628+
.......ffffff.................
629+
.......ffffff.................
754630
..............................
755631
..............................
756632
..............................
@@ -761,37 +637,37 @@ dddd....555555ddd.............
761637
..............................
762638
..............................
763639
..............................
764-
..........22222333............
765-
..........33333333............
766-
..........3333333322..........
767-
..........ffffffff............
768-
..........ffdddddd............
769-
..........ddddddfd............
770-
..........ddddddddd...........
771-
..........dddddfff............
772-
.............ddd..............
773-
.............ddd..............
774-
........dddd5555555...........
775-
......dddddddd55555..dd.......
776-
.....dddd.5ddddd555.ddd.......
777-
....dddd..55ddddd55.ddd.......
778-
....ddd...555ddddddddd........
779-
...ddd....55555ddddddd........
780-
..dddd....555555ddd...........
781-
....ddd...555555555...........
782-
.....ddd..666666666...........
783-
.....ddd..6666666666666.......
784-
.....dd...6666..666666666.....
785-
..........6666.....666666.....
786-
.........666666......6666.....
787-
.........666666.....6666......
788-
.........66666.....66666......
789-
........666666..fff6666.......
790-
.......66666....fff666........
791-
.......6666.....fff66.........
792-
.......ffff.....fff6..........
793-
.......ffffff...ff............
794-
.......ffffff...ff............
640+
............33322222..........
641+
............33333333..........
642+
..........2233333333..........
643+
............ffffffff..........
644+
............ddddddff..........
645+
............dfdddddd..........
646+
...........ddddddddd..........
647+
............fffddddd..........
648+
..............ddd.............
649+
..............ddd.............
650+
...........5555555dddd........
651+
.......dd..55555dddddddd......
652+
.......ddd.555ddddd5.dddd.....
653+
.......ddd.55ddddd55..dddd....
654+
........ddddddddd555...ddd....
655+
........ddddddd55555....ddd...
656+
...........ddd555555....dddd..
657+
...........555555555...ddd....
658+
...........666666666..ddd.....
659+
.......6666666666666..ddd.....
660+
.....666666666..6666...dd.....
661+
.....666666.....6666..........
662+
.....6666......666666.........
663+
......6666.....666666.........
664+
......66666.....66666.........
665+
.......6666fff..666666........
666+
........666fff....66666.......
667+
.........66fff.....6666.......
668+
..........6fff.....ffff.......
669+
............ff...ffffff.......
670+
............ff...ffffff.......
795671
..............................
796672
..............................
797673
..............................
@@ -801,36 +677,36 @@ dddd....555555ddd.............
801677
..............................
802678
..............................
803679
..............................
804-
.........22222333.............
805-
.........33333333.............
806-
.........3333333322...........
807-
.........ffffffff.............
808-
.........ffdddddd.............
809-
.........ddddddfd.............
810-
.........ddddddddd............
811-
.........dddddfff.............
812-
............ddd...............
813-
............ddd...............
814-
.........555555555.......dd...
815-
.......dd555555555d......dd...
816-
......ddd555555555dd....ddd...
817-
.....ddd.555555555dddd.ddd....
818-
.....dd..555555555.dddddd.....
819-
....ddd..555555555...ddd......
820-
....ddd..555555555............
821-
....ddd..555555555............
822-
.....ddd.666666666............
823-
.....ddddd66..66666...........
824-
.......ddd66...66666..........
825-
........dd66....66666.........
826-
.fff6...666......66666........
827-
.fff66.6666.......6666........
828-
.fff666666.......6666.........
829-
.fff666666......6666..........
830-
.ff..6666.......6666..........
831-
.ff.............ffff..........
832-
................ffffff........
833-
................ffffff........
680+
.............33322222.........
681+
.............33333333.........
682+
...........2233333333.........
683+
.............ffffffff.........
684+
.............ddddddff.........
685+
.............dfdddddd.........
686+
............ddddddddd.........
687+
.............fffddddd.........
688+
...............ddd............
689+
...............ddd............
690+
...dd.......555555555.........
691+
...dd......d555555555dd.......
692+
...ddd....dd555555555ddd......
693+
....ddd.dddd555555555.ddd.....
694+
.....dddddd.555555555..dd.....
695+
......ddd...555555555..ddd....
696+
............555555555..ddd....
697+
............555555555..ddd....
698+
............666666666.ddd.....
699+
...........66666..66ddddd.....
700+
..........66666...66ddd.......
701+
.........66666....66dd........
702+
........66666......666...6fff.
703+
........6666.......6666.66fff.
704+
.........6666.......666666fff.
705+
..........6666......666666fff.
706+
..........6666.......6666..ff.
707+
..........ffff.............ff.
708+
........ffffff................
709+
........ffffff................
834710
..............................
835711
..............................
836712
..............................
@@ -839,7 +715,7 @@ dddd....555555ddd.............
839715
..............................
840716
..............................
841717
`];
842-
case "anim7":return [img`
718+
case "anim5":return [img`
843719
..............................
844720
..............................
845721
..............................
@@ -963,7 +839,7 @@ dddd....555555ddd.............
963839
..............................
964840
..............................
965841
`];
966-
case "anim8":return [img`
842+
case "anim6":return [img`
967843
..............................
968844
..............................
969845
..............................

main.blocks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<xml xmlns="https://developers.google.com/blockly/xml"><variables><variable id="X1Pe(:^~c4kvxj2P|k*x">jack</variable><variable id="qvUGf9mzA?*FsK%36x;D">jumpcount</variable><variable type="KIND_SpriteKind" id="CZm/x||_$_KQP@hlG=/u">Player</variable><variable type="KIND_SpriteKind" id="Y1LRI}Hr1bG-Y%g{S(L)">Projectile</variable><variable type="KIND_SpriteKind" id="y::P-rKX[h4O)qfy[J3@">Food</variable><variable type="KIND_SpriteKind" id="=}P!H,$0WDw4|sq#X$8.">Enemy</variable></variables><block type="pxt-on-start" id="3E2kOxB0~U4P|83h^sY_" x="0" y="0"><statement name="HANDLER"><block type="variables_set" id="gNLColSv`|n(KhKv)o%x"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field><value name="VALUE"><shadow type="math_number"><field name="NUM">0</field></shadow><block type="spritescreate" id="Q6o*CXrKKv5R@EK?zc:M"><value name="img"><shadow type="screen_image_picker" id="4[SDw;98l@DkQ5)N4NHH"><field name="img">assets.image`image`</field><data>{"commentRefs":[],"fieldData":{"img":"myImages.image1"}}</data></shadow></value><value name="kind"><shadow type="spritekind" id="?/1SP^2Cgs^5/v!|0nHT"><field name="MEMBER">Player</field></shadow></value></block></value><next><block type="game_control_sprite" id="]OJ|2Yrn*j0qBvK0*gvO"><mutation xmlns="http://www.w3.org/1999/xhtml" _expanded="2" _input_init="true"></mutation><value name="sprite"><shadow type="variables_get" id=")qG1nR+%^4P{Z?Iv#C4w"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value><value name="vx"><shadow type="math_number" id="bzU2Ds)=0apf#1+q$3l}"><field name="NUM">100</field></shadow></value><value name="vy"><shadow type="math_number" id="~9GIZZeD}C_4`qJgh=A="><field name="NUM">0</field></shadow></value><next><block type="gamesetbackgroundcolor" id=":``)hkM$enK|$tbxS@U4"><value name="color"><shadow type="colorindexpicker" id="iR*v2_DH_4hs1xnik8nV"><field name="index">9</field></shadow></value><next><block type="tilemap_editor" id="B{i[,T4(:UukZp-iTQm~"><field name="tilemap">tilemap`level1`</field><data>{"commentRefs":[],"fieldData":{"tilemap":"level1"}}</data><next><block type="Sprite_blockCombine_set" id="v$(}hPFNfs`0dI@Da2Mh"><field name="property">Sprite.ay@set</field><value name="mySprite"><block type="variables_get" id="dB4]^y@oXoC~5fia!J}R"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></block></value><value name="value"><shadow type="math_number" id="3dTpaI6I%ARdELFXYh:h"><field name="NUM">250</field></shadow></value><next><block type="camerafollow" id=":*rhaUNj;arikm6c$QSP"><value name="sprite"><shadow type="variables_get" id="!4:XTDX)?G^dn3-ReHrO"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value></block></next></block></next></block></next></block></next></block></next></block></statement></block><block type="keyonevent" id="$6$/{p(agFCI{@uEIqai" x="764" y="28"><field name="button">controller.A</field><field name="event">ControllerButtonEvent.Pressed</field></block><block type="keyonevent" id="%HBC`NbLHH_r$ysHu+([" x="384" y="208"><field name="button">controller.right</field><field name="event">ControllerButtonEvent.Pressed</field><statement name="HANDLER"><block type="run_image_animation" id="[ijLjP(wN[XBQEHS|dfk"><value name="sprite"><shadow type="variables_get" id="s?Mcpbv88i}4_}kbB!E,"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value><value name="frames"><shadow type="animation_editor" id="_KbK:SX|*vnre5HcEWvv"><field name="frames">[img`
1+
<xml xmlns="https://developers.google.com/blockly/xml"><variables><variable id="X1Pe(:^~c4kvxj2P|k*x">jack</variable><variable id="qvUGf9mzA?*FsK%36x;D">jumpcount</variable><variable type="KIND_SpriteKind" id="CZm/x||_$_KQP@hlG=/u">Player</variable><variable type="KIND_SpriteKind" id="Y1LRI}Hr1bG-Y%g{S(L)">Projectile</variable><variable type="KIND_SpriteKind" id="y::P-rKX[h4O)qfy[J3@">Food</variable><variable type="KIND_SpriteKind" id="=}P!H,$0WDw4|sq#X$8.">Enemy</variable></variables><block type="pxt-on-start" id="3E2kOxB0~U4P|83h^sY_" x="0" y="0"><statement name="HANDLER"><block type="variables_set" id="gNLColSv`|n(KhKv)o%x"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field><value name="VALUE"><shadow type="math_number"><field name="NUM">0</field></shadow><block type="spritescreate" id="Q6o*CXrKKv5R@EK?zc:M"><value name="img"><shadow type="screen_image_picker" id="4[SDw;98l@DkQ5)N4NHH"><field name="img">assets.image`image`</field><data>{"commentRefs":[],"fieldData":{"img":"myImages.image1"}}</data></shadow></value><value name="kind"><shadow type="spritekind" id="?/1SP^2Cgs^5/v!|0nHT"><field name="MEMBER">Player</field></shadow></value></block></value><next><block type="game_control_sprite" id="]OJ|2Yrn*j0qBvK0*gvO"><mutation xmlns="http://www.w3.org/1999/xhtml" _expanded="2" _input_init="true"></mutation><value name="sprite"><shadow type="variables_get" id=")qG1nR+%^4P{Z?Iv#C4w"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value><value name="vx"><shadow type="math_number" id="bzU2Ds)=0apf#1+q$3l}"><field name="NUM">100</field></shadow></value><value name="vy"><shadow type="math_number" id="~9GIZZeD}C_4`qJgh=A="><field name="NUM">0</field></shadow></value><next><block type="gamesetbackgroundcolor" id=":``)hkM$enK|$tbxS@U4"><value name="color"><shadow type="colorindexpicker" id="iR*v2_DH_4hs1xnik8nV"><field name="index">9</field></shadow></value><next><block type="tilemap_editor" id="B{i[,T4(:UukZp-iTQm~"><field name="tilemap">tilemap`level1`</field><data>{"commentRefs":[],"fieldData":{"tilemap":"level1"}}</data><next><block type="Sprite_blockCombine_set" id="v$(}hPFNfs`0dI@Da2Mh"><field name="property">Sprite.ay@set</field><value name="mySprite"><block type="variables_get" id="dB4]^y@oXoC~5fia!J}R"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></block></value><value name="value"><shadow type="math_number" id="3dTpaI6I%ARdELFXYh:h"><field name="NUM">250</field></shadow></value><next><block type="camerafollow" id=":*rhaUNj;arikm6c$QSP"><value name="sprite"><shadow type="variables_get" id="!4:XTDX)?G^dn3-ReHrO"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value></block></next></block></next></block></next></block></next></block></next></block></statement></block><block type="keyonevent" id="$6$/{p(agFCI{@uEIqai" x="764" y="28"><field name="button">controller.A</field><field name="event">ControllerButtonEvent.Pressed</field></block><block type="keyonevent" id="%HBC`NbLHH_r$ysHu+([" x="530" y="230"><field name="button">controller.right</field><field name="event">ControllerButtonEvent.Pressed</field><statement name="HANDLER"><block type="run_image_animation" id="[ijLjP(wN[XBQEHS|dfk"><value name="sprite"><shadow type="variables_get" id="s?Mcpbv88i}4_}kbB!E,"><field name="VAR" id="X1Pe(:^~c4kvxj2P|k*x">jack</field></shadow></value><value name="frames"><shadow type="animation_editor" id="_KbK:SX|*vnre5HcEWvv"><field name="frames">[img`
22
..............................
33
..............................
44
..............................

tilemap.g.jres

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,15 @@
3030
],
3131
"displayName": "level1"
3232
},
33+
"level3": {
34+
"id": "level3",
35+
"mimeType": "application/mkcd-tilemap",
36+
"data": "MTAxMDAwMTAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMA==",
37+
"tileset": [
38+
"myTiles.transparency16"
39+
],
40+
"displayName": "level3"
41+
},
3342
"*": {
3443
"mimeType": "image/x-mkcd-f4",
3544
"dataEncoding": "base64",

0 commit comments

Comments
 (0)