From 4665c77e67d8e659e9b729831654800816776764 Mon Sep 17 00:00:00 2001 From: wqst Date: Fri, 12 Sep 2014 15:31:01 -0800 Subject: [PATCH 1/6] mytest --- hzhang91test.txt | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hzhang91test.txt diff --git a/hzhang91test.txt b/hzhang91test.txt new file mode 100644 index 0000000..e69de29 From 01354f97e266b8ac6892cb66c8149f86f7b32dca Mon Sep 17 00:00:00 2001 From: wqst Date: Wed, 17 Sep 2014 17:38:22 -0800 Subject: [PATCH 2/6] incomplete --- Platform Game.gmx/Platform Game.project.gmx | 5 +- .../objects/obj_movplatform.object.gmx | 104 ++++++++++++++++++ .../objects/obj_player.object.gmx | 14 ++- Platform Game.gmx/rooms/rm_level01.room.gmx | 3 + .../sprites/images/spr_moveplatform_0.png | Bin 0 -> 844 bytes .../sprites/spr_moveplatform.sprite.gmx | 25 +++++ Platform Game.gmx/sprites/sprite80.sprite.gmx | 23 ++++ 7 files changed, 172 insertions(+), 2 deletions(-) create mode 100644 Platform Game.gmx/objects/obj_movplatform.object.gmx create mode 100644 Platform Game.gmx/sprites/images/spr_moveplatform_0.png create mode 100644 Platform Game.gmx/sprites/spr_moveplatform.sprite.gmx create mode 100644 Platform Game.gmx/sprites/sprite80.sprite.gmx diff --git a/Platform Game.gmx/Platform Game.project.gmx b/Platform Game.gmx/Platform Game.project.gmx index 642c021..39b0695 100644 --- a/Platform Game.gmx/Platform Game.project.gmx +++ b/Platform Game.gmx/Platform Game.project.gmx @@ -104,6 +104,7 @@ sprites\spr_fadingblock sprites\spr_key sprites\spr_doorlocked + sprites\spr_moveplatform sprites\spr_spikeblockhl @@ -138,6 +139,7 @@ sprites\spr_blockflashing sprites\spr_blockfrozen + sprites\sprite80 background\bg_sky @@ -183,6 +185,7 @@ objects\obj_fadingblock objects\obj_goldkey objects\obj_doorlocked + objects\obj_movplatform objects\obj_spikeblockvd @@ -222,7 +225,7 @@ rooms\rm_level01 - 41894.9807427778 + 41900.0525971759 '1.0.0.1' diff --git a/Platform Game.gmx/objects/obj_movplatform.object.gmx b/Platform Game.gmx/objects/obj_movplatform.object.gmx new file mode 100644 index 0000000..95df510 --- /dev/null +++ b/Platform Game.gmx/objects/obj_movplatform.object.gmx @@ -0,0 +1,104 @@ + + + spr_moveplatform + 0 + -1 + 0 + 0 + <undefined> + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + sprite_index = -1; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + if (instance_exists(obj_player)) +{ + if (round(obj_player.y + (obj_player.sprite_height/2)) > y) || (obj_player.key_down) mask_index = -1; + + else mask_index = spr_moveplatform; + + + +} + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + draw_sprite(spr_moveplatform,0,x,y); + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + 0,0 + 16,16 + + diff --git a/Platform Game.gmx/objects/obj_player.object.gmx b/Platform Game.gmx/objects/obj_player.object.gmx index 079df58..15880ec 100644 --- a/Platform Game.gmx/objects/obj_player.object.gmx +++ b/Platform Game.gmx/objects/obj_player.object.gmx @@ -39,6 +39,8 @@ instance_create(x,y,obj_controller); invincible = false; +key_down = 0;// for platform + abilitystate = 0; previousstate = 0; transition = false; @@ -1250,7 +1252,17 @@ if collision_spikeblockvd && obj_controller.gameover = false 1 - + ///Check for platform + +key_jump = keyboard_check_pressed(vk_space); +key_down = keyboard_check(vk_down); + +if (place_meeting(x, y+1, obj_movplatform)) +{ + if (key_jump) vsp = -jumpspeed; + +} + diff --git a/Platform Game.gmx/rooms/rm_level01.room.gmx b/Platform Game.gmx/rooms/rm_level01.room.gmx index c0c3d09..d9e7845 100644 --- a/Platform Game.gmx/rooms/rm_level01.room.gmx +++ b/Platform Game.gmx/rooms/rm_level01.room.gmx @@ -79,6 +79,9 @@ + + + 0 diff --git a/Platform Game.gmx/sprites/images/spr_moveplatform_0.png b/Platform Game.gmx/sprites/images/spr_moveplatform_0.png new file mode 100644 index 0000000000000000000000000000000000000000..faa8ccc0f9d7f97878d04be243bf47295fbc1f0e GIT binary patch literal 844 zcmeAS@N?(olHy`uVBq!ia0vp^mw?!fgAGXT%sVB{z`!i*>EaktG3V`_*M3rgB5jH9 zdUj{uTE=U?%2Y~e%HqC~DTfVYL_|eJXWzT@DsFd@LFS4V(`=dF&$g+T=KE}zYiv9- z|LLZhd$%X^-@Y9&vESPIlj;2F@2{?U!`k>nn)fEZ^UsSpNv&UQgvXyL|9FizMMB8= zRtS&gQ;8rWgC$dvJx)F-@i;nJ_~hI7)%H8gPA@{Gay?=Tt1DPhNa+=Xc}QOo^aVhD%ZsJT#9_nAE7aRL0q>&1rM$ zTeikGGBP%Q_3vdHsI+a_n6-Cb=sTC7tnzzb=B7QmZQYrtc4_CnkLzknbA%kymD z$#=fAx&IQQrY-Z?b58s0MG_(<@9Q%}utSa7ljX5__0;C$+FSOQDYtT~<$K>(SBhoZt}IJlIs1B@h0WIH&wm}0_u5KNvfVv{*HVOU=IZN55v>SgxHUTrU>oBX1tox$E2Ug?17~YJ0fb zSS$`qU|>h`2i$iD7*Qm}X4p2kzufF{<>b|^OZi`B-u2OGV>xs2U`t!y65E|q@BO`E z7yYFEyuw2>u7tjMg|nXJ7*|`I_m+RQ`NOe&%*I-K9sTOBeqFZj$^9GV<_g7bbNBB& z|6RPL#G>wx_U%pnM^CjpF8rpNRXAs@Ti~@G&7EJquFNx+?s3zvia%guylBl&bN@1f izk8?f2oec?zU8<0BJ*2I<|HV;FnGH9xvX + + 0 + 105 + 35 + 1 + 0 + 0 + 0 + 0 + 209 + 0 + 44 + 0 + 0 + + 0 + + 0 + 210 + 70 + + images\spr_moveplatform_0.png + + diff --git a/Platform Game.gmx/sprites/sprite80.sprite.gmx b/Platform Game.gmx/sprites/sprite80.sprite.gmx new file mode 100644 index 0000000..e9127f2 --- /dev/null +++ b/Platform Game.gmx/sprites/sprite80.sprite.gmx @@ -0,0 +1,23 @@ + + + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + + 0 + + 0 + 32 + 32 + + From 0cbe591df2b1217260c0a9aa64aa065ba9cfa316 Mon Sep 17 00:00:00 2001 From: wqst Date: Thu, 18 Sep 2014 16:07:47 -0800 Subject: [PATCH 3/6] platform with bug --- Platform Game.gmx/Platform Game.project.gmx | 15 +- .../objects/obj_horplatform.object.gmx | 104 ++++++++++++++ ...orm.object.gmx => obj_platform.object.gmx} | 14 +- .../objects/obj_platformbound.object.gmx | 26 ++++ .../objects/obj_player.object.gmx | 133 ++++++++++++++---- .../objects/obj_verplatform.object.gmx | 104 ++++++++++++++ Platform Game.gmx/objects/object50.object.gmx | 23 +++ Platform Game.gmx/objects/object52.object.gmx | 23 +++ Platform Game.gmx/objects/object54.object.gmx | 23 +++ Platform Game.gmx/rooms/rm_level01.room.gmx | 9 +- .../sprites/images/spr_horplatform_0.png | Bin 0 -> 793 bytes .../sprites/images/spr_platform_0.png | Bin 0 -> 844 bytes .../sprites/images/spr_platformbounds_0.png | Bin 0 -> 481 bytes .../sprites/images/spr_verplatform_0.png | Bin 0 -> 793 bytes ....sprite.gmx => spr_horplatform.sprite.gmx} | 4 +- .../sprites/spr_platform.sprite.gmx | 25 ++++ .../sprites/spr_platformbounds.sprite.gmx | 25 ++++ .../sprites/spr_verplatform.sprite.gmx | 25 ++++ 18 files changed, 508 insertions(+), 45 deletions(-) create mode 100644 Platform Game.gmx/objects/obj_horplatform.object.gmx rename Platform Game.gmx/objects/{obj_movplatform.object.gmx => obj_platform.object.gmx} (89%) create mode 100644 Platform Game.gmx/objects/obj_platformbound.object.gmx create mode 100644 Platform Game.gmx/objects/obj_verplatform.object.gmx create mode 100644 Platform Game.gmx/objects/object50.object.gmx create mode 100644 Platform Game.gmx/objects/object52.object.gmx create mode 100644 Platform Game.gmx/objects/object54.object.gmx create mode 100644 Platform Game.gmx/sprites/images/spr_horplatform_0.png create mode 100644 Platform Game.gmx/sprites/images/spr_platform_0.png create mode 100644 Platform Game.gmx/sprites/images/spr_platformbounds_0.png create mode 100644 Platform Game.gmx/sprites/images/spr_verplatform_0.png rename Platform Game.gmx/sprites/{spr_moveplatform.sprite.gmx => spr_horplatform.sprite.gmx} (87%) create mode 100644 Platform Game.gmx/sprites/spr_platform.sprite.gmx create mode 100644 Platform Game.gmx/sprites/spr_platformbounds.sprite.gmx create mode 100644 Platform Game.gmx/sprites/spr_verplatform.sprite.gmx diff --git a/Platform Game.gmx/Platform Game.project.gmx b/Platform Game.gmx/Platform Game.project.gmx index 39b0695..7899d8b 100644 --- a/Platform Game.gmx/Platform Game.project.gmx +++ b/Platform Game.gmx/Platform Game.project.gmx @@ -38,6 +38,7 @@ sprites\spr_spikebounds sprites\spr_text sprites\spr_next_level + sprites\spr_platformbounds sprites\spr_redflaglimp sprites\spr_redflagwaving @@ -104,7 +105,9 @@ sprites\spr_fadingblock sprites\spr_key sprites\spr_doorlocked - sprites\spr_moveplatform + sprites\spr_platform + sprites\spr_horplatform + sprites\spr_verplatform sprites\spr_spikeblockhl @@ -166,6 +169,8 @@ objects\obj_text objects\obj_next_level objects\obj_pause_menu_controller + objects\obj_platformbound + objects\object54 objects\obj_player @@ -185,7 +190,10 @@ objects\obj_fadingblock objects\obj_goldkey objects\obj_doorlocked - objects\obj_movplatform + objects\obj_platform + objects\obj_horplatform + objects\obj_verplatform + objects\object52 objects\obj_spikeblockvd @@ -219,13 +227,14 @@ objects\obj_blockflashing objects\obj_blockfrozen + objects\object50 rooms\rm_initialize rooms\rm_level01 - 41900.0525971759 + 41901.0032896296 '1.0.0.1' diff --git a/Platform Game.gmx/objects/obj_horplatform.object.gmx b/Platform Game.gmx/objects/obj_horplatform.object.gmx new file mode 100644 index 0000000..85913d3 --- /dev/null +++ b/Platform Game.gmx/objects/obj_horplatform.object.gmx @@ -0,0 +1,104 @@ + + + spr_horplatform + -1 + -1 + 0 + 0 + obj_platform + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + sprite_index = -1; +dir = -1; +movespeed = 3; +hsp = 0; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + mask_index = spr_horplatform; + +hsp = dir * movespeed; + +if (place_meeting(x+hsp,y,obj_platformbound)) +{ + while(!place_meeting(x+sign(hsp),y, obj_collision)) + { + x += sign(hsp); + } + hsp = 0; + dir *= -1; +} +x += hsp; + +if (instance_exists(obj_player)) +{ +if (round(obj_player.y + (obj_player.sprite_height/2)) > y) || (obj_player.key_down) mask_index = -1; + +else +{ + mask_index = spr_platform; + if place_meeting(x, y-1, obj_player) + { + obj_player.hsp_carry = hsp; + } + +} +} + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + 105,22 + 105,105 + + diff --git a/Platform Game.gmx/objects/obj_movplatform.object.gmx b/Platform Game.gmx/objects/obj_platform.object.gmx similarity index 89% rename from Platform Game.gmx/objects/obj_movplatform.object.gmx rename to Platform Game.gmx/objects/obj_platform.object.gmx index 95df510..5dd497d 100644 --- a/Platform Game.gmx/objects/obj_movplatform.object.gmx +++ b/Platform Game.gmx/objects/obj_platform.object.gmx @@ -1,11 +1,11 @@ - spr_moveplatform - 0 + spr_platform + -1 -1 0 0 - <undefined> + obj_collision <undefined> @@ -50,11 +50,11 @@ 1 if (instance_exists(obj_player)) { - if (round(obj_player.y + (obj_player.sprite_height/2)) > y) || (obj_player.key_down) mask_index = -1; +if (round(obj_player.y + (obj_player.sprite_height/2)) > y) || (obj_player.key_down) mask_index = -1; + +else mask_index = spr_platform; - else mask_index = spr_moveplatform; - } @@ -79,7 +79,7 @@ 1 - draw_sprite(spr_moveplatform,0,x,y); + draw_sprite(spr_platform,0,x,y); diff --git a/Platform Game.gmx/objects/obj_platformbound.object.gmx b/Platform Game.gmx/objects/obj_platformbound.object.gmx new file mode 100644 index 0000000..834f771 --- /dev/null +++ b/Platform Game.gmx/objects/obj_platformbound.object.gmx @@ -0,0 +1,26 @@ + + + spr_platformbounds + 0 + 0 + 0 + 0 + obj_collision + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + 35,35 + 35,35 + + diff --git a/Platform Game.gmx/objects/obj_player.object.gmx b/Platform Game.gmx/objects/obj_player.object.gmx index 15880ec..fa01ab1 100644 --- a/Platform Game.gmx/objects/obj_player.object.gmx +++ b/Platform Game.gmx/objects/obj_player.object.gmx @@ -62,6 +62,8 @@ atwatersurface = false; //Physics Variables grav = 1; hsp = 0; +hsp_carry = 0; +vsp_carry = 0; vsp = 0; jumpspeed = 25; movespeed = 8; @@ -171,6 +173,107 @@ previousstate = abilitystate; + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Collision with horplatform +//hsp_carry = 0; +var hsp_final = hsp + hsp_carry; +hsp_carry = 0; + +//Horizontal Collision +if (place_meeting(x+hsp_final, y, obj_collision)) +{ + while (!place_meeting(x+sign(hsp_final),y,obj_collision)) + { + x += sign(hsp_final); + } + hsp_final = 0; + hsp = 0; +} + +x += hsp_final; + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Collision with verplatform +var vsp_final = vsp + vsp_carry; +vsp_carry = 0; + +//Vertical Collision +if (place_meeting(x, y+vsp_final, obj_verplatform)) +{ + while (!place_meeting(x, y+sign(vsp_final),obj_verplatform)) + { + y += sign(vsp_final); + } + vsp_final = 0; + vsp = 0; +} + +y += vsp_final; + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///check for platform + +key_down = keyboard_check(vk_down); + +if (place_meeting(x, y+1, obj_platform)) +{ + if (input_jump) vsp = -jumpspeed; +} + + + + 1 605 @@ -1232,36 +1335,6 @@ if collision_spikeblockvd && obj_controller.gameover = false { obj_controller.gameover = true; } - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Check for platform - -key_jump = keyboard_check_pressed(vk_space); -key_down = keyboard_check(vk_down); - -if (place_meeting(x, y+1, obj_movplatform)) -{ - if (key_jump) vsp = -jumpspeed; - -} diff --git a/Platform Game.gmx/objects/obj_verplatform.object.gmx b/Platform Game.gmx/objects/obj_verplatform.object.gmx new file mode 100644 index 0000000..44b8e8a --- /dev/null +++ b/Platform Game.gmx/objects/obj_verplatform.object.gmx @@ -0,0 +1,104 @@ + + + spr_verplatform + -1 + -1 + 0 + 0 + obj_platform + <undefined> + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + sprite_index = -1; +dir = 1; +movespeed = 3; +vsp = 0; + + + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + mask_index = spr_verplatform; + +vsp = dir * movespeed; + +if (place_meeting(x,y+vsp,obj_platformbound)) +{ + while(!place_meeting(x,y+sign(vsp), obj_collision)) + { + y += sign(vsp); + } + vsp = 0; + dir *= -1; +} +y += vsp; + +if (instance_exists(obj_player)) +{ +if (round(obj_player.y + (obj_player.sprite_height/2)) > y) || (obj_player.key_down) mask_index = -1; + +else +{ + mask_index = spr_platform; + if place_meeting(x, y-1, obj_player) + { + obj_player.vsp_carry = vsp; + } + +} +} + + + + + + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + 105,22 + 105,105 + + diff --git a/Platform Game.gmx/objects/object50.object.gmx b/Platform Game.gmx/objects/object50.object.gmx new file mode 100644 index 0000000..eeed8ac --- /dev/null +++ b/Platform Game.gmx/objects/object50.object.gmx @@ -0,0 +1,23 @@ + + + <undefined> + 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/Platform Game.gmx/objects/object52.object.gmx b/Platform Game.gmx/objects/object52.object.gmx new file mode 100644 index 0000000..eeed8ac --- /dev/null +++ b/Platform Game.gmx/objects/object52.object.gmx @@ -0,0 +1,23 @@ + + + <undefined> + 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/Platform Game.gmx/objects/object54.object.gmx b/Platform Game.gmx/objects/object54.object.gmx new file mode 100644 index 0000000..e7fe7a1 --- /dev/null +++ b/Platform Game.gmx/objects/object54.object.gmx @@ -0,0 +1,23 @@ + + + spr_platformbounds + -1 + 0 + 0 + 0 + obj_enemybounds + <undefined> + + 0 + 0 + 0 + 0.5 + 0.100000001490116 + 0 + 0.100000001490116 + 0.100000001490116 + 0.200000002980232 + -1 + 0 + + diff --git a/Platform Game.gmx/rooms/rm_level01.room.gmx b/Platform Game.gmx/rooms/rm_level01.room.gmx index d9e7845..125fb96 100644 --- a/Platform Game.gmx/rooms/rm_level01.room.gmx +++ b/Platform Game.gmx/rooms/rm_level01.room.gmx @@ -79,9 +79,12 @@ - - - + + + + + + 0 diff --git a/Platform Game.gmx/sprites/images/spr_horplatform_0.png b/Platform Game.gmx/sprites/images/spr_horplatform_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ac32b162625e1bac3e0a71ddd5243fa71c0c691b GIT binary patch literal 793 zcmeAS@N?(olHy`uVBq!ia0vp^mw?!fgAGXT%sVB{z`*pt)5S5QV$R#SXY+13NHA0y z-&?ml%+h4yEiTO|^I3S7-bj#UZftQ7^0*p)>(}O>mCL;j&W~I_bK*0u$ZB=(MPGw{ zzx#cRb^n*DXT`g7?P6j>FZuVj{d`ur%upt3|20?5@9&eX{BB?0#gV;DUr$jmNK|FX zBoB`~Zx7Xp6Ygv?+f#3Fd{@QaQlsCVNwXer{K_3RMf~it%+`r7)jltN?|$>|E8a6l zOE3T0YWI2qTldmT|7ADxw`f(}d^^ieX7+7M#hojR6g}zfb2X z%C%n$&zrz;GLrLTF6T-Wp-H!ef;?^7C#?Ic(0lUqzv^&Ppy)hj5A)4Owk%)xH9NND zT#HHd&DlSG9`)I79s1Yg!o#e&z6mo=Y@703e$9L1T>lEERRtcdlFJ+a`6U1PxM8E+ z#Z^Gx2nh)Ry=1AP;^g#aeT$373I(8;mWM}63)eHQ%({xRTV$Q@O>k>zu{xD%H9mU*V((vN_vt{(abk@E7GDSdmgM_*>vW1O5U&TrC&ED|12?5sVs9hb0}N% z;>m2`|8@<>vs(YZO7Sq7m?~bFZDd>NQKT}%CFZGmH3uGdcPtVos?9x`!0FvUOe-yeX@L+a$;ux@skrOdJfh8 zEm^vuG@)-z$gS0rCo6UuO{~tpUviJDX|l_e-bZg9+TBiG-?T~Urj={ftaVEaktG3V`_*M3rgB5jH9 zdUj{uTE=U?%2Y~e%HqC~DTfVYL_|eJXWzT@DsFd@LFS4V(`=dF&$g+T=KE}zYiv9- z|LLZhd$%X^-@Y9&vESPIlj;2F@2{?U!`k>nn)fEZ^UsSpNv&UQgvXyL|9FizMMB8= zRtS&gQ;8rWgC$dvJx)F-@i;nJ_~hI7)%H8gPA@{Gay?=Tt1DPhNa+=Xc}QOo^aVhD%ZsJT#9_nAE7aRL0q>&1rM$ zTeikGGBP%Q_3vdHsI+a_n6-Cb=sTC7tnzzb=B7QmZQYrtc4_CnkLzknbA%kymD z$#=fAx&IQQrY-Z?b58s0MG_(<@9Q%}utSa7ljX5__0;C$+FSOQDYtT~<$K>(SBhoZt}IJlIs1B@h0WIH&wm}0_u5KNvfVv{*HVOU=IZN55v>SgxHUTrU>oBX1tox$E2Ug?17~YJ0fb zSS$`qU|>h`2i$iD7*Qm}X4p2kzufF{<>b|^OZi`B-u2OGV>xs2U`t!y65E|q@BO`E z7yYFEyuw2>u7tjMg|nXJ7*|`I_m+RQ`NOe&%*I-K9sTOBeqFZj$^9GV<_g7bbNBB& z|6RPL#G>wx_U%pnM^CjpF8rpNRXAs@Ti~@G&7EJquFNx+?s3zvia%guylBl&bN@1f izk8?f2oec?zU8<0BJ*2I<|HV;FnGH9xvXlze5fZM?dcS zAHBfQ>CPo3?{1CmH~WImDz03qd}Nt%+Onthg?T$(d^&BCd(PbD^5gV4)AOf8{~5&3 zxl}**>0FDldAFxO{BBvJ#>6I((7-9^_VP$)@r<}xmF^qcUZw^w*Dyb+u)ltOHIS<* zw{o{RavxPASIBtAD3o`K_ zE6^Pv6Ay6$O%Jy2?|zyoBvikqQB$d>=)CMo??T4Q^Y>Qnx162Q{@7pQ?+w}BwEh*8dl5I?Bdv1r{>nO;(vnIUwbpqRK-`puhQS8Qda^@bG zQC%y=pZr;3>f)*FAb&9Tq)XJ^XDDVn_Q#It*nx{5MHBQ`fKJ)iq-hoxr|Xjx!msuD zYx|Ey$Ma--l6ov(xv7T#+>tuP?U2Uex9iM0j;TEF(klLR(L>_;#kh2^-Zu&R7&<2& Ub%7 literal 0 HcmV?d00001 diff --git a/Platform Game.gmx/sprites/images/spr_verplatform_0.png b/Platform Game.gmx/sprites/images/spr_verplatform_0.png new file mode 100644 index 0000000000000000000000000000000000000000..ac32b162625e1bac3e0a71ddd5243fa71c0c691b GIT binary patch literal 793 zcmeAS@N?(olHy`uVBq!ia0vp^mw?!fgAGXT%sVB{z`*pt)5S5QV$R#SXY+13NHA0y z-&?ml%+h4yEiTO|^I3S7-bj#UZftQ7^0*p)>(}O>mCL;j&W~I_bK*0u$ZB=(MPGw{ zzx#cRb^n*DXT`g7?P6j>FZuVj{d`ur%upt3|20?5@9&eX{BB?0#gV;DUr$jmNK|FX zBoB`~Zx7Xp6Ygv?+f#3Fd{@QaQlsCVNwXer{K_3RMf~it%+`r7)jltN?|$>|E8a6l zOE3T0YWI2qTldmT|7ADxw`f(}d^^ieX7+7M#hojR6g}zfb2X z%C%n$&zrz;GLrLTF6T-Wp-H!ef;?^7C#?Ic(0lUqzv^&Ppy)hj5A)4Owk%)xH9NND zT#HHd&DlSG9`)I79s1Yg!o#e&z6mo=Y@703e$9L1T>lEERRtcdlFJ+a`6U1PxM8E+ z#Z^Gx2nh)Ry=1AP;^g#aeT$373I(8;mWM}63)eHQ%({xRTV$Q@O>k>zu{xD%H9mU*V((vN_vt{(abk@E7GDSdmgM_*>vW1O5U&TrC&ED|12?5sVs9hb0}N% z;>m2`|8@<>vs(YZO7Sq7m?~bFZDd>NQKT}%CFZGmH3uGdcPtVos?9x`!0FvUOe-yeX@L+a$;ux@skrOdJfh8 zEm^vuG@)-z$gS0rCo6UuO{~tpUviJDX|l_e-bZg9+TBiG-?T~Urj={ftaV 0 105 - 35 + 22 1 0 0 @@ -20,6 +20,6 @@ 210 70 - images\spr_moveplatform_0.png + images\spr_horplatform_0.png diff --git a/Platform Game.gmx/sprites/spr_platform.sprite.gmx b/Platform Game.gmx/sprites/spr_platform.sprite.gmx new file mode 100644 index 0000000..60e6b00 --- /dev/null +++ b/Platform Game.gmx/sprites/spr_platform.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 105 + 22 + 1 + 0 + 0 + 0 + 0 + 209 + 0 + 44 + 0 + 0 + + 0 + + 0 + 210 + 70 + + images\spr_platform_0.png + + diff --git a/Platform Game.gmx/sprites/spr_platformbounds.sprite.gmx b/Platform Game.gmx/sprites/spr_platformbounds.sprite.gmx new file mode 100644 index 0000000..2009b44 --- /dev/null +++ b/Platform Game.gmx/sprites/spr_platformbounds.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 35 + 35 + 1 + 0 + 0 + 0 + 0 + 69 + 0 + 69 + 0 + 0 + + 0 + + 0 + 70 + 70 + + images\spr_platformbounds_0.png + + diff --git a/Platform Game.gmx/sprites/spr_verplatform.sprite.gmx b/Platform Game.gmx/sprites/spr_verplatform.sprite.gmx new file mode 100644 index 0000000..58f9b04 --- /dev/null +++ b/Platform Game.gmx/sprites/spr_verplatform.sprite.gmx @@ -0,0 +1,25 @@ + + + 0 + 105 + 22 + 1 + 0 + 0 + 0 + 0 + 209 + 0 + 44 + 0 + 0 + + 0 + + 0 + 210 + 70 + + images\spr_verplatform_0.png + + From 9506639089ef49361e7f90f0606bcce444211fb7 Mon Sep 17 00:00:00 2001 From: wqst Date: Fri, 19 Sep 2014 15:41:11 -0800 Subject: [PATCH 4/6] bug commit --- Platform Game.gmx/Platform Game.project.gmx | 6 +- .../objects/obj_player.object.gmx | 198 ++++++++---------- Platform Game.gmx/rooms/rm_level01.room.gmx | 5 +- 3 files changed, 95 insertions(+), 114 deletions(-) diff --git a/Platform Game.gmx/Platform Game.project.gmx b/Platform Game.gmx/Platform Game.project.gmx index 7899d8b..18f9b0f 100644 --- a/Platform Game.gmx/Platform Game.project.gmx +++ b/Platform Game.gmx/Platform Game.project.gmx @@ -170,7 +170,6 @@ objects\obj_next_level objects\obj_pause_menu_controller objects\obj_platformbound - objects\object54 objects\obj_player @@ -192,8 +191,6 @@ objects\obj_doorlocked objects\obj_platform objects\obj_horplatform - objects\obj_verplatform - objects\object52 objects\obj_spikeblockvd @@ -227,14 +224,13 @@ objects\obj_blockflashing objects\obj_blockfrozen - objects\object50 rooms\rm_initialize rooms\rm_level01 - 41901.0032896296 + 41901.9844195139 '1.0.0.1' diff --git a/Platform Game.gmx/objects/obj_player.object.gmx b/Platform Game.gmx/objects/obj_player.object.gmx index fa01ab1..cfed84d 100644 --- a/Platform Game.gmx/objects/obj_player.object.gmx +++ b/Platform Game.gmx/objects/obj_player.object.gmx @@ -173,107 +173,6 @@ previousstate = abilitystate; - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Collision with horplatform -//hsp_carry = 0; -var hsp_final = hsp + hsp_carry; -hsp_carry = 0; - -//Horizontal Collision -if (place_meeting(x+hsp_final, y, obj_collision)) -{ - while (!place_meeting(x+sign(hsp_final),y,obj_collision)) - { - x += sign(hsp_final); - } - hsp_final = 0; - hsp = 0; -} - -x += hsp_final; - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///Collision with verplatform -var vsp_final = vsp + vsp_carry; -vsp_carry = 0; - -//Vertical Collision -if (place_meeting(x, y+vsp_final, obj_verplatform)) -{ - while (!place_meeting(x, y+sign(vsp_final),obj_verplatform)) - { - y += sign(vsp_final); - } - vsp_final = 0; - vsp = 0; -} - -y += vsp_final; - - - - - - 1 - 603 - 7 - 0 - 0 - -1 - 2 - - - self - 0 - 0 - - - 1 - ///check for platform - -key_down = keyboard_check(vk_down); - -if (place_meeting(x, y+1, obj_platform)) -{ - if (input_jump) vsp = -jumpspeed; -} - - - - 1 605 @@ -1279,6 +1178,34 @@ if collision_spikeblockhr && obj_controller.gameover = false { obj_controller.gameover = true; } + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Collision with spikeblockvd + +collision_spikeblockvd = instance_place(x,y,obj_spikeblockvd) + +if collision_spikeblockvd && obj_controller.gameover = false +{ + obj_controller.gameover = true; +} @@ -1327,13 +1254,74 @@ if collision_spikeblockvu && obj_controller.gameover = false 1 - ///Collision with spikeblockvd + ///Collision with horplatform -collision_spikeblockvd = instance_place(x,y,obj_spikeblockvd) -if collision_spikeblockvd && obj_controller.gameover = false +var hsp_final = hsp + hsp_carry; +//var vsp_final = vsp + vsp_carry; +hsp_carry = 0; +//vsp_carry = 0; + +//Vertical Collision +if (place_meeting(x+hsp_final, y, obj_platform)) { - obj_controller.gameover = true; + while (!place_meeting(x+ sign(hsp_final), y, obj_platform)) + { + x += sign(hsp_final); + //y += sign(vsp_final); + } + hsp_final = 0; + //vsp_final = 0; + hsp = 0; + //vsp = 0; + } + +x += hsp_final; +//y += vsp_final; +/*//hsp_carry = 0; +var hsp_final = hsp + hsp_carry; +hsp_carry = 0; + +//Horizontal Collision +if (place_meeting(x+hsp_final, y, obj_horplatform)) +{ + while (!place_meeting(x+sign(hsp_final),y,obj_horplatform)) + { + x += sign(hsp_final); + } + hsp_final = 0; + hsp = 0; + //+sign(vsp_final +} + +x += hsp_final;*/ + + + + + + 1 + 603 + 7 + 0 + 0 + -1 + 2 + + + self + 0 + 0 + + + 1 + ///Check for platform + +key_down = keyboard_check(vk_down); + +if (place_meeting(x, y+1, obj_platform)) +{ + if (input_jump) vsp = -jumpspeed; } diff --git a/Platform Game.gmx/rooms/rm_level01.room.gmx b/Platform Game.gmx/rooms/rm_level01.room.gmx index 125fb96..45a1e77 100644 --- a/Platform Game.gmx/rooms/rm_level01.room.gmx +++ b/Platform Game.gmx/rooms/rm_level01.room.gmx @@ -80,11 +80,8 @@ - - - - + 0 From 01b1d9c0436939090b3cf26720be12334846e27a Mon Sep 17 00:00:00 2001 From: wqst Date: Fri, 19 Sep 2014 15:57:11 -0800 Subject: [PATCH 5/6] bug commit --- Platform Game.gmx/Platform Game.project.gmx | 1 - 1 file changed, 1 deletion(-) diff --git a/Platform Game.gmx/Platform Game.project.gmx b/Platform Game.gmx/Platform Game.project.gmx index 18f9b0f..b9fd600 100644 --- a/Platform Game.gmx/Platform Game.project.gmx +++ b/Platform Game.gmx/Platform Game.project.gmx @@ -227,7 +227,6 @@ rooms\rm_initialize - rooms\rm_level01 41901.9844195139 From 0966ed7992ed81b2c642357a8bf4932a40f8cc8a Mon Sep 17 00:00:00 2001 From: seniorcheeseman Date: Fri, 19 Sep 2014 20:23:17 -0500 Subject: [PATCH 6/6] Delete rm_level01.room.gmx should help fix stuff --- Platform Game.gmx/rooms/rm_level01.room.gmx | 95 --------------------- 1 file changed, 95 deletions(-) delete mode 100644 Platform Game.gmx/rooms/rm_level01.room.gmx diff --git a/Platform Game.gmx/rooms/rm_level01.room.gmx b/Platform Game.gmx/rooms/rm_level01.room.gmx deleted file mode 100644 index 45a1e77..0000000 --- a/Platform Game.gmx/rooms/rm_level01.room.gmx +++ /dev/null @@ -1,95 +0,0 @@ - - - - 8400 - 3500 - 35 - 35 - 0 - 60 - 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 -