fixes for collision

squidistaken · Jan 21, 2023 · 59c9b40 · 59c9b40
1 parent ec45fc3
commit 59c9b40
Show file tree

Hide file tree

Showing 8 changed files with 104 additions and 10 deletions.
diff --git a/Y1B2 Game.yyp b/Y1B2 Game.yyp
diff --git a/objects/obj_plr1/Step_0.gml b/objects/obj_plr1/Step_0.gml
@@ -83,7 +83,6 @@ switch global.playerControl
 	}
 
 
-
 	if (itemCarrying != noone) && (!global.carryingP2)
 	{
 		scr_carryItem();
@@ -94,6 +93,17 @@ switch global.playerControl
 		}
 	}
 
+	show_debug_message(mask_index);
+	switch global.carryingP2
+	{
+		case true:
+			mask_index = spr_carry_mask;
+			break
+		case false:
+			mask_index = spr_plr1_idle_front;
+			break
+	}
+
 
 	//pickup item
 	if (!pauseFrame) && (place_meeting(x,y,itemNear)) && (itemCarrying == noone) && (keyInteract) && (itemNear != obj_plr2.itemCarrying)

diff --git a/rooms/rm_controls/rm_controls.yy b/rooms/rm_controls/rm_controls.yy
diff --git a/rooms/rm_puzzle00/rm_puzzle00.yy b/rooms/rm_puzzle00/rm_puzzle00.yy
diff --git a/scripts/scr_carryControl/scr_carryControl.gml b/scripts/scr_carryControl/scr_carryControl.gml
@@ -18,6 +18,7 @@ function carryPlayer2()
 }
 
 function resetPlayer2Carry(){ //reset plr 2 to original state
+	carryingP2 = false;
 	obj_plr2.grv = 0.5; 
 	global.carryingP2 = false;
 	obj_plr1.moveSpeed = 5;

diff --git a/sprites/spr_carry_mask/decd1fd0-ba4c-4afa-82c7-616ca59cca8e.png b/sprites/spr_carry_mask/decd1fd0-ba4c-4afa-82c7-616ca59cca8e.png
diff --git a/...s/decd1fd0-ba4c-4afa-82c7-616ca59cca8e/d6d20ce0-aac8-41f2-b719-9609d4f6e8b0.png b/...s/decd1fd0-ba4c-4afa-82c7-616ca59cca8e/d6d20ce0-aac8-41f2-b719-9609d4f6e8b0.png
diff --git a/sprites/spr_carry_mask/spr_carry_mask.yy b/sprites/spr_carry_mask/spr_carry_mask.yy