diff --git a/Project3.project.gmx b/Project3.project.gmx index d57226a..7a01643 100644 --- a/Project3.project.gmx +++ b/Project3.project.gmx @@ -10,6 +10,7 @@ sprites\placeholder\placeholder sprites\placeholder\placeholderBlock + sprites\placeholder\placeholderBlockX sprites\placeholder\placeholderInputAnchor sprites\placeholder\placeholderInputAnchorWhite sprites\placeholder\placeholderOutputAnchor @@ -147,6 +148,10 @@ objects\scene\blocks\InputAnchor objects\scene\blocks\OutputAnchor + + objects\scene\menu\MenuController + objects\scene\menu\StartGame + objects\scene\PreviewPane @@ -154,6 +159,7 @@ objects\blueprint\BlockTemplate objects\blueprint\HigherOrderLink objects\blueprint\InputTemplate + objects\blueprint\LevelPierTemplate objects\blueprint\OneUse objects\blueprint\OutputTemplate objects\blueprint\ParameterLink @@ -162,6 +168,8 @@ objects\TypeParser + rooms\roomInit + rooms\roomMenu rooms\room0 diff --git a/help.rtf b/help.rtf index 7a1cc0b..0b0fe84 100644 Binary files a/help.rtf and b/help.rtf differ diff --git a/objects/Debug.object.gmx b/objects/Debug.object.gmx index 99606f7..ee06b12 100644 --- a/objects/Debug.object.gmx +++ b/objects/Debug.object.gmx @@ -4,11 +4,35 @@ 0 0 0 - 0 + -1 <undefined> <undefined> + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Initialize DEBUG value +globalvar DEBUG; +DEBUG = false; + + + + + 1 603 @@ -109,32 +133,6 @@ ds_map_destroy(objectNames); - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Initialize DEBUG value -globalvar DEBUG; -DEBUG = false; - - - - - - 1 @@ -171,6 +169,14 @@ for (var i = 0; i < ds_list_size(objectList); i++) { ds_map_destroy(objs); +draw_set_colour(c_white); +draw_set_alpha(0.3); +var pad = 5; +draw_rectangle(x-pad, y-pad, x+string_width(str)+pad, y+string_height(str)+pad, false); +draw_set_halign(fa_left); +draw_set_valign(fa_top); +draw_set_colour(c_black); +draw_set_alpha(1); draw_text(x, y, str); diff --git a/objects/TypeParser.object.gmx b/objects/TypeParser.object.gmx index 4ee6c0d..cf96d3d 100644 --- a/objects/TypeParser.object.gmx +++ b/objects/TypeParser.object.gmx @@ -155,62 +155,8 @@ ds_map_destroy(types); 1 ///Call User 2 for all block templates -with (BlockTemplate) { +with (BlockTemplate) event_user(2); -} - - - - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Call User 2 -event_user(2); - - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Create preview blocks for all templates -with (BlockTemplate) { - var preview = blockFromTemplate(id); - addChild(PreviewPane.id, preview); -} - -layout(PreviewPane); diff --git a/objects/blueprint/BlockTemplate.object.gmx b/objects/blueprint/BlockTemplate.object.gmx index 27f2ff9..0a4e3f9 100644 --- a/objects/blueprint/BlockTemplate.object.gmx +++ b/objects/blueprint/BlockTemplate.object.gmx @@ -81,6 +81,30 @@ + + 1 + 611 + 6 + -1 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + name + + + 0 + "" + + + 1 603 diff --git a/objects/blueprint/LevelPierTemplate.object.gmx b/objects/blueprint/LevelPierTemplate.object.gmx new file mode 100644 index 0000000..df6c4f8 --- /dev/null +++ b/objects/blueprint/LevelPierTemplate.object.gmx @@ -0,0 +1,23 @@ + + + placeholderBlockX + 0 + 0 + 0 + 0 + <undefined> + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/scene/PreviewPane.object.gmx b/objects/scene/PreviewPane.object.gmx index 1c93d72..aa49255 100644 --- a/objects/scene/PreviewPane.object.gmx +++ b/objects/scene/PreviewPane.object.gmx @@ -221,6 +221,60 @@ self.height = max(yoff+lastMargin, 60); + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Call User 2 on TypeParser +with (TypeParser) + event_user(2); + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Create preview blocks for all templates +with (BlockTemplate) { + var preview = blockFromTemplate(id); + addChild(other.id, preview); +} + +layout(id); + + + + + + 0 0 diff --git a/objects/scene/blocks/Block.object.gmx b/objects/scene/blocks/Block.object.gmx index 69e2ead..ddd9293 100644 --- a/objects/scene/blocks/Block.object.gmx +++ b/objects/scene/blocks/Block.object.gmx @@ -1033,6 +1033,33 @@ draw_sprite_stretched(placeholderBlock, image_index, x, y, width, height); 0 0 + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Draw template name (if applicable) +with (template) { + draw_set_halign(fa_center); + draw_set_valign(fa_middle); + draw_text(other.x+other.width/2, other.y+other.height/2, name); +} + + + + + 0 diff --git a/objects/scene/menu/MenuController.object.gmx b/objects/scene/menu/MenuController.object.gmx new file mode 100644 index 0000000..7f2508b --- /dev/null +++ b/objects/scene/menu/MenuController.object.gmx @@ -0,0 +1,23 @@ + + + placeholder + 0 + -1 + 0 + 0 + <undefined> + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/objects/scene/menu/StartGame.object.gmx b/objects/scene/menu/StartGame.object.gmx new file mode 100644 index 0000000..41bdf28 --- /dev/null +++ b/objects/scene/menu/StartGame.object.gmx @@ -0,0 +1,40 @@ + + + placeholderBlock + 0 + -1 + 0 + 0 + Block + <undefined> + + + + 1 + 425 + 4 + 0 + 0 + 0 + 0 + + + self + 0 + 0 + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/rooms/room0.room.gmx b/rooms/room0.room.gmx index e2bd63a..8ffeff9 100644 --- a/rooms/room0.room.gmx +++ b/rooms/room0.room.gmx @@ -3,8 +3,8 @@ 4000 4000 - 16 - 16 + 20 + 20 0 1000 0 @@ -41,7 +41,7 @@ - + @@ -51,9 +51,6 @@ - - - @@ -120,7 +117,7 @@ - + @@ -137,7 +134,7 @@ - + 0 diff --git a/rooms/roomInit.room.gmx b/rooms/roomInit.room.gmx new file mode 100644 index 0000000..df22c0b --- /dev/null +++ b/rooms/roomInit.room.gmx @@ -0,0 +1,67 @@ + + + + 800 + 600 + 16 + 16 + 0 + 1000 + -1 + 12632256 + -1 + + 0 + -1 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 1024 + 768 + 0 + 10 + 0.100000001490116 + diff --git a/rooms/roomMenu.room.gmx b/rooms/roomMenu.room.gmx new file mode 100644 index 0000000..7f49632 --- /dev/null +++ b/rooms/roomMenu.room.gmx @@ -0,0 +1,83 @@ + + + + 4000 + 4000 + 20 + 20 + 0 + 1000 + 0 + 12632256 + -1 + + -1 + -1 + -1 + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + 1024 + 768 + 0 + 10 + 0.100000001490116 + diff --git a/scripts/generic/format.gml b/scripts/generic/format.gml index d621ddc..5a7e420 100644 --- a/scripts/generic/format.gml +++ b/scripts/generic/format.gml @@ -104,4 +104,4 @@ if (string_pos(string_char_at(argument0, 1), "sixfoc") > 0) if (string_pos(string_char_at(argument0, 1), "d") > 0) return string_copy(argument0, 1, 2); -return ""; +return ""; \ No newline at end of file diff --git a/scripts/typing/testUnify.gml b/scripts/typing/testUnify.gml index 4669f1b..f2a8c85 100644 --- a/scripts/typing/testUnify.gml +++ b/scripts/typing/testUnify.gml @@ -108,4 +108,3 @@ else return true; return false; - diff --git a/sprites/placeholder/images/placeholderBlockX_0.png b/sprites/placeholder/images/placeholderBlockX_0.png new file mode 100644 index 0000000..3773da8 Binary files /dev/null and b/sprites/placeholder/images/placeholderBlockX_0.png differ diff --git a/sprites/placeholder/placeholderBlockX.sprite.gmx b/sprites/placeholder/placeholderBlockX.sprite.gmx new file mode 100644 index 0000000..a2e2c4b --- /dev/null +++ b/sprites/placeholder/placeholderBlockX.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 79 + 0 + 31 + 0 + 0 + + 0 + + 0 + 80 + 32 + + images\placeholderBlockX_0.png + +