Skip to content

Commit

Permalink
Final Commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@McKrak
McKrak committed Apr 16, 2023
1 parent 8345ba7 commit d30c299
Show file tree
Hide file tree
Showing 148 changed files with 861 additions and 150 deletions.
8 changes: 8 additions & 0 deletions SpecterInn.resource_order
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
{"name":"__shdBulbFinalRender","order":1,"path":"shaders/__shdBulbFinalRender/__shdBulbFinalRender.yy",},
{"name":"objLight","order":3,"path":"objects/objLight/objLight.yy",},
{"name":"__shdBulbHardShadows","order":2,"path":"shaders/__shdBulbHardShadows/__shdBulbHardShadows.yy",},
{"name":"spuLogo","order":6,"path":"sprites/spuLogo/spuLogo.yy",},
{"name":"dbgStats","order":2,"path":"rooms/dbgStats/dbgStats.yy",},
{"name":"snuConfirm","order":2,"path":"sounds/snuConfirm/snuConfirm.yy",},
{"name":"sptBlockb","order":7,"path":"sprites/sptBlockb/sptBlockb.yy",},
Expand All @@ -82,10 +83,13 @@
{"name":"oboBlockJ","order":9,"path":"objects/oboBlockJ/oboBlockJ.yy",},
{"name":"oboPlat4","order":6,"path":"objects/oboPlat4/oboPlat4.yy",},
{"name":"snuRank","order":8,"path":"sounds/snuRank/snuRank.yy",},
{"name":"syCONTSETUP","order":32,"path":"objects/syCONTSETUP/syCONTSETUP.yy",},
{"name":"spuP2Win","order":20,"path":"sprites/spuP2Win/spuP2Win.yy",},
{"name":"syPOSTGAME","order":30,"path":"objects/syPOSTGAME/syPOSTGAME.yy",},
{"name":"snmTrackE","order":11,"path":"sounds/snmTrackE/snmTrackE.yy",},
{"name":"obcKiller","order":4,"path":"objects/obcKiller/obcKiller.yy",},
{"name":"oboPlat3","order":5,"path":"objects/oboPlat3/oboPlat3.yy",},
{"name":"spbTut","order":7,"path":"sprites/spbTut/spbTut.yy",},
{"name":"spuNext4","order":4,"path":"sprites/spuNext4/spuNext4.yy",},
{"name":"sppLight","order":1,"path":"sprites/sppLight/sppLight.yy",},
{"name":"__BulbConfig","order":2,"path":"scripts/__BulbConfig/__BulbConfig.yy",},
Expand All @@ -98,6 +102,7 @@
{"name":"sptDefault","order":1,"path":"sprites/sptDefault/sptDefault.yy",},
{"name":"spbP1","order":5,"path":"sprites/spbP1/spbP1.yy",},
{"name":"spuCtd3_1","order":7,"path":"sprites/spuCtd3_1/spuCtd3_1.yy",},
{"name":"spuReady","order":23,"path":"sprites/spuReady/spuReady.yy",},
{"name":"BulbDynamicOccluder","order":3,"path":"scripts/BulbDynamicOccluder/BulbDynamicOccluder.yy",},
{"name":"puzzleroom3","order":11,"path":"rooms/puzzleroom3/puzzleroom3.yy",},
{"name":"spuScore1","order":5,"path":"sprites/spuScore1/spuScore1.yy",},
Expand All @@ -110,6 +115,7 @@
{"name":"dgbTestRoomB","order":5,"path":"rooms/dgbTestRoomB/dgbTestRoomB.yy",},
{"name":"snuCountdown","order":6,"path":"sounds/snuCountdown/snuCountdown.yy",},
{"name":"sptBlockT","order":4,"path":"sprites/sptBlockT/sptBlockT.yy",},
{"name":"puzzleroomSolo","order":12,"path":"rooms/puzzleroomSolo/puzzleroomSolo.yy",},
{"name":"spuNext3","order":3,"path":"sprites/spuNext3/spuNext3.yy",},
{"name":"LUMA","order":2,"path":"objects/LUMA/LUMA.yy",},
{"name":"__sprBulbPixel","order":8,"path":"sprites/__sprBulbPixel/__sprBulbPixel.yy",},
Expand All @@ -120,6 +126,7 @@
{"name":"oboPlat","order":1,"path":"objects/oboPlat/oboPlat.yy",},
{"name":"spuWinner","order":17,"path":"sprites/spuWinner/spuWinner.yy",},
{"name":"spuRank4","order":12,"path":"sprites/spuRank4/spuRank4.yy",},
{"name":"spuGo","order":22,"path":"sprites/spuGo/spuGo.yy",},
{"name":"oboBlockU","order":10,"path":"objects/oboBlockU/oboBlockU.yy",},
{"name":"sptBlockS","order":9,"path":"sprites/sptBlockS/sptBlockS.yy",},
{"name":"spuP1Win","order":19,"path":"sprites/spuP1Win/spuP1Win.yy",},
Expand All @@ -143,6 +150,7 @@
{"name":"spuNext2","order":2,"path":"sprites/spuNext2/spuNext2.yy",},
{"name":"ZZZZZZ","order":9,"path":"objects/ZZZZZZ/ZZZZZZ.yy",},
{"name":"spbArea2","order":1,"path":"sprites/spbArea2/spbArea2.yy",},
{"name":"syTUT","order":31,"path":"objects/syTUT/syTUT.yy",},
{"name":"sptBlockJ","order":10,"path":"sprites/sptBlockJ/sptBlockJ.yy",},
],
}
9 changes: 9 additions & 0 deletions SpecterInn.yyp
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

