diff --git a/Infinity.yyp b/Infinity.yyp old mode 100755 new mode 100644 index ad68408..be6dd53 --- a/Infinity.yyp +++ b/Infinity.yyp @@ -139,7 +139,7 @@ ], "IncludedFiles": [], "MetaData": { - "IDEVersion": "2.3.2.556", + "IDEVersion": "2.3.2.560", }, "resourceVersion": "1.4", "name": "Infinity", diff --git a/objects/ctrl_hud/Create_0.gml b/objects/ctrl_hud/Create_0.gml new file mode 100644 index 0000000..5e8cf70 --- /dev/null +++ b/objects/ctrl_hud/Create_0.gml @@ -0,0 +1,3 @@ +global.number = 0; +global.gameover = 0; +global.game = 0; \ No newline at end of file diff --git a/objects/ctrl_hud/Draw_0.gml b/objects/ctrl_hud/Draw_0.gml old mode 100755 new mode 100644 index 03e98e9..4cdce44 --- a/objects/ctrl_hud/Draw_0.gml +++ b/objects/ctrl_hud/Draw_0.gml @@ -40,32 +40,32 @@ draw_text(__view_get( e__VW.XView, 0 )+124,__view_get( e__VW.YView, 0 )+27,strin draw_set_font(fnt_arial_s8_italic); draw_text(__view_get( e__VW.XView, 0 )+350+160,__view_get( e__VW.YView, 0 )+340+160,string_hash_to_newline(((900+50*global.level)-global.time)/30)); -if global.message = 4 +if global.messages = 4 { scr_messages("HP increase! +25 Max HP"); } -if global.message = 5 +if global.messages = 5 { scr_messages("Wave Complete!"); } -if global.message = 6 +if global.messages = 6 { scr_messages("Game Over... Tap to continue..."); global.gameover = 1; } -if global.message = 7 +if global.messages = 7 { scr_messages("Welcome to INFINITY!"); } -if global.message = 8 +if global.messages = 8 { scr_messages("You can move by pressing the arrow keys"); } -if global.message = 9 +if global.messages = 9 { scr_messages("and use powerup items by pressing the spacebar!"); } -if global.message = 10 +if global.messages = 10 { scr_messages("Well, have fun~<3"); } @@ -75,20 +75,20 @@ if global.gameover = 1 } if global.game = 20 { - screen_refresh(); - mouse_wait(); +// screen_refresh(); +// mouse_wait(); io_clear(); } - -var __b__; -__b__ = action_if_variable(global.game, 20, 0); -if __b__ -{ -{ -obsolete(-1, 1, 255, 0, Arial,10,0,0,1,0,0); + +var __b__; +__b__ = action_if_variable(global.game, 20, 0); +if __b__ +{ +{ +//obsolete(-1, 1, 255, 0, Arial,10,0,0,1,0,0); //show_highscore() sound_stop_all() - -action_restart_game(); -} -} + +action_restart_game(); +} +} diff --git a/objects/ctrl_hud/ctrl_hud.yy b/objects/ctrl_hud/ctrl_hud.yy old mode 100755 new mode 100644 index 595a058..72b68f9 --- a/objects/ctrl_hud/ctrl_hud.yy +++ b/objects/ctrl_hud/ctrl_hud.yy @@ -19,6 +19,7 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/ctrl_main/Alarm_1.gml b/objects/ctrl_main/Alarm_1.gml old mode 100755 new mode 100644 index ee033fb..a34d768 --- a/objects/ctrl_main/Alarm_1.gml +++ b/objects/ctrl_main/Alarm_1.gml @@ -1,3 +1,3 @@ -global.message = 8; +global.messages = 8; alarm[2] = 105; diff --git a/objects/ctrl_main/Alarm_2.gml b/objects/ctrl_main/Alarm_2.gml old mode 100755 new mode 100644 index 00ed848..8011abb --- a/objects/ctrl_main/Alarm_2.gml +++ b/objects/ctrl_main/Alarm_2.gml @@ -1,3 +1,3 @@ -global.message = 9; +global.messages = 9; alarm[3] = 105; diff --git a/objects/ctrl_main/Alarm_3.gml b/objects/ctrl_main/Alarm_3.gml old mode 100755 new mode 100644 index 1967765..6e51619 --- a/objects/ctrl_main/Alarm_3.gml +++ b/objects/ctrl_main/Alarm_3.gml @@ -1,2 +1,2 @@ -global.message = 10; +global.messages = 10; diff --git a/objects/ctrl_main/Create_0.gml b/objects/ctrl_main/Create_0.gml old mode 100755 new mode 100644 index 380f381..608877c --- a/objects/ctrl_main/Create_0.gml +++ b/objects/ctrl_main/Create_0.gml @@ -1,4 +1,4 @@ -action_timeline_set(tml_muse, 0, 0, 1); +action_timeline_set(tml_muse, 0, 0, 1); sound_stop_all(); alarm[7] = 10; @@ -12,7 +12,8 @@ global.dragon_left = -9; alarm[0] = global.droprate; -global.message = 7; +global.messages = 7; alarm[1] = 100; - + +global.time = 0; \ No newline at end of file diff --git a/objects/ctrl_main/Step_2.gml b/objects/ctrl_main/Step_2.gml old mode 100755 new mode 100644 index f7fe619..e29cefb --- a/objects/ctrl_main/Step_2.gml +++ b/objects/ctrl_main/Step_2.gml @@ -10,7 +10,7 @@ if global.time >= 900+50*global.level global.level += 1; score += 5000*ceil(1.75*global.level); global.dragon_left += 1; - global.message = 5; + global.messages = 5; } global.droprate = 1800; diff --git a/objects/ctrl_main/ctrl_main.yy b/objects/ctrl_main/ctrl_main.yy old mode 100755 new mode 100644 diff --git a/objects/mnu_start_objects/mnu_start_objects.yy b/objects/mnu_start_objects/mnu_start_objects.yy old mode 100755 new mode 100644 index 2f4d212..47c2b2f --- a/objects/mnu_start_objects/mnu_start_objects.yy +++ b/objects/mnu_start_objects/mnu_start_objects.yy @@ -1,5 +1,8 @@ { - "spriteId": null, + "spriteId": { + "name": "mnu_start", + "path": "sprites/mnu_start/mnu_start.yy", + }, "solid": false, "visible": true, "spriteMaskId": null, diff --git a/objects/obj_enemy_beamer/Create_0.gml b/objects/obj_enemy_beamer/Create_0.gml old mode 100755 new mode 100644 index 0ecde78..2799455 --- a/objects/obj_enemy_beamer/Create_0.gml +++ b/objects/obj_enemy_beamer/Create_0.gml @@ -1,2 +1,4 @@ hp = 20; - + +step = 0; +shielded = 0; \ No newline at end of file diff --git a/objects/obj_enemy_beamer/Step_2.gml b/objects/obj_enemy_beamer/Step_2.gml old mode 100755 new mode 100644 index fedd1b8..e8e23e3 --- a/objects/obj_enemy_beamer/Step_2.gml +++ b/objects/obj_enemy_beamer/Step_2.gml @@ -1,28 +1,30 @@ step += 1; -if step > 4 - { - if distance_to_object(obj_player_control) < 250 - { - step = 0 - ID = instance_create(x,y,obj_enemy_beams); - with (ID) motion_set(other.direction-5+random(10),10); - } - } - +speed = 6; if hp < 1 { score += 500; instance_destroy(); } -if point_direction(x,y,obj_player_control.x,obj_player_control.y) > direction - { - direction += 5; - } -if point_direction(x,y,obj_player_control.x,obj_player_control.y) < direction - { - direction -= 5; - } -speed = 6; +if (instance_exists( obj_player_control ) ) { + if step > 4 + { + if distance_to_object(obj_player_control) < 250 + { + step = 0 + var ID = instance_create(x,y,obj_enemy_beams); + with (ID) motion_set(other.direction-5+random(10),10); + } + } + + if point_direction(x,y,obj_player_control.x,obj_player_control.y) > direction + { + direction += 5; + } + if point_direction(x,y,obj_player_control.x,obj_player_control.y) < direction + { + direction -= 5; + } +} + - diff --git a/objects/obj_enemy_beamer/obj_enemy_beamer.yy b/objects/obj_enemy_beamer/obj_enemy_beamer.yy old mode 100755 new mode 100644 diff --git a/objects/obj_enemy_buzzsaw/Create_0.gml b/objects/obj_enemy_buzzsaw/Create_0.gml old mode 100755 new mode 100644 index a0cb523..eeeb3a5 --- a/objects/obj_enemy_buzzsaw/Create_0.gml +++ b/objects/obj_enemy_buzzsaw/Create_0.gml @@ -1,2 +1,4 @@ hp = 3; - + +rotations = 0; +shielded = 0; \ No newline at end of file diff --git a/objects/obj_enemy_buzzsaw/Step_2.gml b/objects/obj_enemy_buzzsaw/Step_2.gml old mode 100755 new mode 100644 index ba9ed02..eb7d620 --- a/objects/obj_enemy_buzzsaw/Step_2.gml +++ b/objects/obj_enemy_buzzsaw/Step_2.gml @@ -3,16 +3,16 @@ if hp < 1 score += 200; instance_destroy(); } +if (instance_exists( obj_player_control ) ) { + if (point_distance(x,y,obj_player_control.x,obj_player_control.y) < 32) + { + speed = 0; + if global.shield < 1 + { + global.player_hp -= 7; + } + exit; + } + move_towards_point(obj_player_control.x,obj_player_control.y,6); +} -if (point_distance(x,y,obj_player_control.x,obj_player_control.y) < 32) - { - speed = 0; - if global.shield < 1 - { - global.player_hp -= 7; - } - exit; - } -move_towards_point(obj_player_control.x,obj_player_control.y,6); - - diff --git a/objects/obj_enemy_buzzsaw/obj_enemy_buzzsaw.yy b/objects/obj_enemy_buzzsaw/obj_enemy_buzzsaw.yy old mode 100755 new mode 100644 diff --git a/objects/obj_enemy_drain/Create_0.gml b/objects/obj_enemy_drain/Create_0.gml old mode 100755 new mode 100644 index 637e039..bc46f7a --- a/objects/obj_enemy_drain/Create_0.gml +++ b/objects/obj_enemy_drain/Create_0.gml @@ -1,2 +1,4 @@ hp = 100; - + +firing = 0; +shielded = 0; \ No newline at end of file diff --git a/objects/obj_enemy_drain/Step_2.gml b/objects/obj_enemy_drain/Step_2.gml old mode 100755 new mode 100644 index 83a1af7..7328570 --- a/objects/obj_enemy_drain/Step_2.gml +++ b/objects/obj_enemy_drain/Step_2.gml @@ -3,19 +3,20 @@ if hp < 1 score += 2000 instance_destroy(); } - -direction = point_direction(x,y,obj_player_control.x,obj_player_control.y) -if (point_distance(x,y,obj_player_control.x,obj_player_control.y) < 125) - { - firing = 1; - speed = 0; - if global.shield < 1 - { - global.player_hp -= 5 - } - hp -= 1 - exit; +if (instance_exists( obj_player_control) ) { + direction = point_direction(x,y,obj_player_control.x,obj_player_control.y) + if (point_distance(x,y,obj_player_control.x,obj_player_control.y) < 125) + { + firing = 1; + speed = 0; + if global.shield < 1 + { + global.player_hp -= 5 + } + hp -= 1 + exit; } move_towards_point(obj_player_control.x,obj_player_control.y,4); +} firing = 0 - + diff --git a/objects/obj_enemy_drain/obj_enemy_drain.yy b/objects/obj_enemy_drain/obj_enemy_drain.yy old mode 100755 new mode 100644 diff --git a/objects/obj_enemy_mother/Create_0.gml b/objects/obj_enemy_mother/Create_0.gml old mode 100755 new mode 100644 index a124620..45d96dc --- a/objects/obj_enemy_mother/Create_0.gml +++ b/objects/obj_enemy_mother/Create_0.gml @@ -1,2 +1,5 @@ hp = 250; - + +final = 0; +shield = 0; +shielded = 0; \ No newline at end of file diff --git a/objects/obj_enemy_mother/Step_2.gml b/objects/obj_enemy_mother/Step_2.gml old mode 100755 new mode 100644 index bfe2f31..20e39d1 --- a/objects/obj_enemy_mother/Step_2.gml +++ b/objects/obj_enemy_mother/Step_2.gml @@ -1,31 +1,32 @@ -if distance_to_object(obj_player_control) < 350 - { - final += 1 - if final = 2 - { - ID = instance_create(x,y,obj_enemy_beams) - with (ID) motion_set(other.direction-10+random(20),10) - final = 0 - } - } +if (instance_exists( obj_player_control ) ) { + if distance_to_object(obj_player_control) < 350 + { + final += 1 + if final = 2 + { + var ID = instance_create(x,y,obj_enemy_beams) + with (ID) motion_set(other.direction-10+random(20),10) + final = 0 + } + } + if point_direction(x,y,obj_player_control.x,obj_player_control.y) > direction + { + direction += 4 + } + if point_direction(x,y,obj_player_control.x,obj_player_control.y) < direction + { + direction -= 4 + } +} +speed = 5 +direction = direction if hp < 1 { score += 10000; instance_destroy(); } - shield += 1 -if point_direction(x,y,obj_player_control.x,obj_player_control.y) > direction -{ - direction += 4 -} -if point_direction(x,y,obj_player_control.x,obj_player_control.y) < direction -{ - direction -= 4 -} -speed = 5 -direction = direction if shield >= 450 { shielded = 1 @@ -35,4 +36,4 @@ if shield >= 600 shielded = 0 shield = 0 } - + diff --git a/objects/obj_enemy_mother/obj_enemy_mother.yy b/objects/obj_enemy_mother/obj_enemy_mother.yy old mode 100755 new mode 100644 diff --git a/objects/obj_enemy_nova/Create_0.gml b/objects/obj_enemy_nova/Create_0.gml old mode 100755 new mode 100644 index cf639e2..b236351 --- a/objects/obj_enemy_nova/Create_0.gml +++ b/objects/obj_enemy_nova/Create_0.gml @@ -1,2 +1,9 @@ hp = 100 - + +firetime = 0; +stepy = 0; +charge = 0; +firing = 0; +firetime = 0; +rot = 0; +shielded = 0; \ No newline at end of file diff --git a/objects/obj_enemy_nova/Step_2.gml b/objects/obj_enemy_nova/Step_2.gml old mode 100755 new mode 100644 index e79e278..85084c1 --- a/objects/obj_enemy_nova/Step_2.gml +++ b/objects/obj_enemy_nova/Step_2.gml @@ -18,21 +18,21 @@ if firetime > 200 speed = 0 if stepy > 4 { - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot-20,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+25,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+70,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+115,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+160,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+205,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+250,10); - ID = instance_create(x,y,obj_enemy_beams); + var ID = instance_create(x,y,obj_enemy_beams); with (ID) motion_set(other.rot+295,10); stepy = 0 } @@ -45,8 +45,8 @@ if firetime > 200 } } firetime += 1 -if firing < 1 +if firing < 1 && instance_exists( obj_player_control ) { move_towards_point(obj_player_control.x,obj_player_control.y,3) } - + diff --git a/objects/obj_enemy_nova/obj_enemy_nova.yy b/objects/obj_enemy_nova/obj_enemy_nova.yy old mode 100755 new mode 100644 diff --git a/objects/obj_enemy_spawn/Create_0.gml b/objects/obj_enemy_spawn/Create_0.gml old mode 100755 new mode 100644 index 6a4434a..c152b22 --- a/objects/obj_enemy_spawn/Create_0.gml +++ b/objects/obj_enemy_spawn/Create_0.gml @@ -1,2 +1,5 @@ alarm[0] = 25 - + +rng = 0; +spawned = 0; +p = 0; \ No newline at end of file diff --git a/objects/obj_enemy_spawn/Draw_0.gml b/objects/obj_enemy_spawn/Draw_0.gml old mode 100755 new mode 100644 index 72d0047..4a6755f --- a/objects/obj_enemy_spawn/Draw_0.gml +++ b/objects/obj_enemy_spawn/Draw_0.gml @@ -6,4 +6,3 @@ if p >= ceil(125/global.level) draw_set_color(c_white) draw_circle(x,y,p*global.level,true) - diff --git a/objects/obj_enemy_spawn/obj_enemy_spawn.yy b/objects/obj_enemy_spawn/obj_enemy_spawn.yy old mode 100755 new mode 100644 diff --git a/objects/obj_player_beams/Collision_obj_enemy_base.gml b/objects/obj_player_beams/Collision_obj_enemy_base.gml old mode 100755 new mode 100644 index e11da92..fbb9810 --- a/objects/obj_player_beams/Collision_obj_enemy_base.gml +++ b/objects/obj_player_beams/Collision_obj_enemy_base.gml @@ -1,20 +1,20 @@ -action_set_relative(1); -var __b__; -__b__ = action_if_variable(other.shielded, 0, 0); -if __b__ -{ -{ -with (other) { -hp += -1; -} -__b__ = action_if_variable(global.hypertime, 0, 2); -if __b__ -{ -with (other) { -hp += -4; -} -} -} -} -action_kill_object(); -action_set_relative(0); +action_set_relative(1); +var __b__; +__b__ = action_if_variable(other.shielded, 0, 0); +if __b__ +{ +{ +with (other) { +hp += -1; +} +__b__ = action_if_variable(global.hypertime, 0, 2); +if __b__ +{ +with (other) { +hp += -4; +} +} +} +} +action_kill_object(); +action_set_relative(0); diff --git a/objects/obj_player_beams/obj_player_beams.yy b/objects/obj_player_beams/obj_player_beams.yy old mode 100755 new mode 100644 diff --git a/objects/obj_player_control/Create_0.gml b/objects/obj_player_control/Create_0.gml old mode 100755 new mode 100644 index f7cb428..7b78c3d --- a/objects/obj_player_control/Create_0.gml +++ b/objects/obj_player_control/Create_0.gml @@ -1 +1,6 @@ -action_set_friction(.5); +action_set_friction(.5); +global.nova_time = 0; +global.hypertime = 0; +global.shield = 0; +press = 0; +frame = 0; \ No newline at end of file diff --git a/objects/obj_player_control/Destroy_0.gml b/objects/obj_player_control/Destroy_0.gml old mode 100755 new mode 100644 index bdf2dba..3231bfa --- a/objects/obj_player_control/Destroy_0.gml +++ b/objects/obj_player_control/Destroy_0.gml @@ -1 +1 @@ -global.message = 6; +global.messages = 6; diff --git a/objects/obj_player_control/obj_player_control.yy b/objects/obj_player_control/obj_player_control.yy old mode 100755 new mode 100644 diff --git a/objects/points_beam/Create_0.gml b/objects/points_beam/Create_0.gml new file mode 100644 index 0000000..b54f76c --- /dev/null +++ b/objects/points_beam/Create_0.gml @@ -0,0 +1 @@ +numero = 0; \ No newline at end of file diff --git a/objects/points_beam/points_beam.yy b/objects/points_beam/points_beam.yy old mode 100755 new mode 100644 index e3f7818..4218fe7 --- a/objects/points_beam/points_beam.yy +++ b/objects/points_beam/points_beam.yy @@ -19,6 +19,7 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/points_buzz/Create_0.gml b/objects/points_buzz/Create_0.gml new file mode 100644 index 0000000..b54f76c --- /dev/null +++ b/objects/points_buzz/Create_0.gml @@ -0,0 +1 @@ +numero = 0; \ No newline at end of file diff --git a/objects/points_buzz/points_buzz.yy b/objects/points_buzz/points_buzz.yy old mode 100755 new mode 100644 index 1ded97f..9af5d4c --- a/objects/points_buzz/points_buzz.yy +++ b/objects/points_buzz/points_buzz.yy @@ -19,6 +19,7 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/points_hilvl/Create_0.gml b/objects/points_hilvl/Create_0.gml new file mode 100644 index 0000000..b54f76c --- /dev/null +++ b/objects/points_hilvl/Create_0.gml @@ -0,0 +1 @@ +numero = 0; \ No newline at end of file diff --git a/objects/points_hilvl/points_hilvl.yy b/objects/points_hilvl/points_hilvl.yy old mode 100755 new mode 100644 index 1b8e781..2fe64d4 --- a/objects/points_hilvl/points_hilvl.yy +++ b/objects/points_hilvl/points_hilvl.yy @@ -19,6 +19,7 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/objects/points_midlvl/Create_0.gml b/objects/points_midlvl/Create_0.gml new file mode 100644 index 0000000..b54f76c --- /dev/null +++ b/objects/points_midlvl/Create_0.gml @@ -0,0 +1 @@ +numero = 0; \ No newline at end of file diff --git a/objects/points_midlvl/points_midlvl.yy b/objects/points_midlvl/points_midlvl.yy old mode 100755 new mode 100644 index 863b4f7..e1b78a4 --- a/objects/points_midlvl/points_midlvl.yy +++ b/objects/points_midlvl/points_midlvl.yy @@ -19,6 +19,7 @@ "physicsShapePoints": [], "eventList": [ {"isDnD":false,"eventNum":0,"eventType":8,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, + {"isDnD":false,"eventNum":0,"eventType":0,"collisionObjectId":null,"resourceVersion":"1.0","name":"","tags":[],"resourceType":"GMEvent",}, ], "properties": [], "overriddenProperties": [], diff --git a/rooms/rm_title/rm_title.yy b/rooms/rm_title/rm_title.yy old mode 100755 new mode 100644 index 72dc0ee..5f32b9d --- a/rooms/rm_title/rm_title.yy +++ b/rooms/rm_title/rm_title.yy @@ -14,7 +14,7 @@ ], "layers": [ {"instances":[ - {"properties":[],"isDnd":false,"objectId":null,"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":256.0,"y":368.0,"resourceVersion":"1.0","name":"inst_E5144118","tags":[],"resourceType":"GMRInstance",}, + {"properties":[],"isDnd":false,"objectId":{"name":"mnu_start_objects","path":"objects/mnu_start_objects/mnu_start_objects.yy",},"inheritCode":false,"hasCreationCode":false,"colour":4294967295,"rotation":0.0,"scaleX":1.0,"scaleY":1.0,"imageIndex":0,"imageSpeed":1.0,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":256.0,"y":368.0,"resourceVersion":"1.0","name":"inst_E5144118","tags":[],"resourceType":"GMRInstance",}, ],"visible":true,"depth":0,"userdefinedDepth":false,"inheritLayerDepth":false,"inheritLayerSettings":false,"gridX":32,"gridY":32,"layers":[],"hierarchyFrozen":false,"resourceVersion":"1.0","name":"Compatibility_Instances","tags":[],"resourceType":"GMRInstanceLayer",}, {"assets":[ {"spriteId":{"name":"bg_titlescreen","path":"sprites/bg_titlescreen/bg_titlescreen.yy",},"w":480,"h":320,"u0":0,"v0":0,"u1":480,"v1":320,"colour":4294967295,"inheritedItemId":null,"frozen":false,"ignore":false,"inheritItemSettings":false,"x":96.0,"y":32.0,"resourceVersion":"1.0","name":"tile_BC45D95E","tags":[],"resourceType":"GMRGraphic",}, diff --git a/scripts/scr_messages/scr_messages.gml b/scripts/scr_messages/scr_messages.gml old mode 100755 new mode 100644 index f3be64b..3421dc5 --- a/scripts/scr_messages/scr_messages.gml +++ b/scripts/scr_messages/scr_messages.gml @@ -1,7 +1,7 @@ function scr_messages(argument0) { //displays a message on screen for 1 second, with a fade in and out global.number += 1 - draw_set_font(fnt_arial_s6_italic) + draw_set_font(fnt_arial_s8_italic) draw_set_color(c_white) draw_set_alpha(.05*global.number) if global.number >= 50 @@ -12,7 +12,7 @@ function scr_messages(argument0) { if global.number >= 100 { global.number = 0 - global.message = 0 + global.messages = 0 } draw_set_alpha(1) diff --git a/scripts/scr_messages/scr_messages.yy b/scripts/scr_messages/scr_messages.yy old mode 100755 new mode 100644 diff --git a/scripts/scr_pointsparticle/scr_pointsparticle.gml b/scripts/scr_pointsparticle/scr_pointsparticle.gml old mode 100755 new mode 100644 index 827603a..f3ce439 --- a/scripts/scr_pointsparticle/scr_pointsparticle.gml +++ b/scripts/scr_pointsparticle/scr_pointsparticle.gml @@ -1,10 +1,10 @@ function scr_pointsparticle(argument0) { //displays the points on screen for 1 second, with a fade in and out - //copyright 2010 Fenyxtec Studios - //original code by William Hogueison + //copyright 2010 Studio Tinyleaf + //original code by Jennifer Hogueison numero += 1 - draw_set_font(fnt_arial_s5_italic) + draw_set_font(fnt_arial_s8_italic) draw_set_color(c_white) draw_set_alpha(.2*numero) if numero >= 30 diff --git a/scripts/scr_pointsparticle/scr_pointsparticle.yy b/scripts/scr_pointsparticle/scr_pointsparticle.yy old mode 100755 new mode 100644 diff --git a/sprites/mnu_start/mnu_start.yy b/sprites/mnu_start/mnu_start.yy old mode 100755 new mode 100644 index 7439f83..e0b86de --- a/sprites/mnu_start/mnu_start.yy +++ b/sprites/mnu_start/mnu_start.yy @@ -168,7 +168,7 @@ {"id":"673662b9-406f-4a28-bfdb-2b234e254320","Key":31.0,"Length":1.0,"Stretch":false,"Disabled":false,"IsCreationKey":false,"Channels":{"0":{"Id":{"name":"2eba3c63-cde5-4c84-9eae-840e22b7bf5f","path":"sprites/mnu_start/mnu_start.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,