From a025301b240b155fbc59eabfc816c67530b12843 Mon Sep 17 00:00:00 2001
From: inkoalawetrust <56005600+inkoalawetrust@users.noreply.github.com>
Date: Thu, 2 Jun 2022 12:25:10 +0300
Subject: [PATCH] New No Crouch Zone actor, crouched XDeath, and fixes and
 changes.

- Added a new SM_NoCrouchZone actor, located under the ZDoom category, more information on it can be found inside document.txt.
- Hopefully fixed most instances of the marines trying to dodge non-projectiles that are marked as missiles, by making only missiles with a damage property higher than zero be pushed in the ProjectileList array.
- Fixed a bug where marines would take cover behind windows with hitscan blocking window linedefs, making them unable to do anything besides sit in place until their target got behind the windows.
- Changed the grenades' timer to decrement in Tick() instead of inside the grenades' spawn state.
- Grenades are now marked as having exploded (Meaning marines don't need to fear them.) about half a second after exploding, instead of being marked as such right after A_Explode is called.
- The grenades' bounce sound now stops once it has lost enough momentum, and when the grenade is close to exploding, it will begin to play a beeping sound.
- Add a gib death for the marines when crouched down.
- Added the MoveWithSector flag on the empty magazines and grenade pins, now they shouldn't be stuck in mid air when they drop, and the sector they are on moves.
- Fixed a bug on the vanilla rifle that made the zooming in and out animation break if the player died while it was playing.
- Updated document.
---
 Document.txt                       |  12 +++-
 MAPINFO                            |   1 +
 MarineFunctions.zsc                |  44 ++++++++++----
 Marine_Deaths.zsc                  |  12 ++++
 Marine_OtherActors.zsc             |  93 ++++++++++++++++++++++++++---
 SNDINFO                            |   1 +
 Sounds/GrenadeBeep.ogg             | Bin 0 -> 4003 bytes
 Sprites/Deaths/Crouched/MARPL0.png | Bin 0 -> 1049 bytes
 Sprites/Deaths/Crouched/MARPM0.png | Bin 0 -> 1164 bytes
 Sprites/Deaths/Crouched/MARPN0.png | Bin 0 -> 1244 bytes
 Sprites/Deaths/Crouched/MARPO0.png | Bin 0 -> 1105 bytes
 Sprites/Deaths/Crouched/MARPP0.png | Bin 0 -> 1112 bytes
 Sprites/Deaths/Crouched/MARPQ0.png | Bin 0 -> 1020 bytes
 Sprites/Deaths/Crouched/MARPR0.png | Bin 0 -> 995 bytes
 Sprites/Deaths/Crouched/MARPS0.png | Bin 0 -> 931 bytes
 Sprites/Deaths/Crouched/MARPT0.png | Bin 0 -> 921 bytes
 Sprites/MARCZ0.png                 | Bin 0 -> 1042 bytes
 VanillaRifle.zsc                   |  56 +++++++++--------
 ZScript.zsc                        |  11 +++-
 credits.txt                        |   2 +-
 20 files changed, 182 insertions(+), 50 deletions(-)
 create mode 100644 Sounds/GrenadeBeep.ogg
 create mode 100644 Sprites/Deaths/Crouched/MARPL0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPM0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPN0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPO0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPP0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPQ0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPR0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPS0.png
 create mode 100644 Sprites/Deaths/Crouched/MARPT0.png
 create mode 100644 Sprites/MARCZ0.png

diff --git a/Document.txt b/Document.txt
index 4c694ec..e4b3014 100644
--- a/Document.txt
+++ b/Document.txt
@@ -2,14 +2,15 @@ The credits for every asset used on this NPC, can be found inside credits.txt.
 
 SHOWCASE VIDEO AND DOCUMENTATION OF THE MARINES: https://www.youtube.com/watch?v=PlZSs5XyEdU
 
-If you have any issues with the marines or some other NPC made by me, you can ask me for help on Discord at inkoalawetrust#9783, or Twitter at @inkoalawetrust.
+If you have any issues with the marines or some other NPC made by me, you can ask me for help on Discord at inkoalawetrust#9783, or Twitter at @inkoalawetrust. Or put them on the issue tracker: https://github.com/inkoalawetrust/Smart-Marines/issues
 
 The marines have 120 health, somewhat higher than the players'. You can turn on the Friendly flag for them in the editor to use them as smart allies.
-In fact, I've sort of just made them with the intent of being used as allies, like the Allied Marines resource from Realm667. But they should work just as well as enemies.
+In fact, I've sort of just made them with the intent of being used as allies, like the Allied Marines resource from Realm667. But they work just as well as enemies.
 
 Their name in the editor is "AI Marine" and "AI Marine (Turret)", and they can be found under the Marines folder.
 Their class names are "SmartMarine", "TurretMarine"
 The turret's editor name is "Machine Gun Emplacement", and it can be found in the Weapons folder, its' class name is "SmartMarineMGTurret"
+The editor name of their No Crouch Zone map spots (More info below) is "No Crouch Zone (AI Marines)", and it can be found in the ZDoom folder, its' class name is SM_NoCrouchZone.
 
 ================|WHAT THEY CAN DO|================
 
@@ -128,6 +129,13 @@ Marines that have found cover will only get out of cover in the following sitati
 - The area of the map they are taking cover at has changed, e.g the wall they were hiding behind lowered, or the actor they were behind moved or was destroyed.
 - Their target is gone, and they haven't found any other target for several seconds.
 
+NO CROUCH ZONE ACTOR:
+If you do not want the marines to crouch in certain areas, such as behind particular staircases, you can use the SM_NoCrouchZone actor.
+Which will prevent marines entering its' range from crouching at all. The actor can be found under the "ZDoom" folder.
+It also uses custom arguments (Not user variables) that allow you to specify its' range and for how long marines will not crouch once out of said range.
+The custom arguments can be accessed by selecting the no crouch zone actor(s( and going to the Action/Tag/Misc. tab.
+In addition to the custom arguments, you can also disable and enable the no crouch zone actors with Thing_Activate and Thing_Deactivate.
+
 MISCELLANEOUS:
 - Marines also avoid projectiles when behind cover. By ducking back in again. Friendly marines in cover will also avoid other friendly projectiles. Unless they are on the ignore list.
 - While crouched, marines will sometimes look up. This is a purely cosmetic visual effect.
diff --git a/MAPINFO b/MAPINFO
index 93a50f3..a334b9e 100644
--- a/MAPINFO
+++ b/MAPINFO
@@ -4,6 +4,7 @@ DoomEdNums
 	8574 = TurretMarine
 	8575 = VanillaRifle
 	8576 = SmartMarineMGTurret
+	8577 = SM_NoCrouchZone
 }
 
 GameInfo
diff --git a/MarineFunctions.zsc b/MarineFunctions.zsc
index b4492a0..0454cd2 100644
--- a/MarineFunctions.zsc
+++ b/MarineFunctions.zsc
@@ -6,7 +6,7 @@ Class SM_ProjectileHandler : EventHandler
 	Override Void WorldThingSpawned(WorldEvent E)
 	{
 		//Add every spawned projectile to a big list.
-		If (E.Thing && E.Thing.bMissile)
+		If (E.Thing && E.Thing.bMissile && E.Thing.Damage > 0)
 		{
 			ProjectileList.Push(E.Thing);
 		}
@@ -599,7 +599,7 @@ Mixin Class MarineFunctions
 		{
 			Mobj = GrenadeSearch.Thing;
 			//If the found actor is a grenade, that hasn't exploded already, but that will explode in about a second. And you are in the blast radius, and it's visible.
-			If (Mobj.GetClassName() == "SM_Grenade" && !(SM_Grenade(Mobj).Exploded) && Mobj.ReactionTime <= 6 && Distance3D (Mobj) <= SearchRadius && IsVisible (Mobj,True))
+			If (Mobj.GetClassName() == "SM_Grenade" && !(SM_Grenade(Mobj).Exploded) && Mobj.ReactionTime <= 40 && Distance3D (Mobj) <= SearchRadius && IsVisible (Mobj,True))
 			{
 				OriginalTarget = Target; //Keep the original target of the marine stored.
 				Target = Mobj; //Then change the target to the grenade that was found.
@@ -614,12 +614,12 @@ Mixin Class MarineFunctions
 	{
 		FLineTraceData EyeLevel;
 		FLineTraceData HipLevel;
-		Bool EyeLevelBlocked;
+		Bool EyeLevelUnblocked;
 		Bool HipLevelBlocked;
 		Int HasHit;
 		Actor Mobj;
 		
-		If (User_NoCover)
+		If (User_NoCover || CrouchDelay)
 			Return False;
 		
 		//Don't crouch if you have no target, or your target is your goal too. AKA you are patrolling.
@@ -637,16 +637,15 @@ Mixin Class MarineFunctions
 		*/
 		
 		If (!Crouching)
-			LineTrace (AngleTo (Target),48,0,TRF_THRUHITSCAN,50,data:EyeLevel);
+			LineTrace (AngleTo (Target),48,0,0,50,data:EyeLevel);
 		Else
-			LineTrace (AngleTo (Target),128,0,TRF_THRUHITSCAN,50,data:EyeLevel);
-		
-		HasHit = EyeLevel.HitType;
-		EyeLevelBlocked = (EyeLevel.HitActor || (HasHit == TRACE_HitWall || HasHit == TRACE_HitFloor || HasHit == Trace_HitCeiling));
+			LineTrace (AngleTo (Target),128,0,0,50,data:EyeLevel);
 		
+		EyeLevelUnblocked = SM_EyeLevelBlocked (EyeLevel);
+
 		If (!Crouching)
 			LineTrace (AngleTo (Target),48,0,TRF_THRUHITSCAN,18,data:HipLevel);
-		Else
+		Else //Run a longer range trace when crouched to not go out of cover as easily when behind strangely shaped cover like star shaped fountains.
 			LineTrace (AngleTo (Target),128,0,TRF_THRUHITSCAN,18,data:HipLevel);
 		
 		HasHit = HipLevel.HitType;
@@ -659,14 +658,14 @@ Mixin Class MarineFunctions
 		//Only run this if the marine is not crouched already, and also has a target, that isn't a patrol point.
 		If (!Crouching)
 		{
-			If (!EyelevelBlocked && HipLevelBlocked && CheckSight (Target,SF_SEEPASTSHOOTABLELINES|SF_IGNOREWATERBOUNDARY))
+			If (EyelevelUnblocked && HipLevelBlocked && CheckSight (Target,SF_SEEPASTSHOOTABLELINES|SF_IGNOREWATERBOUNDARY))
 				Return True;
 		}
 		
 		//If you are crouching already and have a line of sight to your target.
 		If (Crouching && CheckSight (Target,SF_SEEPASTSHOOTABLELINES|SF_IGNOREWATERBOUNDARY))
 		{
-			//Then return if you can crouch based on where or not your hips are blocked by cover still.
+			//Then return if you can crouch based on whether or not your hips are blocked by cover still.
 			Return HipLevelBlocked;
 		}
 		
@@ -677,6 +676,27 @@ Mixin Class MarineFunctions
 		Return False;
 	}
 	
+    Bool SM_EyeLevelBlocked (FLineTraceData Data)
+    {
+        Int HasHit;
+        
+        HasHit = Data.HitType;
+		
+        If (Data.HitActor)
+            Return False;
+        
+        If (HasHit == TRACE_HitWall)
+            Return False;
+        
+        If (HasHit == TRACE_HitFloor)
+            Return False;
+		
+		If (HasHit == Trace_HitCeiling)
+			Return False;
+        
+        Return True;
+    }
+	
 	//Makes the marine listen for any enemy marines playing the radio transmission sound, which is played when marines alert each other.
 	Void SM_ListenForEnemyAlerts (Double HearingRadius = 1024)
 	{
diff --git a/Marine_Deaths.zsc b/Marine_Deaths.zsc
index f291271..b19955b 100644
--- a/Marine_Deaths.zsc
+++ b/Marine_Deaths.zsc
@@ -85,12 +85,24 @@ Extend Class SmartMarine
 			MARP K -1;
 			Stop;
 		XDeath: //Mega oof
+			TNT1 A 0 A_JumpIf ((Crouching && Height < Default.Height),"CrouchXDeath");
 			PLAY O 5;
 			PLAY P 5 A_StartSound("Marine/XDeath",CHAN_VOICE);
 			PLAY Q 5 A_NoBlocking();
 			PLAY RSTUV 5;
 			PLAY W -1;
 			Stop;
+		CrouchXDeath:
+			MARP L 5
+			{
+				Crouching = False;
+				Height = Default.Height;
+			}
+			MARP M 5 A_StartSound("Marine/XDeath",CHAN_VOICE);
+			MARP N 5 A_NoBlocking();
+			MARP OPQRS 5;
+			MARP T -1;
+			Stop;
 		Raise:
 			TNT1 A 0
 			{
diff --git a/Marine_OtherActors.zsc b/Marine_OtherActors.zsc
index 9757e05..150662d 100644
--- a/Marine_OtherActors.zsc
+++ b/Marine_OtherActors.zsc
@@ -1,7 +1,63 @@
-//$GZDB_SKIP
-
 //Miscellaneous actors related to the marine.
 
+//Marines that are in range of this actor when it's active will be stopped from crouching.
+//This actor uses custom arguments unlike the marines, because I don't have to worry about someone giving this actor a death special. Nor does it have that many parameters.
+Class SM_NoCrouchZone : Actor
+{
+	Default
+	{
+		//$Title No Crouch Zone (AI Marines)
+		//$Category ZDoom
+		//$Sprite MARCZ0
+		//$Arg0 Range
+		//$Arg0Tooltip The range in which the crouch zone will prevent marines from crouching.
+		//$Arg0Default 128
+		//$Arg1 Crouch Delay
+		//$Arg1Tooltip How long this zone should prevent marines from crouching after they leave it.
+		//$Arg1Default 35
+		//$NotAngled
+		Radius 16;
+		Height 32;
+		+NoBlockmap;
+	}
+	
+	Override Void Activate(Actor Activator)
+	{
+		Super.Activate (Activator);
+		SetStateLabel ("Spawn");
+	}
+	
+	Override Void Deactivate(Actor Activator)
+	{
+		Super.Deactivate (Activator);
+		SetStateLabel ("Idle");
+	}
+	
+	States
+	{
+		Spawn:
+			TNT1 A 2 NoDelay; //If the actor is turned off right after being spawned, this initial delay prevents it from telling any marines around it to not crouch.
+			TNT1 A 1
+			{
+				BlockThingsIterator MarineFinder = BlockThingsIterator.Create(Self,args[0]);
+				Actor Mobj;
+				
+				While (MarineFinder.Next())
+				{
+					Mobj = MarineFinder.Thing;
+					If (Mobj.GetClassName() == "SmartMarine" && Mobj.Health > 0 && !Mobj.bDormant && Distance2DSquared(Mobj) <= args[0]*args[0])
+						SmartMarine(Mobj).CrouchDelay = Clamp(args[1],2,INT.MAX); //The minimum acceptable value is a 2 tics before the marine can crouch again.
+				}
+			}
+			Wait;
+		Idle:
+			TNT1 A 1;
+			Loop;
+	}
+}
+
+//$GZDB_SKIP
+
 Class SmartMarinePuff : BulletPuff
 {
 	Default
@@ -85,7 +141,7 @@ Class SM_Grenade : Actor
 		Speed 30;
 		BounceFactor 0.4;
 		WallBounceFactor 0.5;
-		ReactionTime 12; //Used as the fuse timer, similar to how A_Countdown uses it. This makes the grenade take about 3 seconds to explode.
+		ReactionTime 35*3; //Used as the fuse timer, similar to how A_Countdown uses it.
 		BounceType "Hexen";
 		BounceSound "Grenade/Bounce";
 		DamageType "MarineGrenade";
@@ -118,6 +174,17 @@ Class SM_Grenade : Actor
 	{
 		Super.Tick();
 		
+		If (IsFrozen())
+			Return;
+		
+		//The actual timer.
+		If (InStateSequence(CurState,ResolveState("Spawn")))
+			ReactionTime--;
+		
+		//Play the beeping sound when the grenades' fuse is halfway to detonaton. But not when the grenade has exploded.
+		If (ReactionTime > 0 && ReactionTime <= Default.ReactionTime/2)
+			A_StartSound ("Grenade/Warning",CHAN_WEAPON,CHANF_LOOPING,1.0,2);
+		
 		//"Water physics"
 		If (WaterLevel >= 1 && Gravity != 0)
 		{
@@ -133,11 +200,16 @@ Class SM_Grenade : Actor
 	{
 		Spawn:
 			TNT1 A 0 NoDelay A_SpawnItemEx ("SM_GrenadeLever",yvel:FRandom(-2,-4),FRandom(2,4));
-			MGRE B 8
+			MGRE B 4
 			{
-				//Only roll when moving fast enough.
+				//Only roll and play the bounce sound when moving fast enough.
 				If (Vel.Length() >= 2)
+				{
+					BounceSound = Default.BounceSound;
 					Roll += 20;
+				}
+				Else
+					BounceSound = "";
 				
 				//First, check if the grenade exploded near the floor of a sector or 3D floor with a liquid flat.
 				If (ReactionTime <= 0 && (SM_GrenadeExplodedOnLiquid() != SM_HitNoLiquid))
@@ -150,7 +222,6 @@ Class SM_Grenade : Actor
 				If (ReactionTime <= 0 && (Pos.Z - FloorZ) >= 32) {A_SetRenderStyle (1.0,Style_Add);Return ResolveState ("Death.Air");}
 				//If the fuse timer is 0 and the grenade exploded below 32 MU, enter the ground explosion state.
 				If (ReactionTime <= 0 && (Pos.Z - FloorZ) <= 32) {A_SetRenderStyle (1.0,Style_Add);Return ResolveState ("Death.Floor");}
-				ReactionTime--;
 				Return ResolveState(Null);
 			}
 			Goto Spawn+1;
@@ -168,8 +239,9 @@ Class SM_Grenade : Actor
 			}
 			GXPL A 2 Bright;
 			GXPL B 4 Bright A_Explode (128,192,fulldamagedistance:24);
+			GXPL CDEF 4 Bright;
 			TNT1 A 0 {Exploded = True;}
-			GXPL CDEFGHIJKLMNO 4 Bright;
+			GXPL GHIJKLMNO 4 Bright;
 			Stop;
 		Death.Floor.Liquid:
 			TNT1 A 0
@@ -195,8 +267,8 @@ Class SM_Grenade : Actor
 			}
 			#### A 3 A_StartSound ("Grenade/WaterBlast",CHAN_WEAPON,attenuation:0.6);
 			#### B 3 A_Explode (128,128,fulldamagedistance:16); //Explosions inside of liquids do less damage.
-			#### # 0 {Exploded = True;}
 			#### CDEF 4;
+			#### # 0 {Exploded = True;}
 			#### GHIJKLMNOPQRSTUVWXYZ 3;
 			Stop;
 		Death.Air:
@@ -212,8 +284,9 @@ Class SM_Grenade : Actor
 			}
 			GAXP A 5 Bright;
 			GAXP B 5 Bright A_Explode (128,224,fulldamagedistance:56);
+			GAXP CDEF 5 Bright;
 			TNT1 A 0 {Exploded = True;}
-			GAXP CDEFGHIJ 5 Bright;
+			GAXP GHIJ 5 Bright;
 			Stop;
 		DummySprites: //So GetSpriteIndex doesn't shit itself.
 			TNT1 A 0 A_Log ("An SM_Grenade actor entered the dummy sprites state, that shouldn't happen !");
@@ -235,6 +308,7 @@ Class SM_GrenadeLever : Actor //The lever the grenade drops once the pin is pull
 		Scale 0.5;
 		+NoBlockmap;
 		+RollSprite;
+		+MoveWithSector;
 	}
 	States
 	{
@@ -259,6 +333,7 @@ Class SmartMarineEmptyMagazine : Actor
 		Scale 0.7;
 		+NoBlockmap;
 		+RollSprite;
+		+MoveWithSector;
 	}
 	States
 	{
diff --git a/SNDINFO b/SNDINFO
index 8f1a8e8..8c532d5 100644
--- a/SNDINFO
+++ b/SNDINFO
@@ -44,6 +44,7 @@ Turret/Impact "Sounds/MGImpact.ogg"
 //Grenade sounds
 Grenade/Bounce "Sounds/GrenadeBounce.ogg"
 Grenade/Explode "Sounds/GrenadeBoom.ogg"
+Grenade/Warning "Sounds/GrenadeBeep.ogg"
 Grenade/WaterBlast "Sounds/WaterBoom.ogg"
 
 $Attenuation Turret/Fire 0.25
diff --git a/Sounds/GrenadeBeep.ogg b/Sounds/GrenadeBeep.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..bf6b796f64f3179a6e3d29eaaf58797213a6e571
GIT binary patch
literal 4003
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
W^hego^MhAQKV9Sdj%y+g3HDc!vw)5O

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPL0.png b/Sprites/Deaths/Crouched/MARPL0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1b57313506f9b125c31abdd07c993b1cd00d6ba0
GIT binary patch
literal 1049
zcmV+!1m^pRP)<h;3K|Lk000e1NJLTq001Tc001Ni0{{R3(kr-^00008XL3Pe0000K
z0000aE8n>F0003gP)t-s9~TR!005f+0E++se*ge4FE39309ywK8yg!#004JSD{Dt5
zH#awT7Z)QVBOgN-7c&ooYgb24GdDjc%K!iq6BC;=Gm9f5e;XTf003tI09yb6vj6}m
zQyYUHADd%4Z&yQGV@IPqJHG$`S65d@M@LIbOH&62H*+h?Yir{G0Dn_2YYz`EV<RIg
z4_8AoXKPPOHydMPW3QKgr;m4^hi{X6V^cpLcVA0q3kzpcKVM5XUk3+6GaFl5TQ4^s
z$75qdLqqQX0JC#Pk6$;hM@MrL6Q@5v6C(>>LnEuJtFuo}yH{76e`|+B2SbxLzgt_Q
zYd^oIk5fM{x1WdC002)<Pls1C2L}fi9|u1x8=G4bKZ7rWgM)8xZ&O!0|9>0bXAh4n
zD=daVWB>pF0d!JMQvg8b*k%9#0*XmQK~#8Njn36_8$l3;(H>f6CNZO#nb~3Hy#GUF
zv{FfNB0Kr2=I+$r0}mqr-sU#^PumF8C&BRufd^l%u2xp>o|0MZD;#@>kR!JFxT2H-
zc*h<g*Kd#PM_HOA2(b6!$M@^yqqX%%6yc6SjP1LX6?^%$J(uuO0+8T%XLEh6ys~P)
zgn3c!a4N*bpTS<ayuM(s+H(*^Xn+x}o*@ragS~}?vOQ;sX5AXiJQNh8FbD>O?d^PS
z7apJ*KmmE4M+8K$7X~rL*#KqFaC`6&La9dy&SD{^VJyZJWo=5^C}~^f%#d0MBfdoh
zLB8F^hqo6omX_3e)gz}CfG~9>9LEAl1X-4W%5vxVS!&?yUL~ieQ&a<|5-VyF-5hoz
z=mOAgni|FxrD{Vnm@iFS@145wZ7E5KEF&3rX{YnN+HWzfsWImJ{zR2dPD;HE$0cuW
z4qE^u+U<|f^1dc<G(CFq>4G~qjxnwwK`?xuY4zoOzUBMxr%Knui=fnlloE=$;Wg{^
z{GcGrR2T(8shB2^7#y)iz0uGZM@-<s#GMCWF$_Wg%8k_Eh%v)3_>?4E!nCcepjbQy
z;D|Kp^*TqRo)s+F%-PI|0KPvql9Vf1PUXac-xIe)@TGibf}Hb~Dawm3{83ZVCWu?h
ztP~0@Syk0P6*uE0CYhI)rc-ei`g$b7EUnp`9^*rn>AH?vsg!kH?@tlaa>N;9tYDg)
z@vRTe$A~kSCXJEgO8^#Umc@Uz=r~JZl#fka9*p9`9KFSg<A#b7{>32gz{*>6T=$h2
zMY;&THAXYX(Qvq=RIAmf1#>$XHynblC}&kAgeM&E^hi;ZD1v_^h<d1t0!;b^#;;4x
Tg<d|600000NkvXXu0mjfT-K}r

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPM0.png b/Sprites/Deaths/Crouched/MARPM0.png
new file mode 100644
index 0000000000000000000000000000000000000000..0d541665c3d003024c73aeef0e300703c0f76875
GIT binary patch
literal 1164
zcmV;71atd|P)<h;3K|Lk000e1NJLTq001fg001Zm0{{R3ztxyx00008XL3Pe0000M
z0000czY&VL0003pP)t-s9~TQl002(_0Dk}gn*acd0046U0A~OIFE1}!005@|0231v
zcTX!LD-R<hBOgN-7c&pb006%L0J8u9iz6d{8yj~Q7h4Ah8yg#&Gcy+-2ZL)@H$Nv!
zOG`%p0HZrQn`1k36BBDkCu<K6XA291A0JZ(2NNR;ua|$zYin;;LuXSzS3@&XS35^f
zGmk4P{{R3}KOajs8%IY+H#ax0M@OeWKQCh=CsP|QHy?jfFF!{sr;m3(FBg-0W8(k-
z3kwT(UrWDRTaRBi4;KJKGaF}XPg`S0H*+h)PXK#=W4E7&Z*y0JgM)v6e|L9xZ*Om7
zV`EoWS92=>yH{85005tdZ`S|-n}2IVLqj_|J9}eKUqd5@S2MG7N0%=zQ$H_TM=RG~
z3#+TEw?_c4LjXWEM$7;J00DGTPE!Ct=GbNc00Q($L_t(|UX9Szmg7bcfZ>7$F_W1+
z$PCN8VP=N+e}%NH_{`b0Cz)Rty7{`gBzU*@=?>ht9p@IL|4m~<oEYw#BjTTGAfWT;
z|Ev;=>;L@p`)^jQT&h$y3yV12-0Xb*VF&Jtxmoz*ba&^+N86hZIuF*muR+=}g`Lkn
z5oD8k`TKU~>35x#xeSi;1At8qBmh}!aDb+lySuyF?^8Q{oG{c@v6HowKvd45H27U7
zYU3obeiNygid8BeOBCubVOWz$HE2W$aak%RE%jldl;F$vTm`@oDt-QJ>ntNA)KV%(
zDslPd%|$q7xNZ0s>rlzrOru6bVv(|wN|6Y0u_up+Zsi}si6WUz=6Hs6%tA8DM8qvQ
z-a95<ew2JGlp?9~XIoo{1c1Oqg%p@R%;M+cJt7HBH?NhKYHb&Ycm{P-oJ~neM?#!E
zKiVg)(}w;$KDs&9wruvKulfb{e??@C;l_M2e%M{^%5R6)M|rm^zm-}e9OT#^iG{T7
z3z}z|8(A32BEBxPPBdZ{=h!!oavZ^<aO3hKB&LRrfd4-KW%#AK)_RE7XzKUttC{Us
zpbkS)2u($irL7@j%80_QX`tE0V}&18C01@o1~oX#Tdm;?(bi5P&Jn{1No%F>1GFp)
zpAao2w4{`&L=&K`IAILMXs!fWfmOLKATFm)r;yFE7DSkcgG3=Cnv;ZqWw|C;&}Gxs
zY&JrS1hbU$kT)>846HADr>^U88&*O@+i?_z+<t*<S-sw=<q}WYxGEzpm5o@IFRT-*
zs$46uRlD6TVZ|~>+DLp-LnEsIO>HV+H3aal{C}Yv1U9wXJ{6M{XfJpzYiL=4Pc}`i
ziURJ+avNCD)F*%1rOBPrGSa{>eD!+2n|WS#7d`2n7*|zM^lHD`{jJRNqFgU~jl?K2
z(D#qM!C;Wj*TB>Ir<;*ii+mpn&pR7<*}63s5MUv}ROFuL<@p*}Ll@yTDvPWrX@v%r
e3GS735BLvyWJST*cu9@`0000<MNUMnLSTZW$K=QW

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPN0.png b/Sprites/Deaths/Crouched/MARPN0.png
new file mode 100644
index 0000000000000000000000000000000000000000..1a451ebab2e344dfd578b4b27afcdb03e3b09f3f
GIT binary patch
literal 1244
zcmV<21S9*2P)<h;3K|Lk000e1NJLTq001rk001ip0{{R3Fse$n00008XL3Pe0000P
z0000hL-1kM00030P)t-s9~TQl004gg0A~OIivR!@GY?My0CNBUn*ab?0019D7s~(u
zvj706004s@AAcJgcNZ5&005gaGg}7-iz6eaKR+)oFDFwQ8yg!FBMYaGcT)!kzW@M_
zD=Tvo6Kh8&YYz`2BO?<N6K4wxH#aw<J3E7GS9f1avrkW(V>`Q7SC=m@Q$HU|HycMs
zN1K0ZlY3)tS3_4rGfPWL;{X85YiqAZM~7E4Gb<A}b1N@nBa4fRXH!4JPXLpXle2S2
zpNDUMe}7XyFIz_|Lo*w9cX!tS0B>(^V`F2tpNFrPe@{<OUk3+|UpE&I2PY>dtE;Qm
zUki6nE4N1guR{P;7-Kg80004WQchC<K<3zH000AbNkl<ZcwU{;<&q;u5Cq`Ps>VSO
zGAuJ5gPED$|5;o;TFL9Zy|}aUPe&-ePUVC&>Os=OH|oFSP5#kT$9nZYl4c*pKG^{O
zp%rT-?Bl`^&93$JKj1y997Pa<Yte@`<+;mSVEwoE%CpDsP%b`#EX^5fPVN2IuRlL{
zmuF9=kvq+7m5nY>^DMg>kAM5*$Il)P3_5SSoM^$(m)&MRTpwPIzy9v~tB3W$DQ?eT
z$;Vk~w{af&%j<(5#$(~{i_NDpn!1!uGy6pR;lcRwLHFiIf(n3kGN#j^JZG(0-&|fE
zsK?VNAkIhJFS9a&_?zqdM!JAj_ns;~g+w6&%aHI_H~;QD{*%~BAN6MQr?`u<aBiA2
z;J@%R*kXPByU(+b7@y7NC(nwl2M9o}ou^kX@4Q#jw?0ob4HB<;*0bskD@DFno}Ba=
zKlT3Qt4;s;;_TOR&Ibu)0UV*NR18~t(mRn0o@hW@PH&GXaFQTs&5X@+tC}@{vfFhw
zF_!&?lTW3|82t@m0;;vQXcL?@yf|CY+Eee?vsEyT!PvE`>O_3BzF<KJ0A8G(wVwX!
zefkH-E*T4E2nnipR8&>f?ZLJ<fEVXB7hZL<<~f0}{^L5ODM(L&S}JU(Ryrk(kp4Ub
zMcp*V1ws9!j*e6iu9$+F0Z`J0y3%Q`yJ`3N5KwB~Xq{;Qs@yN9l*Gl%s;YGziql|g
zYqef3C(H98tWvwX-J;tVOjWU80!UQi=abyYa;OThHSBUSnRMCWg%aNs1x%82aa!pl
zfz?@J+E)a{5(?H@0P!HvQm-0}O3ky=${8}&B=e5*)&&GO2M$CG8}F&R00=FoDOoc}
z<d%jD%7)xo(IEhdb=$W|Ys^BJIgpej#z1G<g|Z_)_cR|EU~sS8=t-}cm3m?lYt0CW
z(K?{hLC{1LwHc@_j|o~kEE8EW5}ttB0`S2F_Kf(+)*BkIb^*c&z!0#8H37~!z^5K;
zWOLZ^Bw^7oG^!=S?XD(f&@v$S4ou|t*Nn&*Sv#uxd;L90|6;E{lwcBT0ELZizXqcb
zVT8VzHaq=(e`jY$kUWkO{xEwNx3{+!LoqSK)oL~TWxt%rR`o8Ivb~EqVikM)VyngC
z+5VzXkEOqg3s%F;A)qQ3i$z&J%7txG-+{VQ6;-FchyDiW&OcWf_=d><0000<MNUMn
GLSTaKG9>x{

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPO0.png b/Sprites/Deaths/Crouched/MARPO0.png
new file mode 100644
index 0000000000000000000000000000000000000000..09ca9300cc30b6983d56e4b34910a930c868dd97
GIT binary patch
literal 1105
zcmV-X1g`suP)<h;3K|Lk000e1NJLTq001-q001Zm0{{R3hO#L+00008XL3Pe0000S
z0000df~KO50002zP)t-s9~TQl004^s0A~OIa{vHO004gg0Gj{+7c&oA0019D7pDLK
zn=>;<0056GE3*Iqiz6d*6BAnp2U7<J6C(@D006%L0D~VNe;XTj7Z;~LKWh&UXA27>
zBO@nM8yg!Nr;m4US3_4rGZPaNqdPmBV>^RuSJwalvrkW7LnBK!8-IU)lY3)tZ*Q+h
zM_)@f;{X7|PXNnnYoCX2n}2JQlaq^!i+5j3gM))-Q$Lq4FL!r$Q$H_5GaG+XFJoh4
zFE1}ACnvvKTQ6fHQ$HWGb4N2P6RWGMx1Wcvmw(q^3zwIduR{PS2yOHL0004WQchC<
zK<3zH00097Nkl<ZcwW8K$F3tc5QfqEE0OG|oNo@3qjS#L@Bchz6I!@sdvGxee-K(5
z9#jz$noeW-pZe?-mE?h-9DL<8Zt?&aj$qlp$C@6VJOr#rMvC4yybCZL$9(jTyY_UN
z`q2UZii$X`)>`R^UQp@TNPYb27xyQ|>$;#4#^a#eKfk>E<&PI1oS^>os%){WPj`G-
zFKgyc?k}Hx^Xu~wN?h~sWi{*gQenNBH1#cCUHx`>IYyL}gvgSKjgc-ztZBekdD#6w
z{yWWEA^;;}Bt@w*Uw?RC(5T(*hDsik{)Q(mW~Q%keSLLmyqo4xl*sB;Z3W4Zxd2dn
zbxm|WM*Vd6vS@&{m}4+P&Jn&O{-J<U0#z*C_g0XI+4yQGscDd^fV<yA-NVlNwCx~f
zgyadpiAk0Q<Ym9rn@}%V;(21;%6yJ;W`tBhmJ$FnlaP`4o4c=>W5tgGlta+ejSX=|
zWM!O4IP(E{SPEiHrUJ`h*3l?{Q~^aof`lKPp8D=Ch*?Y!Gj)dor|%=1OjXl9CFks%
z$p75^^wd(Kl#Ll!i%CU3eoUolw{~}4);w7PMB7Q<JV7=@Suv}XIiiE<x-Ai0RI}Xj
zlK1;LESsjeTO*}{01Pu?n8rG*?r><gpozdTGUNSxKF7~AZJ2weYzAaojev2_RZyc1
z0J_~J1DL3VA?HMg!(=^aoQ9<Pe5>x!Vl|y<FrByD(qsdIg+u_1U`AOr>-BUM^gEzS
zsZ*>RXhl4*QriLvFm*yABeLN!C^WOxDquC=HQk2ij*Ma@+`AG8fWe3)2n<wJRKj6a
zXB3c_75i8%7Kl|=4rTX!*FhgqScbuRJfZ}e=2KuzK&)bni^cFjoO9oAW-~BR3NzUF
zorCD-BH19iOWU@KGA?rBYydSNRx~ank1>BRn=R0`xXHzeMGQbtqw4(BQ2C*-Se$)Z
zI=i^JIJ<~ZgdNaaZ0WzcI4fNY-P|C?1G@-(Utx^KszfD18yA9%fNUNb+C|%9ero;#
X$*wHc8)r^Y00000NkvXXu0mjf=bzX?

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPP0.png b/Sprites/Deaths/Crouched/MARPP0.png
new file mode 100644
index 0000000000000000000000000000000000000000..99125bae7503c4c78533d45377bc5aa0c5c1d264
GIT binary patch
literal 1112
zcmV-e1gHCnP)<h;3K|Lk000e1NJLTq001`t001Wl0{{R3oYNrh00008XL3Pe0000T
z0000bQON2N0002wP)t-s9~TQl002(_0Dk}gTL1v3005f+0E++sa{vHm000*=4<ADp
z6C(@D006T909ywKk1H!j004g*8&d}dgC8Hi003tT3yUKon=>;fQyXg!50@`58yg#U
z7Z;~LKO-X}S3@&{Ygbc0FQYp<$75r=S66cr6Stp-r;m4&dt<LhM_)@f6B85H005g~
zJHt-^cVA0yS3{qNZ%a2DvrkXs004J)cW-ZRXH!38V`EoWS1&IwLo*v+2M2#sFJD6=
zQ$HWGb4S0Yk25P1ua|$fx3`m%lZ%Usi*sAoUkiVKf3HITITtSq00001bW%=J06^y0
zW&i*K4oO5oRCr#cl+}{tMi52wW@e#S%{0ug2u5c3|Nn7yML&#o+V;%)JSnd7C~j0%
zh(5y6{~<hA`23chi%{ZLa!}Qj!Bb^R8L{8({qkP)zeeo7aI!Ca@@WIlKNF!}3HbDl
zeYT7Ke1hhM<Wt%jZ~QKhfAFp@FMs*%_+!sx&sf?IynFrX`s%}%zYlY%-%p6@%7o$a
zI9szDQyG7IeEstmZ>|TPI^#&$IFH9SY-Y#(Y(6nKIlj6YdZeBLD+k_bL$B%sGaO!B
z{`h9^)-inA;j6F}Yj<>XeEcuBQLG<$eZSS%zsJ$h>)|BLRCC(|n~7lz-)FD>`sl<z
zNCRlPIZr`ynFw$m7}nr~xAx@T`hqeq{xCHb{@|1{o1PE?Gafj^0R+IGA6StE2TL@0
zX)6~N=HM)A+P)*GD27`XB>MS$<yk|pheAPKe(PKz2dib$zR}I<l#rld$uX1n1oa9<
zu-_+7s(@(h`0T8O0^>0~hM8z~;aOG1K_T>3{`%o9m(d-ZpPz*eh}}|D9^M!bwcTld
z(T+u2W!$U+XfvC?7(+|XzP(v>2#W$-Sfz}k@rI^o0|IjjHm-8Z<p@j{b62|<qvfV)
zZ^r6l1gA(TsjKN!I&?`x@VPI$<!Cg*Pc)s*X7fd1O+XS)#fuai3mC7eNKh-vfU7Cd
zp^N~8h^F)L#bnXD;LxaRJthKl(Rzk*$0E!iu+2vd#3F(jS!^Z~AiB}2*WQf;$!ol2
zufA4m_}vO#pprbtMq^~&md3O(6OV*8O@n1D$`Vn;IuGwemTil~y?PZ_8v)0XGP?p`
zX5AKvu`B~zEpg=Px^Ei5-&-5NVvJ?~(2KGNtN@}&=(;i%!ATLFx~&H1MwJDt6Inz=
z%~B9ap2Sj9!=@?Gb-=c4;X+^l)+4fQA|n(<EJ&3yYLydd_VBCB;recUxQ;OdCxB0|
zpezUpE$9IuaAJL!S#P<!LyS`=AwZS|QgzA*=rQZeE<hK{faE2*C;!b6Ji4;$FaowR
eJp*L+D1QTgrY@5X8yyb-0000<MNUMnLSTY#pxg8S

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPQ0.png b/Sprites/Deaths/Crouched/MARPQ0.png
new file mode 100644
index 0000000000000000000000000000000000000000..474dbacaea42f6b1ac0bd5bd322938079b98ca6d
GIT binary patch
literal 1020
zcmV<Y0|WetP)<h;3K|Lk000e1NJLTq0021v001Ef0{{R3R73MY00008XL3Pe0000U
z0000V&}2z)0002qP)t-s9~TQl002(_0Dk}ga{vHm003J60E++sA43-xGY^{p0H*)|
zQwIk}000vs3%>vWvj6~tA0NvA0FNsxiz6c&8yi<cGiM76TL%ZTPfw>mKbtc%moG0P
zBO@nM8-E)cgKJl(k9TVi53ff@x1Wc{V`GzhV|N!9UrRT06BAQEFB20J!%qNrUrTRS
zL!XCl;{X8H005&qJ7Z&GUqd5*Q!kriJ7-frS65drFE7(`b3-#5zgt_&Yim<KA2TZx
zzo(D4x3{mCf0L7wi;IhYe}9W}TX%PN*Ix^7Z*Ta^dqw~N00DGTPE!Ct=GbNc00Ov4
zL_t(|UcJ!ej@(!fhT-!S9WXXC3{yDE%y9oVv_3uCna;E(iX!d4KdpLPcDeWa^4fi3
z*Zc_JV`aJr>i(ZB1K<<&UiRB30lN>z>9eOVas0$S^3C2I_v=pm?f#2S&d-1TZTlY3
z{dJwaJJjz-uzB(P^5oC2{y2cbj*m|K5K+g@il&k4?d30TUtT`QLJDzDm*rV+xM-RJ
zx7(AGLs?{5q@$g*$BRK<i3lFg&wqOPAh~_jxVB$t2R1_o;PK9s`kPE!KOS!nZe+gj
zMunF=Haq@N%BRSX<Q2x_7w&*weeaAkPhD*iveZM$iD{R#-;Qq&V37Hn{rbUoOVIIB
z>QN4oZo`3G7xQoSGFETc_+L4j%^uDR2S7+t3~9%{U=2K9x{HerimU@DB)f;pUhm3H
zFmNPun)^9fmYi0c;a^1?L+UMNvkMWm7;EyaH`n3iWWp7yfdYP54s~b%h)B~9&Na_c
z-)oGCddstgnJ@>60fm?uy4-+`0EG^eaB9XL26kTg+2`JeR4Ac$wqQZSKoye^j4EO#
zf&(QCMF95w!Vmj^V`c7ZSZ{pvC24QrOGYQBl1NNiO9joA5Qg#aM&zpHbwmkrzML$2
zH%$_B84=?&hPp;%PF^6M`E)Qq*J~4FX5SVe5`J_jZzhXr(*QAmhzv2r80%W$TaKk~
z+s$+e$m^68#6>4b1kSm##AI4Dh`d%ZAaB#Es$)>kA$s!}!uztHK<3$05Nnqygqbsl
zwbeDI(;8I;<WCM>l>j6`q%@5LHHvFeb-N%w8Fh8jtFL#hMt7stC`MJ!fOHX~4um>}
z5Tcnmx5uj4j#j%yxw|{WIPt6sJ`JcSy8A+KkL&bkm&-v>#af{Xpo4B-Tr=F$L4*ZW
qT~#OnsEXhn1>A>&8FrZ+js62{mMIZKDQ*h@0000<MNUMnLSTaNfwA)d

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPR0.png b/Sprites/Deaths/Crouched/MARPR0.png
new file mode 100644
index 0000000000000000000000000000000000000000..a1afc50fdd9dbdecb405d4ebdf652376ed644b03
GIT binary patch
literal 995
zcmV<9104K`P)<h;3K|Lk000e1NJLTq0021v0015c0{{R3p>IYx00008XL3Pe0000U
z0000SNo^R)0002$P)t-s9~TQl002(_0Dk}ga{vHm003J60E++sA43-xGY^{p0H*)|
zM*skeBO_A>2NNR;vj6~_Gc(Ho09QjZmoG2B0056GE3;2egC8F+FE1xk8-E)cXA28k
z2M4E*cawW#gKJk`OE+r|4^uxcLqkJ5J3BWwH^*aRBO@cPM@OeWKX(@wa}yJ{pNFG6
zJD-PdPft(R004JiOK(?0!%qMwCnsZLV~cZJS65fNS64?zM`u$%%WG@Xb9292TSGG&
z;{X7gV>^FSFJD6=Q$HUwD-*Z3x092Tzo(Cji;J(9e|L9x*Ix^7Z*RKRp=1C600DGT
zPE!Ct=GbNc00NUqL_t(|Ue(dXk|Z}2hEe^O1j)tN%rI<b=J$UcD<fUg(c>=1*gJm<
zX>(78QgV;-?*G(h$NyCxv+L6bfWHBLQYN>z{WIp?JMZ>3YTdsLaDAM<+XoKr?|=N|
z=<(_8K|0<C+t;rS4}SajqjzrXr}y|pIX*i4^~2|f4^pa6+|VEE3V7OG7t?8h)1!lf
zoitYzRcCI9=D^c%QFR25SNA_Zce{$s?dPr-p6Yg;o`l_Oq(s#E@%ZTBj)L4gYe$7<
zV6!hLcnfG)^Ty&w>rCZqjK{Cv%2jdm1r=U;8Ovudc0=>|e3;<G!WojZUyV=0aI9}w
z1K&*K@-jn_RRD!#1Dq@tw{C-(irkR)R8l(Sbj3aVy=Y@di*7!@6j6(@A>Vp)8BaDF
zE>X@D@Ks$A^)fG-zISf=CXKwtm}oJ%?#zTaPz)%<%#d?4HUbnnQ^JWEdl=Yx<u~7Y
zA5x)&#dXJmDFbCpLNF?cnFtP)P>BHSM}@COfMaDIX;`g&^fl?C^ED&Ott1kY)>1+9
z34~!>-HF_`yo#tn&exl6aW_qZoDnfjVrUvf=Hvz9nNMaj<X)N>GyAp(k??~<eYfeh
z(<u-Gh{*CDV{96QZ#mY!ZP(i^ATLu=5EogJ2%K|ujm@^0BJxVJ10u7QWfOyX4$+(M
zA-u0g31ps41+j5C2<Lhb8*3VDw++e?=#Lz{Dgj7>NNF1hY7|$b>ITX_8Rhcy`Ptdo
zix;1sFRzvt%NSKX1Ck>~69`QVAw)BCgH;jL-Y(B`7Z=M9a#vS~apPGPd=gMnbVDJy
z$HCZ;MQ-?<qKu99JCLE<6;}+mH<$>El}%Zq1~L~>>?q*=F=UHe@66sA{u78lDg+ac
RDQf@#002ovPDHLkV1mB%pdkPN

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPS0.png b/Sprites/Deaths/Crouched/MARPS0.png
new file mode 100644
index 0000000000000000000000000000000000000000..25e5164451458d9da14f3fb600768eae7dbe7d17
GIT binary patch
literal 931
zcmV;U16=%xP)<h;3K|Lk000e1NJLTq0021v000*V0{{R3hF}-*00008XL3Pe0000U
z0000LFtMO+0002qP)t-s9~TQl002(_0Dk}ga{vHm003J602eb4n*abGLl=tx023n%
zrvLy`2M0$00Gl&2CsP}<005^yKaVRbgC8GT2M5al0KWhLmoG27S68!7Pm3cXFE1~D
z8yj~Q7iS9#r;m5n002WnLpwV=H#avUBO}LSV{;P|YYz{@PXM={ho6UUlY3*!YimzW
zPj6R4uSZ9tJ3C)XH=AQSQ$H^!Cnr}!Gq0C_S65dvD-%aYM~ib?gKJm6TU*m}bN>JU
zzo(C5V`FDiKYvp%Q$HVfUrV>Qw~LF5*Ix^FcXz*_7~cQ@00DGTPE!Ct=GbNc00Li0
zL_t(|Ud7PYZX`DlhEe_%Np_x`M=@;9&N=)2U&tJfC9Qy6-TFfV#RhnQ>JE41!}C8i
zdK{cQefr0r-#rlPW%%W7ncMYaaCr6m^OL{7`u2hB!dotrzR#a^`Nw%(%lj{Xe)jwx
z?sqRjJb>Ny<9+p>O-9S*sEemj(#gq3Qbuo%VEp1u{PYi47P=fo=05%O><*@S^utl^
z7E4C>Wc9Y|7DAT$FJ9fko_Td#Qp{U{aX7YGt?pqaf(c3VbX@BlYpQuPzPbuQMfwCv
z(T;F2ne4(I<HP6BD39o0$?=j8@UMFC6erzkbtR(aUQr&hg@PCRJ-2Ab3gmUO*0lj3
zB8|U=Fn<zfS=}Q|7Oy)qVNT=;wU`-7Va!H=LdQzDG2;vahphbM*PK(Vl`whTv0%<X
z>rn_sEin@zfFjl+0Owhq*E1lnGS4*i+w8d^opiZj6gibhVlr5)X|;ebjMvv9yMcR0
z0}8p>ca!UR6qJmJapS3~;LI@#Bs1TP$0(he7&GUgPEPnbpt;_6)A=0m1R}CB-My+5
zd0=nyFl?t&Ku%*+5Z6VL2to)=gZ;Fg!@1Yu0B6>=tvqSw<k|88BIjlnL6+H6;8iF=
zxO4zsQB`3&t<bhWIeN;f1Rx5W;?xOh<UOf||7eazrE>fH?Ck92%Wuv%mz#@?yJ}`Y
zO2nuVq4JcHo7s`7FpE-Yb6&c**nB8mUc!B!SrvSf(2|E^DTUkaIHQQt;T@{hdZlFo
zC@|dSJtKTBm<WqlTeU43pl}hzEd|13;ec@n%B=SA_CMtnCq&q*hRFZ`002ovPDHLk
FV1f-pmAL=_

literal 0
HcmV?d00001

diff --git a/Sprites/Deaths/Crouched/MARPT0.png b/Sprites/Deaths/Crouched/MARPT0.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c6b1633eb6b99c0c119b4e6cb800bec1d60b80
GIT binary patch
literal 921
zcmV;K17`e*P)<h;3K|Lk000e1NJLTq0021v000&U0{{R3O+3U@00008XL3Pe0000U
z0000KN4Ajo0002nP)t-s9~TQl002(_0Dk}ga{vHm003J602eb4A43<L004^s0Gl&2
z6C(?!002`52d6(jM*sjPQya4Y0A~veTL%Y=BO{M1D}x^&%K!ks004g*8!s;}moG1~
zPfxp7S9cc|r;m4Q4-dy<V}ol~lY3(~H#gS+0CN))BO@b2LqoTphdVnvpNDTxPfu@G
zL$60i!%qOCJ3C)XH&;V5Q$H^!CnuX@JO2OxQ$HUwD-*Z3w~LF5cXxMpUrT>eFJoh4
zzgt_cmw!h`N6Tw#({po+b6dZskJn!dS65foF{Rr80004WQchC<K<3zH00075Nkl<Z
zcwUvz)o$%L9K~U;KN-T=%w_I@VP<;&CmLsRs_u)n()@0sNdBZ{yZ_tC-Q9QJpT7v2
zH(~$o$BUC6{`vD*%=RN#&)$+rK0Cko_2-9+V_A%Veo3#puUAziU!0$u9LdSy_YoY{
zuk2kk`+ZZyt0>{_uZL$T&BqbU&pyT%WwXz8-$dpvoIk%&sG2`UdD!k5?!~HgQEY`Q
zb)Ua`f*td294Y2ofw3Fg?RL*F5y6Bc`Y_J=iZxW+%+JmSDO~`CXd~P%76&)Me7FuZ
zsiFTQ#~U8t-&OBJTok+AnTVSAC8a)@%XmAPaEo@XK$_Jvof!Zk()f*Ys}FIR)cZ(_
z?fb$^m;?EMO3Vy7H)kV2p>rjinsI`GT~hw=Q%WILN?5!vSg>NC^-%~$Ein_pfg)xi
z0H<Y@W=p`aGA}iB>*P~Sx+qf3$Z{%?#H6=a(QXT27|*Un4n21sHOQrUQY@}lQIInt
z#;Ffw3C|ppKoaxme2(0ei7|8PtKbRWI@H&bV!B!ZK7fcUf4%o*sYpHhI`#c}ItAn^
zMg?(|C5gZ}SJ#+Ks}($VnjPSowQWluG;#3B(g2ZCy^J7BY%1`j%Rx9d0AEtxIh~eh
zTVR+Rk}3g+0#9-332Nj!QgxqbiblD7`u_Iz_VMwz`_0Yfa^t;fVnA}lC<7sH3BjA$
zNL83c2fMk?U0!a!%-!6;`$=L|@M%Cx-i?Lejv6^5i`?)JRcn2z$P&oVJ>@%wdo7p<
vi&$H>EovZh5ycY)+*@J57=kjZ!5#N6@r5U%37}W(00000NkvXXu0mjf2cL;e

literal 0
HcmV?d00001

diff --git a/Sprites/MARCZ0.png b/Sprites/MARCZ0.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f6803d512393aea8199aa8f0965f4202d9d1131
GIT binary patch
literal 1042
zcmV+t1nv8YP)<h;3K|Lk000e1NJLTq001`t003YJ0{{R3j*c2T00008XL3Pe0000R
z0001B*gmSQ0002bP)t-s0000NGY=CZ3sYA+TVqEbLl-Y&BR6v^KZ7qLBO|Yuf1ihM
zn`1k_r;lGlBS%j&XKPO{FE2kwD>pwUZ*x~KHy<M_5B~rFH#avsJ3AX28z(0x*Na=f
zdrOaBH=}DmcTX#mdt*a08-r_Cn}2IhPfxd>hg-i-3l|4_e`8axN2iZ>6B83BQyYtO
zTU%ROdt*;SlQ&04M?*tHKQ9+=Z*TXjdtXa8Q$HVLV`Ec4FK1Ifi;Ih2&sS&PUrV1q
zcVA0aLo<JWf1iV6Z&yRXLD;hZ0004WQchC<K<3zH0008rNkl<ZcwX(+$8y^+5C&kP
zvG=Cldv)z4{r#UQ3(yme1j_JO<0J?DBOM^&n_U7ttadoHBAOy6cXB6pawjK|GN0;X
zsC~B6)JzSv&vY{U-`_LsFjGVAFFJtQKh7z&KluQXs2WwQ)k^WBLP_*Z_JRM@%_x`(
z%8e+Y>iEYi+Zmjz;r<nm&POY6I#$6#lyK|Vwg<5luvnEasyFJb!PN0qGL*`duyOTp
z^W&`L4IIy5x^b{z!Ae-4+&n+uOuX&Dp6Z5qF`G$y%W@?=ub=UHjyKx=`fix!a`y72
zYIDJ?b&H3?Z>#Zx<9W{L?vX(`U|(KJxa-#IR#|ZbwY<UI-DAWyx^c0b&6dl32h57<
z@QEfx1l$guuIf>Q5IDnJE-%cTf{|re;MR?^vq_`=8V;W#E5Zmdj9;m-<JOQ`ZN0WG
zFE3lsYs51)n+O<k+np|Aa2dLM*>EHloJbSCR<C10IK-HtUZ;Hvu#Xr*+Ab8lDZ)jk
z4Y1kdu+wpg+v~V)*B>GrRJkI4zw7qeMQS{~ZrJU1`+a{H(D1MW$R#w_zP%ODC1Kz9
zheH&{$zcb%7S!!Q1SA9$MoiZks&=IWDk5MqM2G=1bS67F^P%ti0*Yd$Y3Q5xI7}C-
zMVfM`n_tcAYyDmI5DL;X3~9ijVcy?wHVmm9V<-wJ4Prt>MI9K!JFXJKE<)2qN-0S=
z1coFgJHCyC&?qG&K^!uaX=(>;B7k8S1OdhZW?3dV2_onU6H0@SCOFSC4wE2Ul&sQW
zguq=<8m7q{=UJ9;7|>AZfX$~<n+8dgXGxO8Ma9xp!Z`-En%ZO0CNOw74&!|WuD0iX
z+V%p@GsrV>B9wBtw^c4Uhf7#2LPCN(&tXHH7B7HsZ;hIi!YxpeL}HZ@634MLl~lom
zz?py&iJ(_lNKAr?*+7D7cl2Cv{2Zd5dybs5j-Tt)bL4Szt2zqw8%3ylsw+jhK>z>%
M07*qoM6N<$f-We-D*ylh

literal 0
HcmV?d00001

diff --git a/VanillaRifle.zsc b/VanillaRifle.zsc
index 63790bb..56643aa 100644
--- a/VanillaRifle.zsc
+++ b/VanillaRifle.zsc
@@ -22,6 +22,7 @@ Class VanillaRifle : Weapon
 		Obituary "%o was gunned down by %k's assault rifle";
 		+Weapon.Ammo_Optional;
 	}
+	
 	//Modified version of a generic reloading function by Agent_Ash.
 	Action Void A_RifleReload()
 	{
@@ -41,8 +42,10 @@ Class VanillaRifle : Weapon
 		PSP_IMPOSTOR = 3, //ඞ
 		PSP_FADE = 1001 //The fade transition between the zoomed in and normal state of the rifle.
 	}
+	
 	Bool AlreadyZoomed; //Is on as long as the gun is zoomed in.
-	Double BulletSpreadXY, BulletSpreadZ;
+	Bool UnzoomAndLeave; //When on, it makes the ZoomOut state jump to the Deselect state instead of Ready, for when the weapon is deselected while still zoomed.
+	Bool Zooming; //Turned on when the weapon is playing the zoom in or out animation, so if the player is killed during the animation, the overlays will be removed in the Deselect state.
 	States
 	{
 		Spawn:
@@ -67,26 +70,22 @@ Class VanillaRifle : Weapon
 			VRIF AAAAAABBBBBB 1 A_Raise();
 			Loop;
 		Deselect:
-			TNT1 A 0 A_StopSound (1234);
-			TNT1 A 0 A_JumpIf (!Invoker.AlreadyZoomed,19); //Unzoom the rifle if it was zoomed before being changed.
-			TNT1 A 8 A_Overlay (PSP_FADE,"Green");
 			TNT1 A 0
 			{
-				A_OverlayAlpha (PSP_SCANLINES,0.0);
-				A_ZoomFactor (1,ZOOM_INSTANT);
-				A_SetCrosshair (0);
-				A_StopSound (1234);
-				A_Overlay (PSP_IMPOSTOR,"FakeRifle");
-				A_OverlayPivot (PSP_IMPOSTOR,0.67,0.67);
-				A_OverlayScale (PSP_IMPOSTOR,4.0,4.0); //Pre-scale the rifle to double the size.
-				Invoker.AlreadyZoomed = False;
-			}
-			TNT1 AAAAAAA 1 A_OverlayScale (PSP_IMPOSTOR,-0.4,-0.4,WOF_ADD|WOF_INTERPOLATE); //Zoom out of the rifle.
-			TNT1 A 0
-			{
-				A_Overlay (PSP_IMPOSTOR,Null);
-				A_Overlay (PSP_FADE,Null);
-				A_OverlayAlpha (PSP_WEAPON,1.0);
+				If (Invoker.AlreadyZoomed)
+				{
+					Invoker.UnzoomAndLeave = True;
+					Return ResolveState ("ZoomOut");
+				}
+				
+				If (Invoker.Zooming)
+				{
+					A_Overlay (PSP_IMPOSTOR,"Null");
+					A_Overlay (PSP_FADE,"Null");
+					A_OverlayAlpha (PSP_WEAPON,1.0);
+					
+				}
+				Return State (Null);
 			}
 			VRIF AAAAAABBBBBB 1 A_Lower();
 			Loop;
@@ -147,6 +146,7 @@ Class VanillaRifle : Weapon
 			TNT1 A 0 A_JumpIf (Invoker.AlreadyZoomed,"ZoomOut");
 			VRIF A 0
 			{
+				Invoker.Zooming = True;
 				A_Overlay (PSP_FADE,"Green"); //A_SetBlend sucks.
 				A_Overlay (PSP_IMPOSTOR,"FakeRifle"); //Create the fake weapon layer.
 				A_OverlayPivot (PSP_IMPOSTOR,0.67,0.67);
@@ -155,18 +155,23 @@ Class VanillaRifle : Weapon
 			VRIF AAAAABBBBB 1 A_OverlayScale (PSP_IMPOSTOR,0.2,0.2,WOF_ADD|WOF_INTERPOLATE); //Zoom into the rifle.
 			TNT1 A 0 //When the screen is faded out.
 			{
-				A_Overlay (PSP_IMPOSTOR,Null); //Ejected
+				A_Overlay (PSP_IMPOSTOR,"Null"); //Ejected
 				A_OverlayAlpha (PSP_SCANLINES,1.0); //Make the scanline effect visible.
 				A_SetCrosshair (69); //Funny number
 				A_ZoomFactor (3,ZOOM_INSTANT);
 				Invoker.AlreadyZoomed = True;
 			}
 			TNT1 A 12; //Wait for the fade overlay to fade out.
-			TNT1 A 0 A_Overlay (PSP_FADE,Null); //Then remove it.
-			TNT1 A 0 A_StartSound ("VRifle/Zoomed",1234,CHANF_LOOPING); //Begin to play the digital humming sound.
+			TNT1 A 0
+			{
+				A_Overlay (PSP_FADE,"Null"); //Then remove it.
+				A_StartSound ("VRifle/Zoomed",1234,CHANF_LOOPING); //Begin to play the digital humming sound.
+				Invoker.Zooming = False;
+			}
 			Goto Ready;
 			
 		ZoomOut:
+			TNT1 A 0 {Invoker.Zooming = True;}
 			TNT1 A 8 A_Overlay (PSP_FADE,"Green");
 			TNT1 A 0
 			{
@@ -182,10 +187,13 @@ Class VanillaRifle : Weapon
 			TNT1 AAAAAAAAAAAAAAA 1 A_OverlayScale (PSP_IMPOSTOR,-0.2,-0.2,WOF_ADD|WOF_INTERPOLATE); //Zoom out of the rifle.
 			TNT1 A 0
 			{
-				A_Overlay (PSP_IMPOSTOR,Null);
-				A_Overlay (PSP_FADE,Null);
+				A_Overlay (PSP_IMPOSTOR,"Null");
+				A_Overlay (PSP_FADE,"Null");
 				A_OverlayAlpha (PSP_WEAPON,1.0);
+				Invoker.UnzoomAndLeave = False;
+				Invoker.Zooming = False;
 			}
+			TNT1 A 0 A_JumpIf (Invoker.UnzoomAndLeave,"Deselect");
 			Goto Ready;
 		EmptyClick:
 			VRIF A 3 A_StartSound ("VRifle/EmptyGun",CHAN_WEAPON);
diff --git a/ZScript.zsc b/ZScript.zsc
index a837445..24f9780 100644
--- a/ZScript.zsc
+++ b/ZScript.zsc
@@ -16,6 +16,7 @@ MARINES AT THIS MICRO-INSTANT FOR YOU. HATE. HATE.*/
 /*When the new GZDoom version comes out, begin using CHF_DONTIDLE, and also use my DONTFOLLOWPLAYERS flag, to add an additional use mode for friendly marines,
 that makes them follow you. While the wandering mode makes them actually wander around, instead of following you.*/
 //Maybe add a secondary melee attack to the rifle weapon, like what the marines have. I'll need first person sprites of the rifle being swung though.
+//It seems that there's a bug where marines crouch behind windows with linedefs that block their line of fire. I should investigate and fix it if that's the case.
 
 Class SmartMarine : Actor
 {
@@ -69,6 +70,7 @@ Class SmartMarine : Actor
 		If (IsFrozen() || Health <= 0)
 			Return;
 		
+		If (CrouchDelay > 0) CrouchDelay--;
 		If (GrenadeDelay > 0) GrenadeDelay--;
 		If (DodgeDelay > 0) DodgeDelay--;
 		//Once the dodge delay is over, remove the point to the previous projectile.
@@ -162,6 +164,7 @@ Class SmartMarine : Actor
 	Int EscapeAttempts; //How many times the marine has attempted to run out of sight to reload.
 	Int GrenadeDelay; //Marines set this timer on each other after throwing grenades, to not all spam grenades at once when in groups.
 	Int DodgeDelay; //Once this reaches 0, the marine clears the PreviousProjectile pointer. Alowing him to dodge the same projectile again.
+	Int CrouchDelay; //The marine will not crouch as long as this variable isn't at 0 or below. Used by the no-crouch zone actors.
 	Int LookingUpDelay; //Used in the Crouch state, to make the marine look up sometimes while crouched. This is purely cosmetic.
 	Int CrouchAttackDelay; //Used when the marine decides to stop shooting for a bit while behind cover. Or after ducking to avoid a projectile.
 	Bool RemovedOldMag; //Keeps track of whether or not the marine removed their previous magazine during reloading.
@@ -294,7 +297,11 @@ Class SmartMarine : Actor
 					Return ResolveState ("Reload");
 				}
 				
-				If (CountInv ("PowerStrength") > 0) bAvoidMelee = False; Else bAvoidMelee = True; //Don't avoid melee combat if you have a berserk pack.
+				//Don't avoid melee combat if you have a berserk pack.
+				If (CountInv ("PowerStrength") > 0)
+					bAvoidMelee = False;
+				Else 
+					bAvoidMelee = True;
 				
 				If (SM_CanCrouch())
 					Return ResolveState ("Crouch");
@@ -813,7 +820,7 @@ Class SmartMarine : Actor
 			MARG B 4;
 			TNT1 A 0 A_JumpIf (Crouching,"Crouch");
 			Goto See;
-		Reload: //I really need some sprites of the crouched marine reloading, to the marines stay ducked to reload.
+		Reload: //I really need some sprites of the crouched marine reloading, so the marines stay ducked to reload.
 			TNT1 A 0 A_JumpIf ((QuickReload || Crouching),9);
 			PLAY AABBCCDD 2 //Run away a from your target for a bit longer after they are out of sight.
 			{
diff --git a/credits.txt b/credits.txt
index 37c3a74..e366618 100644
--- a/credits.txt
+++ b/credits.txt
@@ -18,7 +18,7 @@ Grenade liquid explosion and small splash sprites are from Metal Slug.
 Alternate marine death sprites made by DavidG/ItsNatureToDie and DoomJedi.
 Machine gun turret sprites made by Sergeant_Mark_IV, redrawn by TG5.
 Marine jumping/dodging sprites made by Sergeant_Mark_IV. Jumping and shooting sprites made by Tabijaky.
-Crouched marine sprites made by TG5.
+Crouched marine sprites made by TG5. Crouched gib death sprites made by Ghastly_Dragon.
 
 ======|Other graphics|======
 Alternate marine colors by inkoalawetrust, partially based on the ones made by DBJ87 for the Allied Marines Realm667 resource.