33 changes: 26 additions & 7 deletions objects/PAR_Block/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,37 @@

if (pcol == 1) {
if (alarm[0] <= 180) && (alarm[0] > 120) {
draw_sprite_ext(spuCtd3_1,0,188,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd3_1,0,oboPlat.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 120) && (alarm[0] > 60) {
draw_sprite_ext(spuCtd2_1,0,188,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd2_1,0,oboPlat.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 60) && (alarm[0] > 0) {
draw_sprite_ext(spuCtd1_1,0,188,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd1_1,0,oboPlat.x,154,.35,.35,0,c_white,1);
}
} else if (pcol == 2) {
}
if (pcol == 2) {
if (alarm[0] <= 180) && (alarm[0] > 120) {
draw_sprite_ext(spuCtd3_2,0,420,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd3_1,0,oboPlat2.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 120) && (alarm[0] > 60) {
draw_sprite_ext(spuCtd2_2,0,420,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd2_1,0,oboPlat2.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 60) && (alarm[0] > 0) {
draw_sprite_ext(spuCtd1_2,0,420,154,.35,.35,0,c_white,1);
draw_sprite_ext(spuCtd1_1,0,oboPlat2.x,154,.35,.35,0,c_white,1);
}
}
if (pcol == 3) {
if (alarm[0] <= 180) && (alarm[0] > 120) {
draw_sprite_ext(spuCtd3_1,0,oboPlat3.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 120) && (alarm[0] > 60) {
draw_sprite_ext(spuCtd2_1,0,oboPlat3.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 60) && (alarm[0] > 0) {
draw_sprite_ext(spuCtd1_1,0,oboPlat3.x,154,.35,.35,0,c_white,1);
}
}
if (pcol == 4) {
if (alarm[0] <= 180) && (alarm[0] > 120) {
draw_sprite_ext(spuCtd3_1,0,oboPlat4.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 120) && (alarm[0] > 60) {
draw_sprite_ext(spuCtd2_1,0,oboPlat4.x,154,.35,.35,0,c_white,1);
} else if (alarm[0] <= 60) && (alarm[0] > 0) {
draw_sprite_ext(spuCtd1_1,0,oboPlat4.x,154,.35,.35,0,c_white,1);
}
}
2 changes: 1 addition & 1 deletion objects/PAR_Block/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if (y > room_height) {
}

if (!SAIL.pause) {
if (y < 70) {
if (y < 75) {
switch (pcol) {
case 1: pc1.alarm[0]++; break;
case 2: pc2.alarm[0]++; break;
Expand Down
2 changes: 1 addition & 1 deletion objects/SAIL/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ room_pack_blank_object = ZZZZZZ;

conType = 0;

show_debug_overlay(1);
show_debug_overlay(0);

pause = false;
canPause = false;
Expand Down
3 changes: 3 additions & 0 deletions objects/SAIL/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ for (var i = 0; i < gp_num; i++;)
if (keyboard_check_pressed(vk_anykey)) conType = 0;
for ( var i = gp_face1; i < gp_axisrv; i++ ) {
if ( gamepad_button_check( 0, i ) ) conType = 1;
if ( gamepad_button_check( 1, i ) ) conType = 1;
if ( gamepad_button_check( 2, i ) ) conType = 1;
if ( gamepad_button_check( 3, i ) ) conType = 1;
}

if (conType = 0){
Expand Down
19 changes: 10 additions & 9 deletions objects/TITLE/Create_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,16 @@ op_space = 24;
menu_level = 0;
pos = 0;

option[0, 0] = "Play Game";
option[1, 0] = "1 Player";
option[1, 1] = "2 Players";
option[1, 2] = "3 Players";
option[1, 3] = "4 Players";
option[1, 4] = "Return";
option[0, 1] = "Tutorial";
option[2, 0] = "Return";
option[0, 2] = "Quit Game";
option[0, 0] = "Solo Play";
//option[1, 0] = "1 Player";
//option[1, 1] = "2 Players";
//option[1, 2] = "3 Players";
//option[1, 3] = "4 Players";
//option[1, 4] = "Return";
option[0, 1] = "Multiplayer";
option[2, 0] = "";
option[0, 2] = "How To Play";
option[0, 3] = "Quit Game";


op_length = array_length(option[menu_level]);
Expand Down
7 changes: 5 additions & 2 deletions objects/TITLE/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,19 @@ for (var i = 0; i < op_length; i++) {
var so = t + k*2;
var shift = sin(so*pi*1.5/room_speed) * 8;
draw_text_outline(((160+k*9)-(string_length(option[menu_level,i])*5))*2,
80 + op_space*i + shift, string_char_at(option[menu_level, i],k),
250 + op_space*i + shift, string_char_at(option[menu_level, i],k),
2, 2, 0, col, col, col2, col2, 1,c_black,2);
}
else {
draw_text_outline(((160+k*9)-(string_length(option[menu_level,i])*5))*2,
80 + op_space*i, string_char_at(option[menu_level, i],k),
250 + op_space*i, string_char_at(option[menu_level, i],k),
2, 2, 0, c_white, c_white, c_white, c_white, 1,c_black,2);
}
}


}
if (menu_level != 2) {
draw_sprite_ext(spuLogo,0,320,180,.5,.5,0,c_white,1);
}

19 changes: 6 additions & 13 deletions objects/TITLE/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,18 @@ if (k_accept) {
switch(menu_level) {
case 0:
switch(pos) {
case 0: menu_level = 1; break;
case 1: menu_level = 2; break;
case 2: game_end(); break;
}
break;
case 1:
switch(pos) {
case 0: room_goto(puzzleroom); break;
case 1: room_goto(puzzleroom); break;
case 2: room_goto(puzzleroom3); break;
case 3: room_goto(puzzleroom4); break;
case 4: menu_level = 0; break;
case 0: room_goto(puzzleroomSolo); break;
case 1: instance_create_layer(0,0,"Instances",syCONTSETUP); instance_destroy(); break;
case 2: instance_create_layer(0,0,"Instances",syTUT); menu_level = 2; break;
case 3: game_end(); break;
}
break;
case 2:
switch(pos) {
case 0: menu_level = 0; break;
case 0: syTUT.frame++;
}
break;

}
if (sel != menu_level){
pos = 0;
Expand Down
4 changes: 2 additions & 2 deletions objects/pc1/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
// You can write your code in this editor
draw_set_halign(fa_left);

if (room_get_name(room) == "puzzleroom") {
if (room_get_name(room) == "puzzleroom") || (room_get_name(room) == "puzzleroomSolo") {
draw_sprite_ext(spuNext1,0,10,85,.15,.15,0,c_white,1);
draw_sprite_ext(nextqueue[1],0,60,140,.75,.75,0,c_white,1);
draw_sprite_ext(nextqueue[2],0,60,180,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[3],0,70,210,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[4],0,60,240,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[5],0,60,275,.5,.5,0,c_white,1);
}
if (room_get_name(room) == "puzzleroom4") {
if (room_get_name(room) == "puzzleroom4") || (room_get_name(room) == "puzzleroom3") {
draw_sprite_ext(spuNext1,0,130,60,.09,.09,0,c_white,1);
draw_sprite_ext(nextqueue[1],0,160,96,.375,.375,0,c_white,1);
draw_sprite_ext(nextqueue[2],0,160,118,.25,.25,0,c_white,1);
Expand Down
4 changes: 2 additions & 2 deletions objects/pc1/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ switch (SAIL.conType) {
k_rotr = keyboard_check_direct(ord("E"));
k_spac = keyboard_check_pressed(vk_space);
break;
case 1: k_left = 0;
k_right = gamepad_axis_value(0,gp_axislh);
case 1: k_left = gamepad_button_check(0, gp_padl);
k_right = gamepad_button_check(0, gp_padr);
k_up = 0;
k_down = 0;
k_rotl = gamepad_button_check(0,gp_shoulderl);
Expand Down
2 changes: 1 addition & 1 deletion objects/pc2/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (room_get_name(room) == "puzzleroom") {
draw_sprite_ext(nextqueue[4],0,590,240,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[5],0,590,275,.5,.5,0,c_white,1);
}
if (room_get_name(room) == "puzzleroom4") {
if (room_get_name(room) == "puzzleroom4") || (room_get_name(room) == "puzzleroom3") {
draw_sprite_ext(spuNext2,0,130,190,.09,.09,0,c_white,1);
draw_sprite_ext(nextqueue[1],0,160,226,.375,.375,0,c_white,1);
draw_sprite_ext(nextqueue[2],0,160,248,.25,.25,0,c_white,1);
Expand Down
4 changes: 2 additions & 2 deletions objects/pc2/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ switch (SAIL.conType) {
k_rotr = keyboard_check_direct(ord("E"));
k_spac = keyboard_check_pressed(vk_space);
break;
case 1: k_left = 0;
k_right = gamepad_axis_value(1,gp_axislh);
case 1: k_left = gamepad_button_check(1, gp_padl);
k_right = gamepad_button_check(1, gp_padr);
k_up = 0;
k_down = 0;
k_rotl = gamepad_button_check(1,gp_shoulderl);
Expand Down
2 changes: 1 addition & 1 deletion objects/pc3/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (room_get_name(room) == "puzzleroom") {
draw_sprite_ext(nextqueue[4],0,590,240,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[5],0,590,275,.5,.5,0,c_white,1);
}
if (room_get_name(room) == "puzzleroom4") {
if (room_get_name(room) == "puzzleroom4") || (room_get_name(room) == "puzzleroom3") {
draw_sprite_ext(spuNext3,0,450,60,.09,.09,0,c_white,1);
draw_sprite_ext(nextqueue[1],0,480,96,.375,.375,0,c_white,1);
draw_sprite_ext(nextqueue[2],0,480,118,.25,.25,0,c_white,1);
Expand Down
4 changes: 2 additions & 2 deletions objects/pc3/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ switch (SAIL.conType) {
k_rotr = keyboard_check_direct(ord("E"));
k_spac = keyboard_check_pressed(vk_space);
break;
case 1: k_left = 0;
k_right = gamepad_axis_value(2,gp_axislh);
case 1: k_left = gamepad_button_check(2, gp_padl);
k_right = gamepad_button_check(2, gp_padr);
k_up = 0;
k_down = 0;
k_rotl = gamepad_button_check(2,gp_shoulderl);
Expand Down
2 changes: 1 addition & 1 deletion objects/pc4/Draw_64.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if (room_get_name(room) == "puzzleroom") {
draw_sprite_ext(nextqueue[4],0,590,240,.5,.5,0,c_white,1);
draw_sprite_ext(nextqueue[5],0,590,275,.5,.5,0,c_white,1);
}
if (room_get_name(room) == "puzzleroom4") {
if (room_get_name(room) == "puzzleroom4") || (room_get_name(room) == "puzzleroom3") {
draw_sprite_ext(spuNext4,0,450,190,.09,.09,0,c_white,1);
draw_sprite_ext(nextqueue[1],0,480,226,.375,.375,0,c_white,1);
draw_sprite_ext(nextqueue[2],0,480,248,.25,.25,0,c_white,1);
Expand Down
4 changes: 2 additions & 2 deletions objects/pc4/Step_0.gml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ switch (SAIL.conType) {
k_rotr = keyboard_check_direct(ord("E"));
k_spac = keyboard_check_pressed(vk_space);
break;
case 1: k_left = 0;
k_right = gamepad_axis_value(3,gp_axislh);
case 1: k_left = gamepad_button_check(3, gp_padl);
k_right = gamepad_button_check(3, gp_padr);
k_up = 0;
k_down = 0;
k_rotl = gamepad_button_check(3,gp_shoulderl);
Expand Down
7 changes: 7 additions & 0 deletions objects/syCONTSETUP/Create_0.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/// @description Insert description here
// You can write your code in this editor

p1in = false;
p2in = false;
p3in = false;
p4in = false;
21 changes: 21 additions & 0 deletions objects/syCONTSETUP/Draw_64.gml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@

draw_set_font(fntSquare);
draw_set_color(c_white);
draw_set_valign(fa_middle);
draw_set_halign(fa_center);

draw_text_outline(320,40,"Press CROSS or A to connect your controller.\nPress BACKSPACE to go back to the title.",2,2,0,c_white,c_white,c_white,c_white,1,c_black,2);

draw_text_outline(100,160, "P1",2, 2, 0, c_white, c_white, #0096ce, #0096ce, 1,c_black,2);
if p1in draw_text_outline(100,180, "Connected!",2, 2, 0, c_white, c_white, c_yellow, c_yellow, 1,c_black,2);
if p2in draw_text_outline(320,320,"P1, Press START when everyone is ready!",2,2,0,c_white,c_white,c_white,c_white,1,c_black,2);
draw_text_outline(250,160, "P2",2, 2, 0, c_white, c_white, c_red, c_red, 1,c_black,2);
if p2in draw_text_outline(240,180, "Connected!",2, 2, 0, c_white, c_white, c_yellow, c_yellow, 1,c_black,2);
draw_text_outline(400,160, "P3",2, 2, 0, c_white, c_white, c_green, c_green, 1,c_black,2);
if p3in draw_text_outline(400,180, "Connected!",2, 2, 0, c_white, c_white, c_yellow, c_yellow, 1,c_black,2);
draw_text_outline(550,160, "P4",2, 2, 0, c_white, c_white, c_blue, c_blue, 1,c_black,2);
if p4in draw_text_outline(550,180, "Connected!",2, 2, 0, c_white, c_white, c_yellow, c_yellow, 1,c_black,2);




Loading

0 comments on commit d30c299

Please sign in to comment.