Texture group optimisation, chopper animation fix, player drown fix

TrianglyRU · Jan 15, 2022 · e6a4405 · e6a4405
1 parent 3510993
commit e6a4405
Show file tree

Hide file tree

Showing 206 changed files with 365 additions and 362 deletions.
diff --git a/OrbinautFramework.yyp b/OrbinautFramework.yyp
diff --git a/scripts/ObjChopperMain/ObjChopperMain.gml b/scripts/ObjChopperMain/ObjChopperMain.gml
@@ -12,7 +12,7 @@ function ObjChopperMain()
 		case 0:
 		{
 			// If near peak amplitude, speedup animation
-			if y < OriginY - 192
+			if y <= OriginY - 192
 			{
 				animation_play(sprite_index, 4, 0, 0);
 
@@ -23,7 +23,8 @@ function ObjChopperMain()
 		break;
 		case 1:
 		{
-			if Ysp >= 0
+			// If falling down, stop animation
+			if y >= OriginY - 192
 			{
 				animation_set(sprite_index, 0);
 
@@ -34,6 +35,7 @@ function ObjChopperMain()
 		break;
 		case 2:
 		{
+			// If fallen below initial position, restart
 			if y >= OriginY 
 			{ 
 				y = OriginY; Ysp = -7; 

diff --git a/scripts/PlayerWaterEvents/PlayerWaterEvents.gml b/scripts/PlayerWaterEvents/PlayerWaterEvents.gml
@@ -66,6 +66,9 @@ function PlayerWaterEvents()
 		{
 			if !Drown
 			{
+				// Play sound
+				audio_sfx_play(sfxDrown, false);
+
 				// Reset speeds
 				Xsp	= 0;
 				Ysp	= 0;
@@ -74,22 +77,26 @@ function PlayerWaterEvents()
 				// Set flags
 				Stage.TimeEnabled = false;
 				Camera.Enabled    = false;
-				ClimbState		  = false;
-				GlideState		  = false;
-				GlideValue		  = false;
-				FlightState       = false;
 				AllowCollision    = false;
-				Grounded		  = false;
-				OnObject		  = false;	
+				Grounded	      = false;
+				OnObject	      = false;
+				GroundLock        = false;
+				FlightState       = false;
+				ClimbState	      = false;
+				GlideState	      = false;
+				Jumping		      = false;
+				Spinning	      = false;
+				DropdashRev       = -1;
+				SpindashRev       = -1;
+				PeeloutRev        = -1;
+				DoubleSpinAttack  = SpinRecharge;
+				DropdashFlag	  = DashLocked;
 				Drown			  = true;
 				AirLock		      = true;
-				Animation		  = AnimDrown;	
+				Animation		  = AnimDrown;
 
 				// Draw player above everything
 				DrawOrder = 0;
-
-				// Play sound
-				audio_sfx_play(sfxDrowning, false);
 			}
 
 			// Enter death state if off-screen

diff --git a/sounds/sfxDrown/sfxDrown.wav b/sounds/sfxDrown/sfxDrown.wav
diff --git a/sounds/sfxDrowning/sfxDrowning.yy → sounds/sfxDrown/sfxDrown.yy b/sounds/sfxDrowning/sfxDrowning.yy → sounds/sfxDrown/sfxDrown.yy
diff --git a/sounds/sfxDrowning/sfxDrowning.wav b/sounds/sfxDrowning/sfxDrowning.wav
diff --git a/sprites/font_card/font_card.yy b/sprites/font_card/font_card.yy
diff --git a/sprites/font_counter/font_counter.yy b/sprites/font_counter/font_counter.yy
diff --git a/sprites/font_counter_small/font_counter_small.yy b/sprites/font_counter_small/font_counter_small.yy
diff --git a/sprites/font_default/font_default.yy b/sprites/font_default/font_default.yy
diff --git a/sprites/font_menu/font_menu.yy b/sprites/font_menu/font_menu.yy
diff --git a/sprites/gui_card_act/gui_card_act.yy b/sprites/gui_card_act/gui_card_act.yy
diff --git a/sprites/gui_card_logo/gui_card_logo.yy b/sprites/gui_card_logo/gui_card_logo.yy
diff --git a/sprites/gui_card_ribbon/gui_card_ribbon.yy b/sprites/gui_card_ribbon/gui_card_ribbon.yy
diff --git a/sprites/gui_framework_splash/gui_framework_splash.yy b/sprites/gui_framework_splash/gui_framework_splash.yy
diff --git a/sprites/gui_gameover_gametime/gui_gameover_gametime.yy b/sprites/gui_gameover_gametime/gui_gameover_gametime.yy
diff --git a/sprites/gui_gameover_over/gui_gameover_over.yy b/sprites/gui_gameover_over/gui_gameover_over.yy
diff --git a/sprites/gui_hud_lives/gui_hud_lives.yy b/sprites/gui_hud_lives/gui_hud_lives.yy
diff --git a/sprites/gui_hud_rings/gui_hud_rings.yy b/sprites/gui_hud_rings/gui_hud_rings.yy
diff --git a/sprites/gui_hud_score/gui_hud_score.yy b/sprites/gui_hud_score/gui_hud_score.yy
diff --git a/sprites/gui_hud_time/gui_hud_time.yy b/sprites/gui_hud_time/gui_hud_time.yy
diff --git a/sprites/gui_icon_knuckles/gui_icon_knuckles.yy b/sprites/gui_icon_knuckles/gui_icon_knuckles.yy
diff --git a/sprites/gui_icon_sonic/gui_icon_sonic.yy b/sprites/gui_icon_sonic/gui_icon_sonic.yy
diff --git a/sprites/gui_icon_tails/gui_icon_tails.yy b/sprites/gui_icon_tails/gui_icon_tails.yy
diff --git a/sprites/gui_pause_menu/gui_pause_menu.yy b/sprites/gui_pause_menu/gui_pause_menu.yy
diff --git a/sprites/gui_pause_options/gui_pause_options.yy b/sprites/gui_pause_options/gui_pause_options.yy
diff --git a/sprites/gui_results_act/gui_results_act.yy b/sprites/gui_results_act/gui_results_act.yy
diff --git a/sprites/gui_results_char/gui_results_char.yy b/sprites/gui_results_char/gui_results_char.yy
diff --git a/sprites/gui_results_head/gui_results_head.yy b/sprites/gui_results_head/gui_results_head.yy
diff --git a/sprites/gui_results_ringbonus/gui_results_ringbonus.yy b/sprites/gui_results_ringbonus/gui_results_ringbonus.yy