diff --git a/TMoLaD.yyp b/TMoLaD.yyp old mode 100755 new mode 100644 diff --git a/objects/obj_HUD/Create_0.gml b/objects/obj_HUD/Create_0.gml old mode 100755 new mode 100644 index 30bad82..1fe0453 --- a/objects/obj_HUD/Create_0.gml +++ b/objects/obj_HUD/Create_0.gml @@ -1,2 +1,6 @@ global.stuffs = 25000 - + +moddy = 0; +global.shottype = 0; +global.currentmin = 0; +global.dead = 0; \ No newline at end of file diff --git a/objects/obj_HUD/Draw_0.gml b/objects/obj_HUD/Draw_0.gml old mode 100755 new mode 100644 index d050c15..2e28fba --- a/objects/obj_HUD/Draw_0.gml +++ b/objects/obj_HUD/Draw_0.gml @@ -39,7 +39,7 @@ switch global.RANK draw_text(950,720,string_hash_to_newline(fps)); draw_text(50,720,string_hash_to_newline("Lives:")); moddy = 0 -repeat (global.lives) +repeat (global.life) { draw_sprite(spr_lives,0,150+moddy,720); moddy += 50 diff --git a/objects/obj_HUD/obj_HUD.yy b/objects/obj_HUD/obj_HUD.yy old mode 100755 new mode 100644 diff --git a/objects/obj_advance/Create_0.gml b/objects/obj_advance/Create_0.gml old mode 100755 new mode 100644 index e122a2a..7365c16 --- a/objects/obj_advance/Create_0.gml +++ b/objects/obj_advance/Create_0.gml @@ -1,6 +1,12 @@ -var __b__; -__b__ = action_if_sound(snd_EisiolsTheme); -if !__b__ -{ -action_sound(snd_EisiolsTheme, 1); -} +var __b__; +__b__ = action_if_sound(snd_EisiolsTheme); +if !__b__ +{ +action_sound(snd_EisiolsTheme, 1); +} + +blah = 0; +delayer = 0; +global.difficulty = 2; +menupos = 0; +tickers = 0; \ No newline at end of file diff --git a/objects/obj_advance/KeyPress_90.gml b/objects/obj_advance/KeyPress_90.gml old mode 100755 new mode 100644 index f6b0f1a..039c174 --- a/objects/obj_advance/KeyPress_90.gml +++ b/objects/obj_advance/KeyPress_90.gml @@ -13,10 +13,10 @@ if menupos == 1 } if menupos == 2 { - instance_create(0,0,object27); + instance_create_depth(0,0, -5, object27); } if menupos == 3 { game_end(); } - + diff --git a/objects/obj_advance/obj_advance.yy b/objects/obj_advance/obj_advance.yy old mode 100755 new mode 100644 diff --git a/objects/obj_bossSprite/Alarm_0.gml b/objects/obj_bossSprite/Alarm_0.gml old mode 100755 new mode 100644 index bf12db5..704a99a --- a/objects/obj_bossSprite/Alarm_0.gml +++ b/objects/obj_bossSprite/Alarm_0.gml @@ -25,7 +25,7 @@ if global.bossHP < 17501 and global.bossHP > 4000 { global.bossHP = 17500 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[1] = 60 alarm[0] = -1 diff --git a/objects/obj_bossSprite/Alarm_1.gml b/objects/obj_bossSprite/Alarm_1.gml old mode 100755 new mode 100644 index e8f9938..765f2bc --- a/objects/obj_bossSprite/Alarm_1.gml +++ b/objects/obj_bossSprite/Alarm_1.gml @@ -6,6 +6,7 @@ if global.shottype != 8 global.shottype = 2 if shooting = 1 { + if (instance_exists( obj_player ) ) { stuff = instance_create(x,y,obj_bullet_boss_1); with (stuff) { @@ -13,6 +14,7 @@ if shooting = 1 speed = 9; } sound_play(snd_themshoot); + } alarm[1] = 5-global.RANK; } if global.bossHP > 17000 @@ -21,7 +23,7 @@ if global.bossHP < 17001 and global.bossHP > 4000 { untouchable = 1 global.bossHP = 17000 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[2] = 120 alarm[1] = -1 @@ -36,4 +38,4 @@ if global.bossHP < 1 } alarm[1] = -1 } - + diff --git a/objects/obj_bossSprite/Alarm_10.gml b/objects/obj_bossSprite/Alarm_10.gml old mode 100755 new mode 100644 index 7ab289d..a188b32 --- a/objects/obj_bossSprite/Alarm_10.gml +++ b/objects/obj_bossSprite/Alarm_10.gml @@ -32,7 +32,7 @@ if global.bossHP < 22501 and global.bossHP > 4000 { global.bossHP = 22500 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[9] = 60 alarm[10] = -1 diff --git a/objects/obj_bossSprite/Alarm_2.gml b/objects/obj_bossSprite/Alarm_2.gml old mode 100755 new mode 100644 index 24c6e11..44c203e --- a/objects/obj_bossSprite/Alarm_2.gml +++ b/objects/obj_bossSprite/Alarm_2.gml @@ -36,7 +36,7 @@ if global.bossHP < 14001 and global.bossHP > 4000 { global.bossHP = 14000 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[3] = 120 alarm[2] = -1 diff --git a/objects/obj_bossSprite/Alarm_3.gml b/objects/obj_bossSprite/Alarm_3.gml old mode 100755 new mode 100644 index f3f8686..2557f60 --- a/objects/obj_bossSprite/Alarm_3.gml +++ b/objects/obj_bossSprite/Alarm_3.gml @@ -27,6 +27,7 @@ if shooting = 1 globs += 1 if globs = 40 { + if ( instance_exists( obj_player ) ) { repeat (3 + 3*global.RANK){ stuff = instance_create(x,y,obj_bullet_boss_4); with (stuff) @@ -37,6 +38,7 @@ if shooting = 1 } global.gods += 1 } + } global.gods = 0 globs = 0; } @@ -48,7 +50,7 @@ if global.bossHP < 12001 and global.bossHP > 4000 { untouchable = 1 global.bossHP = 12000 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[4] = 120 alarm[3] = -1 @@ -64,4 +66,4 @@ if global.bossHP < 1 } alarm[3] = -1; } - + diff --git a/objects/obj_bossSprite/Alarm_4.gml b/objects/obj_bossSprite/Alarm_4.gml old mode 100755 new mode 100644 index 8a45065..833802c --- a/objects/obj_bossSprite/Alarm_4.gml +++ b/objects/obj_bossSprite/Alarm_4.gml @@ -29,7 +29,7 @@ if global.bossHP < 9001 and global.bossHP > 4000 { global.bossHP = 9000 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) __background_set( e__BG.Visible, 1, false ) alarm[5] = 120 diff --git a/objects/obj_bossSprite/Alarm_5.gml b/objects/obj_bossSprite/Alarm_5.gml old mode 100755 new mode 100644 index 34bdb05..12ae6fc --- a/objects/obj_bossSprite/Alarm_5.gml +++ b/objects/obj_bossSprite/Alarm_5.gml @@ -36,7 +36,7 @@ if global.bossHP < 6001 and global.bossHP > 4000 { global.bossHP = 6000 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[6] = 120 alarm[5] = -1 diff --git a/objects/obj_bossSprite/Alarm_6.gml b/objects/obj_bossSprite/Alarm_6.gml old mode 100755 new mode 100644 index 9b69d2c..569723d --- a/objects/obj_bossSprite/Alarm_6.gml +++ b/objects/obj_bossSprite/Alarm_6.gml @@ -24,7 +24,7 @@ if global.bossHP < 4500 and global.bossHP > 4000 { global.bossHP = 4500 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[7] = 120 alarm[6] = -1 diff --git a/objects/obj_bossSprite/Alarm_8.gml b/objects/obj_bossSprite/Alarm_8.gml old mode 100755 new mode 100644 index 334658f..9e3759a --- a/objects/obj_bossSprite/Alarm_8.gml +++ b/objects/obj_bossSprite/Alarm_8.gml @@ -25,7 +25,7 @@ if global.bossHP < 17501 and global.bossHP > 4000 { global.bossHP = 17500 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[1] = 60 alarm[0] = -1 diff --git a/objects/obj_bossSprite/Alarm_9.gml b/objects/obj_bossSprite/Alarm_9.gml old mode 100755 new mode 100644 index 8408f30..daf8c54 --- a/objects/obj_bossSprite/Alarm_9.gml +++ b/objects/obj_bossSprite/Alarm_9.gml @@ -44,7 +44,7 @@ if global.bossHP < 20001 and global.bossHP > 4000 { global.bossHP = 20000 untouchable = 1 - global.lives += 1 + global.life += 1 sound_play(snd_attackcomplete) alarm[0] = 60 alarm[9] = -1 diff --git a/objects/obj_bossSprite/Create_0.gml b/objects/obj_bossSprite/Create_0.gml old mode 100755 new mode 100644 index 4a7f44f..9b1a301 --- a/objects/obj_bossSprite/Create_0.gml +++ b/objects/obj_bossSprite/Create_0.gml @@ -5,4 +5,32 @@ __background_set( e__BG.YScale, 0, 4 ); global.bossHP = 25000; alarm[11] = 15 global.RANK = global.difficulty; - + +blocks = 0; +untouchable = 0; +prevhp = 0; +blah = 0; +moving = 0; +possible = 0; +dirs = 0; +mult = 0; +multgrav = 0; +typo = 0; +shooting = 0; +erase = 0; +talks = 0; +global.steppers = 0; +wara = 0; +global.blanks = 0; +global.wara = 0; +global.rotator = 0; +global.ero = 0; +global.modos = 0; +global.turner = 0; +global.mods = 0; +globs = 0; +global.gods = 0; +global.roms = 0; +global.romsb = 0; +global.send = 0; +global.directs = 0; \ No newline at end of file diff --git a/objects/obj_bossSprite/Step_0.gml b/objects/obj_bossSprite/Step_0.gml old mode 100755 new mode 100644 index c6644de..e2b9ff5 --- a/objects/obj_bossSprite/Step_0.gml +++ b/objects/obj_bossSprite/Step_0.gml @@ -31,6 +31,7 @@ if moving <= 0 and possible = 1 { movex = x-100+irandom(200) movey = y-20+irandom(40) + if (instance_exists(obj_player) ) { if (movex < x and x > obj_player.x) or (movex > x and x < obj_player.x) { if movey > 300 @@ -52,6 +53,7 @@ if moving <= 0 and possible = 1 moving = 20 move_towards_point(movex,movey,3); } + } friction = .05 } @@ -59,4 +61,4 @@ if speed <= 1 { moving -= 1 } - + diff --git a/objects/obj_bossSprite/obj_bossSprite.yy b/objects/obj_bossSprite/obj_bossSprite.yy old mode 100755 new mode 100644 diff --git a/objects/obj_bullet_boss_1/Create_0.gml b/objects/obj_bullet_boss_1/Create_0.gml old mode 100755 new mode 100644 index 07997a8..b1b1103 --- a/objects/obj_bullet_boss_1/Create_0.gml +++ b/objects/obj_bullet_boss_1/Create_0.gml @@ -1,2 +1,3 @@ image_xscale = 2 - + +stuffs = 0; \ No newline at end of file diff --git a/objects/obj_bullet_boss_1/obj_bullet_boss_1.yy b/objects/obj_bullet_boss_1/obj_bullet_boss_1.yy old mode 100755 new mode 100644 diff --git a/objects/obj_bullet_boss_11/Create_0.gml b/objects/obj_bullet_boss_11/Create_0.gml old mode 100755 new mode 100644 index 511153d..b41d6be --- a/objects/obj_bullet_boss_11/Create_0.gml +++ b/objects/obj_bullet_boss_11/Create_0.gml @@ -1,2 +1,7 @@ -speed = 6; -action_set_friction(.125); +speed = 6; +action_set_friction(.125); + +tacos = 0; +global.qwerty = 0; +qqq = 0; +jumps = 0; \ No newline at end of file diff --git a/objects/obj_bullet_boss_11/obj_bullet_boss_11.yy b/objects/obj_bullet_boss_11/obj_bullet_boss_11.yy old mode 100755 new mode 100644 diff --git a/objects/obj_bullet_player/Destroy_0.gml b/objects/obj_bullet_player/Destroy_0.gml old mode 100755 new mode 100644 index 569541c..16a12b0 --- a/objects/obj_bullet_player/Destroy_0.gml +++ b/objects/obj_bullet_player/Destroy_0.gml @@ -1 +1 @@ -action_create_object_motion(obj_bullet_boss_particle, x, y, 2, -direction -50+ random(100)); +action_create_object_motion(obj_bullet_boss_particle, 0, 0, 2, -direction -50+ random(100)); diff --git a/objects/obj_bullet_player/obj_bullet_player.yy b/objects/obj_bullet_player/obj_bullet_player.yy old mode 100755 new mode 100644 diff --git a/objects/obj_player/Create_0.gml b/objects/obj_player/Create_0.gml old mode 100755 new mode 100644 index 6d8d5a9..db80091 --- a/objects/obj_player/Create_0.gml +++ b/objects/obj_player/Create_0.gml @@ -1,2 +1,5 @@ -invuln = 300; -swap = 1; +invuln = 300; +swap = 1; + +stuffsooo = 0; +blah = 0; \ No newline at end of file diff --git a/objects/obj_player/Destroy_0.gml b/objects/obj_player/Destroy_0.gml old mode 100755 new mode 100644 index aa3a4c1..a88fc62 --- a/objects/obj_player/Destroy_0.gml +++ b/objects/obj_player/Destroy_0.gml @@ -1,7 +1,7 @@ action_set_relative(1); -global.lives += -1; +global.life += -1; var __b__; -__b__ = action_if_variable(global.lives, -1, 0); +__b__ = action_if_variable(global.life, -1, 0); if __b__ { { diff --git a/objects/obj_player/obj_player.yy b/objects/obj_player/obj_player.yy old mode 100755 new mode 100644 diff --git a/objects/obj_talker/Create_0.gml b/objects/obj_talker/Create_0.gml old mode 100755 new mode 100644 index 1ac7daf..291032a --- a/objects/obj_talker/Create_0.gml +++ b/objects/obj_talker/Create_0.gml @@ -1,3 +1,6 @@ +ticker = 0; + if ticker < 1 sound_play(snd_MysteriousBeing); - + +blah = 0; \ No newline at end of file diff --git a/objects/obj_talker/obj_talker.yy b/objects/obj_talker/obj_talker.yy old mode 100755 new mode 100644 diff --git a/objects/object24/Destroy_0.gml b/objects/object24/Destroy_0.gml old mode 100755 new mode 100644 index 2758a63..45d1cc1 --- a/objects/object24/Destroy_0.gml +++ b/objects/object24/Destroy_0.gml @@ -1,5 +1,5 @@ var __b__; -__b__ = action_if_variable(global.lives, -1, 2); +__b__ = action_if_variable(global.life, -1, 2); if __b__ { action_create_object(obj_player, 512, 608); diff --git a/objects/object27/Draw_0.gml b/objects/object27/Draw_0.gml old mode 100755 new mode 100644 index c9229d2..006c9c8 --- a/objects/object27/Draw_0.gml +++ b/objects/object27/Draw_0.gml @@ -1,6 +1,6 @@ -tickers = 75 + draw_set_color(c_white) - draw_set_alpha(tickers/100) + draw_set_alpha(.75) draw_rectangle(-1,-1,1024,768,false); draw_set_alpha(1); draw_set_color(c_black); @@ -18,4 +18,4 @@ draw_text(45,395,string_hash_to_newline("Avoid being hit and work hard to defeat draw_text(45,445,string_hash_to_newline("You can also press to exit the game or ''R'' to restart the game.")); draw_text(45,545,string_hash_to_newline("Press ''W'' to exit this screen")); - + diff --git a/objects/object27/object27.yy b/objects/object27/object27.yy old mode 100755 new mode 100644 diff --git a/rooms/rm_game/RoomCreationCode.gml b/rooms/rm_game/RoomCreationCode.gml old mode 100755 new mode 100644 index 99b7993..4d08219 --- a/rooms/rm_game/RoomCreationCode.gml +++ b/rooms/rm_game/RoomCreationCode.gml @@ -1 +1 @@ -global.lives = 2 \ No newline at end of file +global.life = 2 \ No newline at end of file diff --git a/rooms/rm_game/rm_game.yy b/rooms/rm_game/rm_game.yy old mode 100755 new mode 100644 index e71d5ab..82b7c5a --- a/rooms/rm_game/rm_game.yy +++ b/rooms/rm_game/rm_game.yy @@ -32,7 +32,7 @@ {"spriteId":{"name":"background0","path":"sprites/background0/background0.yy",},"colour":4294967295,"x":0,"y":0,"htiled":true,"vtiled":true,"hspeed":-2.0,"vspeed":-2.0,"stretch":false,"animationFPS":1.0,"animationSpeedType":1,"userdefinedAnimFPS":false,"visible":false,"depth":2147483500,"userdefinedDepth":true,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Compatibility_Background_0_background0","tags":[],"resourceType":"GMRBackgroundLayer",}, ], "inheritLayers": false, - "creationCodeFile": "RoomCreationCode.gml", + "creationCodeFile": "${project_dir}/rooms/rm_game/RoomCreationCode.gml", "inheritCode": false, "instanceCreationOrder": [ {"name":"inst_DE361DDB","path":"rooms/rm_game/rm_game.yy",}, diff --git a/sprites/sprite22/sprite22.yy b/sprites/sprite22/sprite22.yy old mode 100755 new mode 100644 index 49cf413..5e04f7c --- a/sprites/sprite22/sprite22.yy +++ b/sprites/sprite22/sprite22.yy @@ -44,7 +44,7 @@ {"id":"1f6038ea-bf4f-40d6-b9dc-9ce5206a381b","Key":0.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"f36ff6a5-1fd5-40b7-a46d-9014b212d46c","path":"sprites/sprite22/sprite22.yy",},"resourceVersion":"1.0","resourceType":"SpriteFrameKeyframe",},},"resourceVersion":"1.0","resourceType":"Keyframe",}, ],"resourceVersion":"1.0","resourceType":"KeyframeStore",},"trackColour":0,"inheritsTrackColour":true,"builtinName":0,"traits":0,"interpolation":1,"tracks":[],"events":[],"modifiers":[],"isCreationTrack":false,"resourceVersion":"1.0","tags":[],"resourceType":"GMSpriteFramesTrack",}, ], - "visibleRange": {"x":0.0,"y":0.0,}, + "visibleRange": null, "lockOrigin": false, "showBackdrop": true, "showBackdropImage": false,