diff --git a/.gitignore b/.gitignore
index 104fae5..a314f8f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-out/*
-/out
+out/*
+/out
diff --git a/CREDITS.txt b/CREDITS.txt
index 622adbf..6554457 100644
--- a/CREDITS.txt
+++ b/CREDITS.txt
@@ -1,2 +1,2 @@
-- freesound for misc sounds;
+- freesound for misc sounds;
 - Voices were made in TTS.
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
index 469d3a9..f3e2955 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,30 +1,30 @@
-MIT License
-
-Copyright (c) 2018 Gustavo Ramos Rehermann
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-----------
-
-The ACC provided is NOT owned by or affiliated to Gustavo Rehermann in any way,
-for it is just a Linux binary compiled and provided for ease of usage of this
-software; nor does the ACS standard library files inside the STDACS folder. These
-have therefore all their rights reserved by the ZDoom team, including the rights
-of prohibiting by law every distribution of the Software that contains these files
-(ACC and its standard library ACS files) if necessary.
+MIT License
+
+Copyright (c) 2018 Gustavo Ramos Rehermann
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+----------
+
+The ACC provided is NOT owned by or affiliated to Gustavo Rehermann in any way,
+for it is just a Linux binary compiled and provided for ease of usage of this
+software; nor does the ACS standard library files inside the STDACS folder. These
+have therefore all their rights reserved by the ZDoom team, including the rights
+of prohibiting by law every distribution of the Software that contains these files
+(ACC and its standard library ACS files) if necessary.
diff --git a/LOADACS b/LOADACS
index 8f95f90..a802160 100644
--- a/LOADACS
+++ b/LOADACS
@@ -1 +1 @@
-ZETAACS
+ZETAACS
diff --git a/MAPINFO.txt b/MAPINFO.txt
index 8ba3e5c..c284b1d 100644
--- a/MAPINFO.txt
+++ b/MAPINFO.txt
@@ -1,7 +1,7 @@
-SpawnNums
-{
-    83001 = ZTPathNode
-    83003 = ZTUseNode
-    83004 = ZTJumpNode
-    83005 = ZTAvoidNode
+SpawnNums
+{
+    83001 = ZTPathNode
+    83003 = ZTUseNode
+    83004 = ZTJumpNode
+    83005 = ZTAvoidNode
 }
\ No newline at end of file
diff --git a/README.md b/README.md
index c12f29b..3865706 100644
--- a/README.md
+++ b/README.md
@@ -1,67 +1,67 @@
-# ZetaBot
-**The modern ZScript bot made for GZDoom**, made *by ZDoomers for ZDoomers*.
-
-* Exactly **3748 lines** of code written **manually** (verified with `wc`)
-* **Five** possible bot states (Wandering, Following, Attacking, Hunting and Fleeing)
-* **Extensive debugging** (set by CVar `zb_debug`)
-* Has the **attention of official ZDoom developers**
-* Flexible **PK3 mod build script** solution (`build.sh`)
-* Multiple male and female **voices**
-* Pathnode system with **A\* pathfinding**
-* Supports **any weapons and player classes** _(given there are modules for them, supplied by their respective modders)_
-* Constraints akin to **real** players _(max speed, max firing rate, etc etc)_
-* Weapon **rating** system
-
----
-
-# How to Play
-
-### Universal
-
-The easiest way is to go to the Releases section of the repository and
-downloading the PK3 attached to the latest release. Otherwise, you need
-to run the build script in order to zip up the PK3 and get the launch script.
-
-### Linux
-
-1. Run your terminal window and `cd` to the folder with the ZetaBot source.
-2. Run the buildscript:
-
-        ./build.sh [-f <output folder : out>] [-s <path to source port : /usr/bin/gzdoom>] -i <path to the mod's IWAD>
-    
-   It also supports optional CVar settings:
-
-        [-c <name=value> [-c <name2=value2> ...]]
-        
-   And additional source port settings as well:
-   
-        [-e <option>[=<value>] [-e <option>[=<value>] ...]]
-    
-   For example:
-
-        ./build.sh -f out -s gzdoom -i /usr/games/doom/doom2.wad -c zb_debug=1 -e "-nomonsters" -e "-skill=1" -e "+map=MAP18"
-    
-3. Launch:
-
-        cd <output folder : build>
-        ./ZetaBot
-    
-For other mods that use the same buildscript, try `ls` to find a file,
-of the same name as the mod's PK3, but without the version and extension
-in the filename.
-
-You only need to do the steps 1 and 2 once (unless you want to change the
-CVARs set). You can also use the output PK3 as a normal mod, instead of
-using the launchscript :)
-
-    
-### Windows
-    
-For Windows you can just zip up all the files directly in the top folder of the repo,
-along with the following folders:
-
-* ZetaCode
-* sprites
-* sounds
-* acs
-* source
+# ZetaBot
+**The modern ZScript bot made for GZDoom**, made *by ZDoomers for ZDoomers*.
+
+* Exactly **3748 lines** of code written **manually** (verified with `wc`)
+* **Five** possible bot states (Wandering, Following, Attacking, Hunting and Fleeing)
+* **Extensive debugging** (set by CVar `zb_debug`)
+* Has the **attention of official ZDoom developers**
+* Flexible **PK3 mod build script** solution (`build.sh`)
+* Multiple male and female **voices**
+* Pathnode system with **A\* pathfinding**
+* Supports **any weapons and player classes** _(given there are modules for them, supplied by their respective modders)_
+* Constraints akin to **real** players _(max speed, max firing rate, etc etc)_
+* Weapon **rating** system
+
+---
+
+# How to Play
+
+### Universal
+
+The easiest way is to go to the Releases section of the repository and
+downloading the PK3 attached to the latest release. Otherwise, you need
+to run the build script in order to zip up the PK3 and get the launch script.
+
+### Linux
+
+1. Run your terminal window and `cd` to the folder with the ZetaBot source.
+2. Run the buildscript:
+
+        ./build.sh [-f <output folder : out>] [-s <path to source port : /usr/bin/gzdoom>] -i <path to the mod's IWAD>
+    
+   It also supports optional CVar settings:
+
+        [-c <name=value> [-c <name2=value2> ...]]
+        
+   And additional source port settings as well:
+   
+        [-e <option>[=<value>] [-e <option>[=<value>] ...]]
+    
+   For example:
+
+        ./build.sh -f out -s gzdoom -i /usr/games/doom/doom2.wad -c zb_debug=1 -e "-nomonsters" -e "-skill=1" -e "+map=MAP18"
+    
+3. Launch:
+
+        cd <output folder : build>
+        ./ZetaBot
+    
+For other mods that use the same buildscript, try `ls` to find a file,
+of the same name as the mod's PK3, but without the version and extension
+in the filename.
+
+You only need to do the steps 1 and 2 once (unless you want to change the
+CVARs set). You can also use the output PK3 as a normal mod, instead of
+using the launchscript :)
+
+    
+### Windows
+    
+For Windows you can just zip up all the files directly in the top folder of the repo,
+along with the following folders:
+
+* ZetaCode
+* sprites
+* sounds
+* acs
+* source
diff --git a/ZetaCode/Obstacles.zsc b/ZetaCode/Obstacles.zsc
index 5127e11..a544d53 100644
--- a/ZetaCode/Obstacles.zsc
+++ b/ZetaCode/Obstacles.zsc
@@ -1,71 +1,71 @@
-class ObstacleCheckWaiter : Thinker
-{
-    enum WaitState
-    {
-        CS_NOTHING,
-        CS_PENDING,
-        CS_WALL,
-        CS_ACTOR
-    };
-    
-    WaitState st;
-}
-
-class ObstacleChecker : Actor
-{
-    Default
-    {
-        Speed 1;
-        Projectile;
-    }
-    
-    ObstacleCheckWaiter waiter;
-    
-    void SetState(uint st)
-    {
-        if ( waiter != null )
-            waiter.st = st;
-    }
-    
-    static ObstacleCheckWaiter MakeFor(Actor other, double ang, double maxDist)
-    {
-        ObstacleCheckWaiter waiter = new("ObstacleCheckWaiter");
-        waiter.st = ObstacleCheckWaiter.CS_PENDING;
-        
-        ObstacleChecker ck = ObstacleChecker(other.SpawnMissileAngleZ(24, "ObstacleChecker", ang, 0));
-        
-        if ( ck == null )
-            return null;
-        
-        ck.speed = maxDist;
-        ck.waiter = waiter;
-        
-        return waiter;
-    }
-    
-    States
-    {
-        Spawn:
-            TNT1 A 1;
-            TNT1 A 0
-            {
-                SetState(ObstacleCheckWaiter.CS_NOTHING);
-            }
-            Stop;
-            
-        Crash:
-        XDeath:
-            TNT1 A 0
-            {
-                SetState(ObstacleCheckWaiter.CS_ACTOR);
-            }
-            Stop;
-            
-        Death:
-            TNT1 A 0
-            {
-                SetState(ObstacleCheckWaiter.CS_WALL);
-            }
-            Stop;
-    }
-}
+class ObstacleCheckWaiter : Thinker
+{
+    enum WaitState
+    {
+        CS_NOTHING,
+        CS_PENDING,
+        CS_WALL,
+        CS_ACTOR
+    };
+    
+    WaitState st;
+}
+
+class ObstacleChecker : Actor
+{
+    Default
+    {
+        Speed 1;
+        Projectile;
+    }
+    
+    ObstacleCheckWaiter waiter;
+    
+    void SetState(uint st)
+    {
+        if ( waiter != null )
+            waiter.st = st;
+    }
+    
+    static ObstacleCheckWaiter MakeFor(Actor other, double ang, double maxDist)
+    {
+        ObstacleCheckWaiter waiter = new("ObstacleCheckWaiter");
+        waiter.st = ObstacleCheckWaiter.CS_PENDING;
+        
+        ObstacleChecker ck = ObstacleChecker(other.SpawnMissileAngleZ(24, "ObstacleChecker", ang, 0));
+        
+        if ( ck == null )
+            return null;
+        
+        ck.speed = maxDist;
+        ck.waiter = waiter;
+        
+        return waiter;
+    }
+    
+    States
+    {
+        Spawn:
+            TNT1 A 1;
+            TNT1 A 0
+            {
+                SetState(ObstacleCheckWaiter.CS_NOTHING);
+            }
+            Stop;
+            
+        Crash:
+        XDeath:
+            TNT1 A 0
+            {
+                SetState(ObstacleCheckWaiter.CS_ACTOR);
+            }
+            Stop;
+            
+        Death:
+            TNT1 A 0
+            {
+                SetState(ObstacleCheckWaiter.CS_WALL);
+            }
+            Stop;
+    }
+}
diff --git a/ZetaCode/PawnClasses/ZetaBotPawn.zsc b/ZetaCode/PawnClasses/ZetaBotPawn.zsc
index e157851..fd6d5e8 100644
--- a/ZetaCode/PawnClasses/ZetaBotPawn.zsc
+++ b/ZetaCode/PawnClasses/ZetaBotPawn.zsc
@@ -1,248 +1,248 @@
-class ZetaBotPawn : Actor
-{
-	property DefaultInv: defweap;
-	String defweap;
-	bool bMoved;
-
-	Default
-	{
-		PainChance 100;
-		Speed 1;
-		Obituary "%o wound up smarted out by %NAME%!";
-		Species "ZetaBot";
-		ZetaBotPawn.DefaultInv "";
-		
-		+SOLID
-		+SHOOTABLE
-		+DROPOFF
-		+FRIENDLY
-		+SLIDESONWALLS
-		+CANPASS
-		+CANPUSHWALLS
-		+FLOORCLIP
-		+WINDTHRUST
-		+TELESTOMP
-		+NOBLOCKMONST
-		+FRIENDLY
-		+ISMONSTER
-		+THRUSPECIES
-		+BLOCKASPLAYER
-		+CANUSEWALLS
-		+ACTIVATEMCROSS
-
-		-NOTDMATCH
-		-NOBLOCKMAP
-	}
-
-	static String GetSomeType(Actor anchor = null)
-	{
-        Array<String> rset;
-		Array<String> types;
-		Array<String> parms;
-		let btypes = CVar.FindCVar('zb_btypes').GetString();
-		btypes.Split(types, ';');
-		
-		for ( uint i = 0; i < types.Size(); i++ )
-        {
-            parms.Clear();
-            types[i].Split(parms, ':');
-            
-            if ( parms.Size() < 2 )
-                continue;
-		
-            let iter = ThinkerIterator.Create(parms[1]);
-            
-            if ( anchor != null ) anchor.A_Log(parms[0]..': '..parms[1]);
-            
-            if ( iter.Next() )
-                rset.Push(parms[0]);
-        }
-        
-        if ( anchor != null ) anchor.A_Log('Plausible types: '..rset.Size());
-		
-		if ( rset.Size() > 0 )
-            return rset[Random(0, rset.Size() - 1)];
-            
-        else
-            return "";
-	}
-	
-	enum MovementModifier
-	{
-		MM_None,
-		MM_Run,
-		MM_Crouch,
-	};
-	
-	MovementModifier moveType;
-	bool bShooting; // for visual purposes
-	ZTBotController cont;
-	const speedMod = 6;
-	
-	override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack)
-	{
-		if (mod == 'Telefrag')
-			return "$OB_MONTELEFRAG";
-		
-		string newObituary = Obituary;
-		
-		if ( cont != null )
-		{
-			newObituary.Replace("%ID%", ""..cont.BotID);
-			newObituary.Replace("%NAME%", cont.myName);
-		}
-			
-		else
-		{
-			newObituary.Replace("%ID%", ""..-1);
-			newObituary.Replace("%NAME%", "a ghost ZetaBot");
-		}
-		
-		return newObituary;
-	}
-	
-	void BotThrust(double maxSpeed, double angle)
-	{
-		Thrust(maxSpeed * speedMod - sqrt(vel.x * vel.x + vel.y * vel.y), angle);
-	}
-	
-	override void BeginPlay()
-	{
-		Array<String> dweap;
-		defweap.split(dweap, ",");
-		
-		for ( int i = 0; i < dweap.Size(); i++ )
-			GiveInventoryType(dweap[i]);
-			
-		Array<String> eweap;
-		let extra = CVar.GetCVar("zb_extraweap").GetString();
-			
-		if ( extra != "" )
-		{
-			extra.split(eweap, ",");	// not ";" to support Bash command
-										//line parameter setting
-			
-			for ( int i = 0; i < eweap.Size(); i++ )
-				GiveInventoryType(eweap[i]);
-		}
-	}
-	
-	void MoveForward()
-	{
-		if ( bMoved && FRandom(0, 1) < 0.4 )
-			return;
-			
-		bMoved = true;
-		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle);
-	}
-	
-	void MoveRight()
-	{
-		if ( bMoved && FRandom(0, 1) < 0.4 )
-			return;
-			
-		bMoved = true;
-		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle + 90);
-	}
-	
-	void MoveLeft()
-	{
-		if ( bMoved && FRandom(0, 1) < 0.4 )
-			return;
-			
-		bMoved = true;
-		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle - 90);
-	}
-	
-	void MoveBackward()
-	{
-		if ( bMoved && FRandom(0, 1) < 0.4 )
-			return;
-			
-		bMoved = true;
-		BotThrust(moveType == MM_Run ? -4.5 : (moveType == MM_Crouch ? -1 : -2), angle);
-	}
-	
-	void SetMoveType(uint nmoveType)
-	{
-		moveType = nmoveType;
-		
-		if ( moveType == MM_CROUCH )
-			Height = Default.Height / 2;
-			
-		else
-			Height = Default.Height;
-	}
-	
-	void StepBackward()
-	{
-		if ( bMoved && FRandom(0, 1) < 0.4 )
-			return;
-			
-		bMoved = true;
-		BotThrust(moveType == MM_Run ? -3 : (moveType == MM_Crouch ? -0.8 : -1.35), angle);
-	}
-	
-	void BeginShoot()
-	{
-		bShooting = true;
-	}
-	
-	void EndShoot()
-	{
-		bShooting = false;
-	}
-	
-	void Jump()
-	{
-		if ( pos.z - floorZ > 1 )
-			return;
-			
-		RaiseMobj(8);
-		A_PlaySound("ztmisc/jump", CHAN_BODY);
-	}
-	
-	void A_BotPain()
-	{
-		if ( cont != null )
-			cont.PlayPain();
-	}
-	
-	void A_OnDeath()
-	{
-		if ( cont != null )
-			cont.OnDeath();
-			
-		A_DropWeapons();
-	}
-	
-	void A_DropWeapons()
-	{
-		let iter = ThinkerIterator.Create("Weapon");
-		
-		Weapon w;
-		
-		while ( w = Weapon(iter.Next()) )
-			if ( w != null && w.Owner == self )
-			{
-				Weapon w = Weapon(Spawn(w.GetClass(), Vec3Offset(0, 0, 2)));				
-				
-				if ( w != null )
-				{
-					w.vel = Vec3Offset(FRandom(-2, 2), FRandom(-2, 2), FRandom(0, 2.5), true);
-					
-					Inventory ammo1 = FindInventory(w.AmmoType1);
-					Inventory ammo2 = FindInventory(w.AmmoType2);
-					
-					w.AmmoGive1 = (ammo1 ? ammo1.Amount : 0);
-					w.AmmoGive2 = (ammo2 ? ammo2.Amount : 0);
-				}
-			}
-	}
-	
-	override void Tick()
-	{
-		Super.Tick();
-		bMoved = false;
-	}
-}
+class ZetaBotPawn : Actor
+{
+	property DefaultInv: defweap;
+	String defweap;
+	bool bMoved;
+
+	Default
+	{
+		PainChance 100;
+		Speed 1;
+		Obituary "%o wound up smarted out by %NAME%!";
+		Species "ZetaBot";
+		ZetaBotPawn.DefaultInv "";
+		
+		+SOLID
+		+SHOOTABLE
+		+DROPOFF
+		+FRIENDLY
+		+SLIDESONWALLS
+		+CANPASS
+		+CANPUSHWALLS
+		+FLOORCLIP
+		+WINDTHRUST
+		+TELESTOMP
+		+NOBLOCKMONST
+		+FRIENDLY
+		+ISMONSTER
+		+THRUSPECIES
+		+BLOCKASPLAYER
+		+CANUSEWALLS
+		+ACTIVATEMCROSS
+
+		-NOTDMATCH
+		-NOBLOCKMAP
+	}
+
+	static String GetSomeType(Actor anchor = null)
+	{
+        Array<String> rset;
+		Array<String> types;
+		Array<String> parms;
+		let btypes = CVar.FindCVar('zb_btypes').GetString();
+		btypes.Split(types, ';');
+		
+		for ( uint i = 0; i < types.Size(); i++ )
+        {
+            parms.Clear();
+            types[i].Split(parms, ':');
+            
+            if ( parms.Size() < 2 )
+                continue;
+		
+            let iter = ThinkerIterator.Create(parms[1]);
+            
+            if ( anchor != null ) anchor.A_Log(parms[0]..': '..parms[1]);
+            
+            if ( iter.Next() )
+                rset.Push(parms[0]);
+        }
+        
+        if ( anchor != null ) anchor.A_Log('Plausible types: '..rset.Size());
+		
+		if ( rset.Size() > 0 )
+            return rset[Random(0, rset.Size() - 1)];
+            
+        else
+            return "";
+	}
+	
+	enum MovementModifier
+	{
+		MM_None,
+		MM_Run,
+		MM_Crouch,
+	};
+	
+	MovementModifier moveType;
+	bool bShooting; // for visual purposes
+	ZTBotController cont;
+	const speedMod = 6;
+	
+	override String GetObituary(Actor victim, Actor inflictor, Name mod, bool playerattack)
+	{
+		if (mod == 'Telefrag')
+			return "$OB_MONTELEFRAG";
+		
+		string newObituary = Obituary;
+		
+		if ( cont != null )
+		{
+			newObituary.Replace("%ID%", ""..cont.BotID);
+			newObituary.Replace("%NAME%", cont.myName);
+		}
+			
+		else
+		{
+			newObituary.Replace("%ID%", ""..-1);
+			newObituary.Replace("%NAME%", "a ghost ZetaBot");
+		}
+		
+		return newObituary;
+	}
+	
+	void BotThrust(double maxSpeed, double angle)
+	{
+		Thrust(maxSpeed * speedMod - sqrt(vel.x * vel.x + vel.y * vel.y), angle);
+	}
+	
+	override void BeginPlay()
+	{
+		Array<String> dweap;
+		defweap.split(dweap, ",");
+		
+		for ( int i = 0; i < dweap.Size(); i++ )
+			GiveInventoryType(dweap[i]);
+			
+		Array<String> eweap;
+		let extra = CVar.GetCVar("zb_extraweap").GetString();
+			
+		if ( extra != "" )
+		{
+			extra.split(eweap, ",");	// not ";" to support Bash command
+										//line parameter setting
+			
+			for ( int i = 0; i < eweap.Size(); i++ )
+				GiveInventoryType(eweap[i]);
+		}
+	}
+	
+	void MoveForward()
+	{
+		if ( bMoved && FRandom(0, 1) < 0.4 )
+			return;
+			
+		bMoved = true;
+		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle);
+	}
+	
+	void MoveRight()
+	{
+		if ( bMoved && FRandom(0, 1) < 0.4 )
+			return;
+			
+		bMoved = true;
+		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle + 90);
+	}
+	
+	void MoveLeft()
+	{
+		if ( bMoved && FRandom(0, 1) < 0.4 )
+			return;
+			
+		bMoved = true;
+		BotThrust(moveType == MM_Run ? 5 : (moveType == MM_Crouch ? 1.2 : 2.5), angle - 90);
+	}
+	
+	void MoveBackward()
+	{
+		if ( bMoved && FRandom(0, 1) < 0.4 )
+			return;
+			
+		bMoved = true;
+		BotThrust(moveType == MM_Run ? -4.5 : (moveType == MM_Crouch ? -1 : -2), angle);
+	}
+	
+	void SetMoveType(uint nmoveType)
+	{
+		moveType = nmoveType;
+		
+		if ( moveType == MM_CROUCH )
+			Height = Default.Height / 2;
+			
+		else
+			Height = Default.Height;
+	}
+	
+	void StepBackward()
+	{
+		if ( bMoved && FRandom(0, 1) < 0.4 )
+			return;
+			
+		bMoved = true;
+		BotThrust(moveType == MM_Run ? -3 : (moveType == MM_Crouch ? -0.8 : -1.35), angle);
+	}
+	
+	void BeginShoot()
+	{
+		bShooting = true;
+	}
+	
+	void EndShoot()
+	{
+		bShooting = false;
+	}
+	
+	void Jump()
+	{
+		if ( pos.z - floorZ > 1 )
+			return;
+			
+		RaiseMobj(8);
+		A_PlaySound("ztmisc/jump", CHAN_BODY);
+	}
+	
+	void A_BotPain()
+	{
+		if ( cont != null )
+			cont.PlayPain();
+	}
+	
+	void A_OnDeath()
+	{
+		if ( cont != null )
+			cont.OnDeath();
+			
+		A_DropWeapons();
+	}
+	
+	void A_DropWeapons()
+	{
+		let iter = ThinkerIterator.Create("Weapon");
+		
+		Weapon w;
+		
+		while ( w = Weapon(iter.Next()) )
+			if ( w != null && w.Owner == self )
+			{
+				Weapon w = Weapon(Spawn(w.GetClass(), Vec3Offset(0, 0, 2)));				
+				
+				if ( w != null )
+				{
+					w.vel = Vec3Offset(FRandom(-2, 2), FRandom(-2, 2), FRandom(0, 2.5), true);
+					
+					Inventory ammo1 = FindInventory(w.AmmoType1);
+					Inventory ammo2 = FindInventory(w.AmmoType2);
+					
+					w.AmmoGive1 = (ammo1 ? ammo1.Amount : 0);
+					w.AmmoGive2 = (ammo2 ? ammo2.Amount : 0);
+				}
+			}
+	}
+	
+	override void Tick()
+	{
+		Super.Tick();
+		bMoved = false;
+	}
+}
diff --git a/ZetaCode/PawnClasses/ZetaDoom.zsc b/ZetaCode/PawnClasses/ZetaDoom.zsc
index 080b60a..108c8c6 100644
--- a/ZetaCode/PawnClasses/ZetaDoom.zsc
+++ b/ZetaCode/PawnClasses/ZetaDoom.zsc
@@ -1,104 +1,104 @@
-class ZetaDoom : ZetaBotPawn
-{
-	Default
-	{
-		Health 100;
-		Radius 16;
-		Height 56;
-		Mass 100;
-		PainChance 255;
-		ZetaBotPawn.DefaultInv "Fist,Pistol,Clip";
-	}
-
-	bool A_SpeedCheck()
-	{
-		if ( moveType == MM_CROUCH )
-		{
-			if ( bShooting )
-				return SetStateLabel("CrouchMissile");
-		
-			if ( vel.x * vel.x + vel.y * vel.y > 2 )
-				return SetStateLabel("CrouchMove");
-				
-			return SetStateLabel("CrouchStand");
-		}
-		
-		else
-		{
-			if ( bShooting )
-				return SetStateLabel("Missile");
-		
-			if ( vel.x * vel.x + vel.y * vel.y > 2 )
-				return SetStateLabel("Run");
-				
-			return SetStateLabel("Stand");
-		}
-	}
-
-	States
-	{
-		Spawn:
-			TNT1 A 1;
-			TNT1 A 0 A_SpeedCheck;
-			Stop;
-			
-		Stand:
-			PLAY A 4;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		Run:
-			PLAY ABCD 3;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-		
-		CrouchStand:
-			PLYC A 4;
-			PLYC A 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchMove:
-			PLYC ABCD 7;
-			PLYC A 0 A_SpeedCheck;
-			Stop;
-			
-		Missile:
-			PLAY F 4 Bright;
-			PLAY F 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchMissile:
-			PLYC F 4 Bright;
-			PLYC F 0 A_SpeedCheck;
-			Stop;
-			
-		Pain:
-			PLAY G 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
-			PLAY G 4 A_BotPain;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchPain:
-			PLYC G 4;
-			PLYC G 4 A_BotPain;
-			PLYC A 0 A_SpeedCheck;
-			Stop;
-			
-		Death:
-			PLAY H 10;
-			PLAY I 10 A_PlaySound("ztmisc/die");
-			PLAY J 0 A_NoBlocking;
-			PLAY J 10 A_OnDeath;
-			PLAY KLM 10;
-			PLAY N -1;
-			Stop;
-			
-		XDeath:
-			PLAY O 5;
-			PLAY P 5 A_PlaySound("ztmisc/xdie");
-			PLAY Q 0 A_NoBlocking;
-			PLAY Q 5 A_OnDeath;
-			PLAY RSTUV 5;
-			PLAY W -1;
-	}
-}
+class ZetaDoom : ZetaBotPawn
+{
+	Default
+	{
+		Health 100;
+		Radius 16;
+		Height 56;
+		Mass 100;
+		PainChance 255;
+		ZetaBotPawn.DefaultInv "Fist,Pistol,Clip";
+	}
+
+	bool A_SpeedCheck()
+	{
+		if ( moveType == MM_CROUCH )
+		{
+			if ( bShooting )
+				return SetStateLabel("CrouchMissile");
+		
+			if ( vel.x * vel.x + vel.y * vel.y > 2 )
+				return SetStateLabel("CrouchMove");
+				
+			return SetStateLabel("CrouchStand");
+		}
+		
+		else
+		{
+			if ( bShooting )
+				return SetStateLabel("Missile");
+		
+			if ( vel.x * vel.x + vel.y * vel.y > 2 )
+				return SetStateLabel("Run");
+				
+			return SetStateLabel("Stand");
+		}
+	}
+
+	States
+	{
+		Spawn:
+			TNT1 A 1;
+			TNT1 A 0 A_SpeedCheck;
+			Stop;
+			
+		Stand:
+			PLAY A 4;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		Run:
+			PLAY ABCD 3;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+		
+		CrouchStand:
+			PLYC A 4;
+			PLYC A 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchMove:
+			PLYC ABCD 7;
+			PLYC A 0 A_SpeedCheck;
+			Stop;
+			
+		Missile:
+			PLAY F 4 Bright;
+			PLAY F 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchMissile:
+			PLYC F 4 Bright;
+			PLYC F 0 A_SpeedCheck;
+			Stop;
+			
+		Pain:
+			PLAY G 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
+			PLAY G 4 A_BotPain;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchPain:
+			PLYC G 4;
+			PLYC G 4 A_BotPain;
+			PLYC A 0 A_SpeedCheck;
+			Stop;
+			
+		Death:
+			PLAY H 10;
+			PLAY I 10 A_PlaySound("ztmisc/die");
+			PLAY J 0 A_NoBlocking;
+			PLAY J 10 A_OnDeath;
+			PLAY KLM 10;
+			PLAY N -1;
+			Stop;
+			
+		XDeath:
+			PLAY O 5;
+			PLAY P 5 A_PlaySound("ztmisc/xdie");
+			PLAY Q 0 A_NoBlocking;
+			PLAY Q 5 A_OnDeath;
+			PLAY RSTUV 5;
+			PLAY W -1;
+	}
+}
diff --git a/ZetaCode/PawnClasses/ZetaSMushes.zsc b/ZetaCode/PawnClasses/ZetaSMushes.zsc
index b8c384d..86628f5 100644
--- a/ZetaCode/PawnClasses/ZetaSMushes.zsc
+++ b/ZetaCode/PawnClasses/ZetaSMushes.zsc
@@ -1,110 +1,110 @@
-class ZetaSMushes : ZetaBotPawn
-{
-	Default
-	{
-		Health 100;
-		Radius 16;
-		Height 56;
-		Mass 100;
-		PainChance 255;
-		ZetaBotPawn.DefaultInv "WyvernPaw,AIDSGun,FireBreath";
-	}
-
-	bool A_SpeedCheck()
-	{
-		if ( moveType == MM_CROUCH )
-		{
-			if ( bShooting )
-				return SetStateLabel("CrouchMissile");
-		
-			if ( vel.x * vel.x + vel.y * vel.y > 2 )
-				return SetStateLabel("CrouchMove");
-				
-			return SetStateLabel("CrouchStand");
-		}
-		
-		else
-		{
-			if ( bShooting )
-				return SetStateLabel("Missile");
-		
-			if ( vel.x * vel.x + vel.y * vel.y > 2 )
-				return SetStateLabel("Run");
-				
-			return SetStateLabel("Stand");
-		}
-	}
-
-	States
-	{
-		Spawn:
-			DRGN A 1;
-			DRGN A 0 A_SpeedCheck;
-			Stop;
-			
-		Stand:
-			DRGN A 4;
-			DRGN A 0 A_SpeedCheck;
-			Stop;
-			
-		Run:
-			DRGN ABCD 3;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-		
-		CrouchStand:
-			DRGN A 4;
-			DRGN A 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchMove:
-			DRGN ABCD 7;
-			DRGN A 0 A_SpeedCheck;
-			Stop;
-			
-		Missile:
-			DRGN H 8 Bright;
-			DRGN H 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchMissile:
-			PLYC H 8 Bright;
-			PLYC H 0 A_SpeedCheck;
-			Stop;
-			
-		Pain:
-            DRGN I 0 A_PlaySound("player/dragon/pain");
-			DRGN I 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
-			DRGN I 4 A_BotPain;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		CrouchPain:
-			DRGN I 4;
-			DRGN I 4 A_BotPain;
-			DRGN A 0 A_SpeedCheck;
-			Stop;
-			
-		Death:
-			DRGN I 6;
-			DRGN J 8 A_PlaySound("player/dragon/death");
-			DRGN K 9 A_NoBlocking;
-			DRGN L 8 A_OnDeath;
-			DRGN N -1;
-			Stop;
-			
-		XDeath:
-			TNT1 A 0 {
-				string gibClassName = "GibFX";
-				class<Actor> gibClass = gibClassName;
-				
-				if ( gibClass )
-					A_SpawnItemEx(gibClass, 0, 0, 32);
-			}
-			BDPL A 0 A_NoBlocking;
-			BDPL A 0 A_NoBlocking;
-			BDPL A 0 A_OnDeath;
-			BDPL A -1;
-            Stop;
-	}
-}
+class ZetaSMushes : ZetaBotPawn
+{
+	Default
+	{
+		Health 100;
+		Radius 16;
+		Height 56;
+		Mass 100;
+		PainChance 255;
+		ZetaBotPawn.DefaultInv "WyvernPaw,AIDSGun,FireBreath";
+	}
+
+	bool A_SpeedCheck()
+	{
+		if ( moveType == MM_CROUCH )
+		{
+			if ( bShooting )
+				return SetStateLabel("CrouchMissile");
+		
+			if ( vel.x * vel.x + vel.y * vel.y > 2 )
+				return SetStateLabel("CrouchMove");
+				
+			return SetStateLabel("CrouchStand");
+		}
+		
+		else
+		{
+			if ( bShooting )
+				return SetStateLabel("Missile");
+		
+			if ( vel.x * vel.x + vel.y * vel.y > 2 )
+				return SetStateLabel("Run");
+				
+			return SetStateLabel("Stand");
+		}
+	}
+
+	States
+	{
+		Spawn:
+			DRGN A 1;
+			DRGN A 0 A_SpeedCheck;
+			Stop;
+			
+		Stand:
+			DRGN A 4;
+			DRGN A 0 A_SpeedCheck;
+			Stop;
+			
+		Run:
+			DRGN ABCD 3;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+		
+		CrouchStand:
+			DRGN A 4;
+			DRGN A 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchMove:
+			DRGN ABCD 7;
+			DRGN A 0 A_SpeedCheck;
+			Stop;
+			
+		Missile:
+			DRGN H 8 Bright;
+			DRGN H 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchMissile:
+			PLYC H 8 Bright;
+			PLYC H 0 A_SpeedCheck;
+			Stop;
+			
+		Pain:
+            DRGN I 0 A_PlaySound("player/dragon/pain");
+			DRGN I 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
+			DRGN I 4 A_BotPain;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		CrouchPain:
+			DRGN I 4;
+			DRGN I 4 A_BotPain;
+			DRGN A 0 A_SpeedCheck;
+			Stop;
+			
+		Death:
+			DRGN I 6;
+			DRGN J 8 A_PlaySound("player/dragon/death");
+			DRGN K 9 A_NoBlocking;
+			DRGN L 8 A_OnDeath;
+			DRGN N -1;
+			Stop;
+			
+		XDeath:
+			TNT1 A 0 {
+				string gibClassName = "GibFX";
+				class<Actor> gibClass = gibClassName;
+				
+				if ( gibClass )
+					A_SpawnItemEx(gibClass, 0, 0, 32);
+			}
+			BDPL A 0 A_NoBlocking;
+			BDPL A 0 A_NoBlocking;
+			BDPL A 0 A_OnDeath;
+			BDPL A -1;
+            Stop;
+	}
+}
diff --git a/ZetaCode/PawnClasses/ZetaStrife.zsc b/ZetaCode/PawnClasses/ZetaStrife.zsc
index 21d912a..d1b59b8 100644
--- a/ZetaCode/PawnClasses/ZetaStrife.zsc
+++ b/ZetaCode/PawnClasses/ZetaStrife.zsc
@@ -1,102 +1,102 @@
-class ZetaStrife : ZetaBotPawn
-{
-	Default
-	{
-		Health 100;
-		Radius 18;
-		Height 56;
-		Mass 100;
-		PainChance 255;
-		ZetaBotPawn.DefaultInv "PunchDagger";
-	}
-
-	bool A_SpeedCheck()
-	{
-		if ( moveType == MM_CROUCH )
-            scale.y = 0.5;
-		
-		else
-            scale.y = 1;
-		
-        if ( bShooting )
-            return SetStateLabel("Missile");
-    
-        if ( vel.x * vel.x + vel.y * vel.y > 2 )
-            return SetStateLabel("Run");
-            
-        return SetStateLabel("Stand");
-	}
-
-	States
-	{
-		Spawn:
-			TNT1 A 1;
-			TNT1 A 0 A_SpeedCheck;
-			Stop;
-			
-		Stand:
-			PLAY A 4;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		Run:
-			PLAY ABCD 3;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		Missile:
-			PLAY E 12 Bright;
-			PLAY E 0 A_SpeedCheck;
-			Stop;
-			
-		Pain:
-			PLAY Q 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
-			PLAY Q 4 A_BotPain;
-			PLAY A 0 A_SpeedCheck;
-			Stop;
-			
-		Death:
-			PLAY H 3;
-			PLAY I 3 A_PlaySound("ztmisc/die");
-			PLAY J 0 A_NoBlocking;
-			PLAY J 3 A_OnDeath;
-			PLAY KLMNO 4;
-			PLAY P -1;
-			Stop;
-			
-		XDeath:
-            RGIB A 5 A_TossGib;
-            RGIB B 5 A_PlaySound("ztmisc/xdie");
-            RGIB C 0 A_OnDeath;
-            RGIB C 5 A_NoBlocking;
-            RGIB DEFG 5 A_TossGib;
-            RGIB H -1 A_TossGib;
-        Disintegrate:
-            DISR A 5 A_PlaySound("misc/disruptordeath", CHAN_VOICE);
-            DISR BC 5;
-            DISR D 5 A_NoBlocking;
-            DISR EF 5;
-            DISR GHIJ 4;
-            MEAT D -1;
-            Stop;
-        Firehands:
-            WAVE ABCD 3;
-            Loop;
-        Burn:
-            BURN A 3 Bright A_PlaySound("human/imonfire", CHAN_VOICE);
-            BURN B 3 Bright A_DropFire;
-            BURN C 3 Bright A_Wander;
-            BURN D 0 Bright A_OnDeath;
-            BURN D 3 Bright A_NoBlocking;
-            BURN E 5 Bright A_DropFire;
-            BURN FGH 5 Bright A_Wander;
-            BURN I 5 Bright A_DropFire;
-            BURN JKL 5 Bright A_Wander;
-            BURN M 5 Bright A_DropFire;
-            BURN N 5 Bright;
-            BURN OPQPQ 5 Bright;
-            BURN RSTU 7 Bright;
-            BURN V -1;
-            Stop;
-	}
-}
+class ZetaStrife : ZetaBotPawn
+{
+	Default
+	{
+		Health 100;
+		Radius 18;
+		Height 56;
+		Mass 100;
+		PainChance 255;
+		ZetaBotPawn.DefaultInv "PunchDagger";
+	}
+
+	bool A_SpeedCheck()
+	{
+		if ( moveType == MM_CROUCH )
+            scale.y = 0.5;
+		
+		else
+            scale.y = 1;
+		
+        if ( bShooting )
+            return SetStateLabel("Missile");
+    
+        if ( vel.x * vel.x + vel.y * vel.y > 2 )
+            return SetStateLabel("Run");
+            
+        return SetStateLabel("Stand");
+	}
+
+	States
+	{
+		Spawn:
+			TNT1 A 1;
+			TNT1 A 0 A_SpeedCheck;
+			Stop;
+			
+		Stand:
+			PLAY A 4;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		Run:
+			PLAY ABCD 3;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		Missile:
+			PLAY E 12 Bright;
+			PLAY E 0 A_SpeedCheck;
+			Stop;
+			
+		Pain:
+			PLAY Q 4 A_JumpIf(moveType == MM_CROUCH, "CrouchPain");
+			PLAY Q 4 A_BotPain;
+			PLAY A 0 A_SpeedCheck;
+			Stop;
+			
+		Death:
+			PLAY H 3;
+			PLAY I 3 A_PlaySound("ztmisc/die");
+			PLAY J 0 A_NoBlocking;
+			PLAY J 3 A_OnDeath;
+			PLAY KLMNO 4;
+			PLAY P -1;
+			Stop;
+			
+		XDeath:
+            RGIB A 5 A_TossGib;
+            RGIB B 5 A_PlaySound("ztmisc/xdie");
+            RGIB C 0 A_OnDeath;
+            RGIB C 5 A_NoBlocking;
+            RGIB DEFG 5 A_TossGib;
+            RGIB H -1 A_TossGib;
+        Disintegrate:
+            DISR A 5 A_PlaySound("misc/disruptordeath", CHAN_VOICE);
+            DISR BC 5;
+            DISR D 5 A_NoBlocking;
+            DISR EF 5;
+            DISR GHIJ 4;
+            MEAT D -1;
+            Stop;
+        Firehands:
+            WAVE ABCD 3;
+            Loop;
+        Burn:
+            BURN A 3 Bright A_PlaySound("human/imonfire", CHAN_VOICE);
+            BURN B 3 Bright A_DropFire;
+            BURN C 3 Bright A_Wander;
+            BURN D 0 Bright A_OnDeath;
+            BURN D 3 Bright A_NoBlocking;
+            BURN E 5 Bright A_DropFire;
+            BURN FGH 5 Bright A_Wander;
+            BURN I 5 Bright A_DropFire;
+            BURN JKL 5 Bright A_Wander;
+            BURN M 5 Bright A_DropFire;
+            BURN N 5 Bright;
+            BURN OPQPQ 5 Bright;
+            BURN RSTU 7 Bright;
+            BURN V -1;
+            Stop;
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc b/ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc
index 4301d9b..87230b5 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc
@@ -1,29 +1,29 @@
-class ZetaBFG : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 11428571;
-		ZetaWeapon.MinAmmo 40;
-		ZetaWeapon.AmmoType "Cell";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "BFG9000";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 300 * target.Health / (shooter.Distance2D(target));
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("BFGBall", shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
-	}
+class ZetaBFG : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 11428571;
+		ZetaWeapon.MinAmmo 40;
+		ZetaWeapon.AmmoType "Cell";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "BFG9000";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 300 * target.Health / (shooter.Distance2D(target));
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("BFGBall", shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc b/ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc
index 8396f28..a62c2bd 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc
@@ -1,29 +1,29 @@
-class ZetaChaingun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 1142857;
-		ZetaWeapon.MinAmmo 1;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Chaingun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target) / 1.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, random(1, 3), 5.6, 0);
-		shooter.A_PlaySound("weapons/chngun", CHAN_WEAPON);
-	}
+class ZetaChaingun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 1142857;
+		ZetaWeapon.MinAmmo 1;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Chaingun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target) / 1.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, random(1, 3), 5.6, 0);
+		shooter.A_PlaySound("weapons/chngun", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc b/ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc
index fa47eab..fd09b90 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc
@@ -1,33 +1,33 @@
-class ZetaChainsaw : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 2285714;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Chainsaw";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return ((shooter.Distance2D(target) < shooter.Radius + target.Radius + 32) ? 800 : 0);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.LineAttack(shooter.angle, 32, 0, 2 * Random(1, 9), "Punch", "BulletPuff", 0);
-		shooter.A_PlaySound("weapons/sawfull", CHAN_WEAPON);		
-	}
-	
-	override bool IsMelee()
-	{
-		return true;
-	}
+class ZetaChainsaw : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 2285714;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Chainsaw";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return ((shooter.Distance2D(target) < shooter.Radius + target.Radius + 32) ? 800 : 0);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.LineAttack(shooter.angle, 32, 0, 2 * Random(1, 9), "Punch", "BulletPuff", 0);
+		shooter.A_PlaySound("weapons/sawfull", CHAN_WEAPON);		
+	}
+	
+	override bool IsMelee()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaFist.zsc b/ZetaCode/WeaponSupport/Doom/ZetaFist.zsc
index c27d441..3a6edcd 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaFist.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaFist.zsc
@@ -1,32 +1,32 @@
-class ZetaFist : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 5142857;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Fist";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return -50;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.LineAttack(shooter.angle, 32, 0, 20 * Random(1, 8), "Punch", "BulletPuff", 0);
-	}
-	
-	override bool IsMelee()
-	{
-		return true;
-	}
+class ZetaFist : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 5142857;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Fist";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return -50;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.LineAttack(shooter.angle, 32, 0, 20 * Random(1, 8), "Punch", "BulletPuff", 0);
+	}
+	
+	override bool IsMelee()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaPR.zsc b/ZetaCode/WeaponSupport/Doom/ZetaPR.zsc
index bee24b2..b0d5347 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaPR.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaPR.zsc
@@ -1,29 +1,29 @@
-class ZetaPR : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 857142;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "Cell";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "PlasmaRifle";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 1200 / sqrt(shooter.Distance3D(target)) * 3;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("PlasmaBall", shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
-	}
+class ZetaPR : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 857142;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "Cell";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "PlasmaRifle";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 1200 / sqrt(shooter.Distance3D(target)) * 3;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("PlasmaBall", shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc b/ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc
index da68368..51d5d73 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc
@@ -1,29 +1,29 @@
-class ZetaPistol : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 4000000;
-		ZetaWeapon.MinAmmo 1;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Pistol";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return sqrt(shooter.Distance3D(target)) / 5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, random(1, 3), 5.6, 0);
-		shooter.A_PlaySound("weapons/pistol", CHAN_WEAPON);
-	}
+class ZetaPistol : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 4000000;
+		ZetaWeapon.MinAmmo 1;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Pistol";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return sqrt(shooter.Distance3D(target)) / 5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, random(1, 3), 5.6, 0);
+		shooter.A_PlaySound("weapons/pistol", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaRL.zsc b/ZetaCode/WeaponSupport/Doom/ZetaRL.zsc
index cb572a6..00d5873 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaRL.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaRL.zsc
@@ -1,32 +1,32 @@
-class ZetaRL : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 5714285;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "RocketAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "RocketLauncher";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		if ( shooter.Distance3D(target) < 150 )
-			return 300 - shooter.Distance3D(target) * 2;
-	
-		return 900 / sqrt(shooter.Distance2D(target)) * 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("Rocket", shooter.angle, (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
-	}
+class ZetaRL : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 5714285;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "RocketAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "RocketLauncher";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		if ( shooter.Distance3D(target) < 150 )
+			return 300 - shooter.Distance3D(target) * 2;
+	
+		return 900 / sqrt(shooter.Distance2D(target)) * 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("Rocket", shooter.angle, (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc b/ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc
index 01b1b21..dc496c0 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc
@@ -1,30 +1,30 @@
-class ZetaSSG : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 15428571;
-		ZetaWeapon.MinAmmo 2;
-		ZetaWeapon.AmmoType "Shell";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "SuperShotgun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 2000 / sqrt(shooter.Distance2D(target) * 1.5);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireBullets(shooter, "Gold", target, random(1, 3), 20, 11.2, 7.1);
-		shooter.A_PlaySound("weapons/sshotf", CHAN_WEAPON);
-	}
+class ZetaSSG : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 15428571;
+		ZetaWeapon.MinAmmo 2;
+		ZetaWeapon.AmmoType "Shell";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "SuperShotgun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 2000 / sqrt(shooter.Distance2D(target) * 1.5);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireBullets(shooter, "Gold", target, random(1, 3), 20, 11.2, 7.1);
+		shooter.A_PlaySound("weapons/sshotf", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc b/ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc
index 4b660ee..62fdc5f 100644
--- a/ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc
+++ b/ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc
@@ -1,30 +1,30 @@
-class ZetaShotgun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 6857142;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "Shell";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Shotgun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 900 / sqrt(shooter.Distance2D(target) / 2);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireBullets(shooter, "Gold", target, random(1, 3), 7, 5.6, 0);
-		shooter.A_PlaySound("weapons/shotgf", CHAN_WEAPON);
-	}
+class ZetaShotgun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 6857142;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "Shell";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Shotgun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 900 / sqrt(shooter.Distance2D(target) / 2);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireBullets(shooter, "Gold", target, random(1, 3), 7, 5.6, 0);
+		shooter.A_PlaySound("weapons/shotgf", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc b/ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc
index 450bbee..b5653cf 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc
@@ -1,40 +1,40 @@
-class ClawAttack : Actor
-{
-    Actor shooter;
-    Actor target;
-    
-    int repeat, interval, curint, mindmg, maxdmg;
-
-    void Attack(int rep, int intr, int mind, int maxd)
-    {
-        repeat = rep;
-        interval = intr;
-        mindmg = mind;
-        maxdmg = maxd;
-        SetState(ResolveState('Attack'));
-    }
-    
-    States
-    {
-        Spawn:
-            TNT1 A -1;
-            Stop;
-            
-        Attack:
-            TNT1 A 0 {
-                shooter.LineAttack(shooter.angle, 32, 0, FRandom(mindmg, maxdmg), "Punch", "");
-                curint = interval;
-            }
-            TNT1 A 1 {
-                if ( curint-- == 0 )
-                {
-                    if ( repeat-- > 0 )
-                        SetState(ResolveState('Attack'));
-                        
-                    else
-                        Destroy();
-                }
-            }
-            Goto Attack + 1;
-    }
+class ClawAttack : Actor
+{
+    Actor shooter;
+    Actor target;
+    
+    int repeat, interval, curint, mindmg, maxdmg;
+
+    void Attack(int rep, int intr, int mind, int maxd)
+    {
+        repeat = rep;
+        interval = intr;
+        mindmg = mind;
+        maxdmg = maxd;
+        SetState(ResolveState('Attack'));
+    }
+    
+    States
+    {
+        Spawn:
+            TNT1 A -1;
+            Stop;
+            
+        Attack:
+            TNT1 A 0 {
+                shooter.LineAttack(shooter.angle, 32, 0, FRandom(mindmg, maxdmg), "Punch", "");
+                curint = interval;
+            }
+            TNT1 A 1 {
+                if ( curint-- == 0 )
+                {
+                    if ( repeat-- > 0 )
+                        SetState(ResolveState('Attack'));
+                        
+                    else
+                        Destroy();
+                }
+            }
+            Goto Attack + 1;
+    }
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc
index 708263e..dfefeb4 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc
@@ -1,30 +1,30 @@
-class ZetaAK64 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 1142857;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "ColtAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "AK64";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 800 - shooter.Distance2D(target);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, 11, 3, 2, "SMPuff");
-		shooter.A_PlaySound("ak64/shoot", CHAN_WEAPON);
-	}
+class ZetaAK64 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 1142857;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "ColtAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "AK64";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 800 - shooter.Distance2D(target);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, 11, 3, 2, "SMPuff");
+		shooter.A_PlaySound("ak64/shoot", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc
index 338fef2..e44ccd9 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc
@@ -1,64 +1,64 @@
-#include "ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc"
-
-class ZetaClaw : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 3142857;
-		ZetaWeapon.AltFireInterval 3142857;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "WyvernPaw";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		// return true;
-		return false; // not ready to do infection mechanism in the ZetaBot yet.
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-        if ( shooter.Distance3D(target) > 192 )
-            return -500;
-    
-		return (25 + shooter.Radius + target.Radius) - shooter.Distance3D(target);
-	}
-    
-    int CountInv(Actor other, string inv, bool subclass = false)
-    {
-        Inventory inv = Inventory(other.FindInventory(inv, subclass));
-        
-        if ( inv == null )
-            return 0;
-            
-        return inv.amount;
-    }
-	
-	override double AltRateSelf(Actor shooter, Actor target)
-	{
-        if ( shooter.Distance3D(target) > 192 )
-            return -500;
-    
-		return -CountInv(target, "Immune") * shooter.Distance3D(target) / 96 + 45;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ClawAttack cattack = ClawAttack(Spawn('ClawAttack'));
-        
-        if ( cattack == null )
-            return;
-            
-        cattack.shooter = shooter;
-        cattack.target = target;
-        cattack.Attack(5, 1, 3, 7);
-	}
-	
-	override bool IsMelee()
-	{
-		return true;
-	}
+#include "ZetaCode/WeaponSupport/SentientMushes/ClawAttack.zsc"
+
+class ZetaClaw : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 3142857;
+		ZetaWeapon.AltFireInterval 3142857;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "WyvernPaw";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		// return true;
+		return false; // not ready to do infection mechanism in the ZetaBot yet.
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+        if ( shooter.Distance3D(target) > 192 )
+            return -500;
+    
+		return (25 + shooter.Radius + target.Radius) - shooter.Distance3D(target);
+	}
+    
+    int CountInv(Actor other, string inv, bool subclass = false)
+    {
+        Inventory inv = Inventory(other.FindInventory(inv, subclass));
+        
+        if ( inv == null )
+            return 0;
+            
+        return inv.amount;
+    }
+	
+	override double AltRateSelf(Actor shooter, Actor target)
+	{
+        if ( shooter.Distance3D(target) > 192 )
+            return -500;
+    
+		return -CountInv(target, "Immune") * shooter.Distance3D(target) / 96 + 45;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ClawAttack cattack = ClawAttack(Spawn('ClawAttack'));
+        
+        if ( cattack == null )
+            return;
+            
+        cattack.shooter = shooter;
+        cattack.target = target;
+        cattack.Attack(5, 1, 3, 7);
+	}
+	
+	override bool IsMelee()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc
index 556e543..dd7faee 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc
@@ -1,30 +1,30 @@
-class ZetaColt : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 2857142;
-		ZetaWeapon.MinAmmo 1;
-        ZetaWeapon.AmmoType "ColtAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "HardColt";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return sqrt(shooter.Distance3D(target)) / 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, frandom(8, 15), 2, 2, "SMPuff");
-		shooter.A_PlaySound("weapons/hc/shoot", CHAN_WEAPON);
-	}
+class ZetaColt : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 2857142;
+		ZetaWeapon.MinAmmo 1;
+        ZetaWeapon.AmmoType "ColtAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "HardColt";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return sqrt(shooter.Distance3D(target)) / 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, frandom(8, 15), 2, 2, "SMPuff");
+		shooter.A_PlaySound("weapons/hc/shoot", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaFireBallista.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaFireBallista.zsc
index 5343f05..d9d0a24 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaFireBallista.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaFireBallista.zsc
@@ -1,47 +1,47 @@
-class Minigun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 1142857;
-		ZetaWeapon.AltFireInterval 4571428;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "BallistaAmmo";
-		ZetaWeapon.AltMinAmmo 3;
-		ZetaWeapon.AltAmmoType "BallistaAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "FireBallista";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return true;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target) + 150;
-	}
-	
-	override double AltRateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target) * 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("BallistaMissile", shooter.angle, (target.pos.z - shooter.pos.z) * 15 / target.Distance2D(shooter));
-		shooter.A_PlaySound("fireballista/shoot");
-	}
-    
-	override void AltFire(Actor shooter, Actor target)
-	{
-        for ( int _ = 0; _ < 11; _++ )
-            shooter.SpawnMissileAngle("DrunkBallistaMissile", shooter.angle + frandom(-3, 3), (target.pos.z - shooter.pos.z) * 15 / target.Distance2D(shooter));
-            
-		shooter.A_PlaySound("fireballista/shoot");
-	}
-    
+class Minigun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 1142857;
+		ZetaWeapon.AltFireInterval 4571428;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "BallistaAmmo";
+		ZetaWeapon.AltMinAmmo 3;
+		ZetaWeapon.AltAmmoType "BallistaAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "FireBallista";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return true;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target) + 150;
+	}
+	
+	override double AltRateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target) * 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("BallistaMissile", shooter.angle, (target.pos.z - shooter.pos.z) * 15 / target.Distance2D(shooter));
+		shooter.A_PlaySound("fireballista/shoot");
+	}
+    
+	override void AltFire(Actor shooter, Actor target)
+	{
+        for ( int _ = 0; _ < 11; _++ )
+            shooter.SpawnMissileAngle("DrunkBallistaMissile", shooter.angle + frandom(-3, 3), (target.pos.z - shooter.pos.z) * 15 / target.Distance2D(shooter));
+            
+		shooter.A_PlaySound("fireballista/shoot");
+	}
+    
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc
index 39f7a4b..993e42c 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc
@@ -1,31 +1,31 @@
-class ZetaHeavyMinigun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 1142857;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "ColtAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "HeavyMinigun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target) / 1.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, frandom(12, 20), 5, 3);
-		shooter.A_PlaySound("ak64/shoot", CHAN_WEAPON);
-        shooter.A_Recoil(0.6);
-	}
+class ZetaHeavyMinigun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 1142857;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "ColtAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "HeavyMinigun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target) / 1.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, frandom(12, 20), 5, 3);
+		shooter.A_PlaySound("ak64/shoot", CHAN_WEAPON);
+        shooter.A_Recoil(0.6);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc
index c409d79..bbd65ab 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc
@@ -1,43 +1,43 @@
-class ZetaKnife : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 4857142;
-		ZetaWeapon.AltFireInterval 3142857;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "IronKnife";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return true;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 125;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.LineAttack(shooter.angle, 32, 0, Random(54, 108), "Punch", "");
-	}
-	
-	override double AltRateSelf(Actor shooter, Actor target)
-	{
-		return 125;
-	}
-	
-	override void AltFire(Actor shooter, Actor target)
-	{
-		shooter.LineAttack(shooter.angle, 32, 0, Random(10, 22), "Punch", "");
-	}
-	
-	override bool IsMelee()
-	{
-		return true;
-	}
+class ZetaKnife : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 4857142;
+		ZetaWeapon.AltFireInterval 3142857;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "IronKnife";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return true;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 125;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.LineAttack(shooter.angle, 32, 0, Random(54, 108), "Punch", "");
+	}
+	
+	override double AltRateSelf(Actor shooter, Actor target)
+	{
+		return 125;
+	}
+	
+	override void AltFire(Actor shooter, Actor target)
+	{
+		shooter.LineAttack(shooter.angle, 32, 0, Random(10, 22), "Punch", "");
+	}
+	
+	override bool IsMelee()
+	{
+		return true;
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc
index fb4882f..96771a2 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc
@@ -1,45 +1,45 @@
-class ZetaMinigun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 1714285;
-		ZetaWeapon.AltFireInterval 6285714;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "ColtAmmo";
-		ZetaWeapon.AltMinAmmo 2;
-		ZetaWeapon.AltAmmoType "ColtAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "Minigun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return true;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target) / 1.5 + 90;
-	}
-	
-	override double AltRateSelf(Actor shooter, Actor target)
-	{
-		return shooter.Distance2D(target);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireBullets(shooter, "Gold", target, 9, 2, 2, 2, "SMPuff");
-		shooter.A_PlaySound("minigun/fire", CHAN_WEAPON, 0.5);
-	}
-    
-	override void AltFire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireBullets(shooter, "Gold", target, 12, 4, 2, 2, "SMPuff");
-		shooter.A_PlaySound("minigun/fire", CHAN_WEAPON);
-	}
-    
+class ZetaMinigun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 1714285;
+		ZetaWeapon.AltFireInterval 6285714;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "ColtAmmo";
+		ZetaWeapon.AltMinAmmo 2;
+		ZetaWeapon.AltAmmoType "ColtAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "Minigun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return true;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target) / 1.5 + 90;
+	}
+	
+	override double AltRateSelf(Actor shooter, Actor target)
+	{
+		return shooter.Distance2D(target);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireBullets(shooter, "Gold", target, 9, 2, 2, 2, "SMPuff");
+		shooter.A_PlaySound("minigun/fire", CHAN_WEAPON, 0.5);
+	}
+    
+	override void AltFire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireBullets(shooter, "Gold", target, 12, 4, 2, 2, "SMPuff");
+		shooter.A_PlaySound("minigun/fire", CHAN_WEAPON);
+	}
+    
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc
index 2d9e98e..1bc48eb 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc
@@ -1,59 +1,59 @@
-class ZetaRocketeer : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 5714285;
-		ZetaWeapon.AltFireInterval 5714285;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AltMinAmmo 1;
-		ZetaWeapon.AmmoType "RocketAmmo";
-		ZetaWeapon.AltAmmoType "RocketAmmo";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "Rocketeer";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return true;
-	}
-    
-	override double RateSelf(Actor shooter, Actor target) // Rocketeer grenade
-	{
-		return sqrt(shooter.Distance2D(target)) * 2 - 150;
-	}
-	
-	override double AltRateSelf(Actor shooter, Actor target) // Rocketeer cluster bomb
-	{
-		if ( shooter.Distance3D(target) < 150 )
-			return 300 - shooter.Distance3D(target) * 2;
-	
-		return 1000 / sqrt(shooter.Distance2D(target)) * 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-        let ggs = "RRGrenade";
-        Class<Actor> gg = ggs;
-        
-        if ( gg )
-            shooter.SpawnMissileAngle(gg, shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
-	}
-    
-    override void AltFire(Actor shooter, Actor target)
-    {
-        let cbs = "RRClusterBomb";
-        let rfs = "RocketFog";
-        
-        Class<Actor> cb = cbs;
-        Class<Actor> rf = rfs;
-    
-        if ( cb && rf )
-        {
-            shooter.SpawnMissileAngle(cb, shooter.angle, (target.pos.z - shooter.pos.z) * 19 / target.Distance2D(shooter));
-            shooter.SpawnMissileAngle(rf, shooter.angle, shooter.pitch);
-        }
-    }
+class ZetaRocketeer : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 5714285;
+		ZetaWeapon.AltFireInterval 5714285;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AltMinAmmo 1;
+		ZetaWeapon.AmmoType "RocketAmmo";
+		ZetaWeapon.AltAmmoType "RocketAmmo";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "Rocketeer";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return true;
+	}
+    
+	override double RateSelf(Actor shooter, Actor target) // Rocketeer grenade
+	{
+		return sqrt(shooter.Distance2D(target)) * 2 - 150;
+	}
+	
+	override double AltRateSelf(Actor shooter, Actor target) // Rocketeer cluster bomb
+	{
+		if ( shooter.Distance3D(target) < 150 )
+			return 300 - shooter.Distance3D(target) * 2;
+	
+		return 1000 / sqrt(shooter.Distance2D(target)) * 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+        let ggs = "RRGrenade";
+        Class<Actor> gg = ggs;
+        
+        if ( gg )
+            shooter.SpawnMissileAngle(gg, shooter.angle, (target.pos.z - shooter.pos.z) * 25 / target.Distance2D(shooter));
+	}
+    
+    override void AltFire(Actor shooter, Actor target)
+    {
+        let cbs = "RRClusterBomb";
+        let rfs = "RocketFog";
+        
+        Class<Actor> cb = cbs;
+        Class<Actor> rf = rfs;
+    
+        if ( cb && rf )
+        {
+            shooter.SpawnMissileAngle(cb, shooter.angle, (target.pos.z - shooter.pos.z) * 19 / target.Distance2D(shooter));
+            shooter.SpawnMissileAngle(rf, shooter.angle, shooter.pitch);
+        }
+    }
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc
index f802e4a..cfc188f 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc
@@ -1,39 +1,39 @@
-class ZetaRockox : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 3714285;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "RockoxClip";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "Rockox";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		if ( shooter.Distance3D(target) < 250 )
-			return 180 - shooter.Distance3D(target) * 2.5;
-	
-		return 1250 / sqrt(shooter.Distance2D(target)) * 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-        String rrs = "RockoxRocket";
-        Class<Actor> rr = rrs;
-    
-        if ( rr )
-        {
-            shooter.SpawnMissileAngle(rr, shooter.angle, (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
-            shooter.A_PlaySound("rockox/fire", CHAN_WEAPON);
-        }
-	}
+class ZetaRockox : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 3714285;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "RockoxClip";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "Rockox";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		if ( shooter.Distance3D(target) < 250 )
+			return 180 - shooter.Distance3D(target) * 2.5;
+	
+		return 1250 / sqrt(shooter.Distance2D(target)) * 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+        String rrs = "RockoxRocket";
+        Class<Actor> rr = rrs;
+    
+        if ( rr )
+        {
+            shooter.SpawnMissileAngle(rr, shooter.angle, (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
+            shooter.A_PlaySound("rockox/fire", CHAN_WEAPON);
+        }
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc b/ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc
index bdaf1a4..e9a73b6 100644
--- a/ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc
+++ b/ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc
@@ -1,31 +1,31 @@
-class ZetaSMShotgun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 12000000;
-		ZetaWeapon.MinAmmo 1;
-        ZetaWeapon.AmmoType "ShotRifleShellClip";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClassName() == "ShotRifle";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 650 / sqrt(shooter.Distance3D(target) / 2);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireBullets(shooter, "Gold", target, random(2, 4), 20, 12, 10, "SMPuff");
-		shooter.A_PlaySound("weapons/sr/shoot", CHAN_WEAPON);
-        shooter.A_PlaySound("weapons/sr/reload", CHAN_WEAPON);
-	}
+class ZetaSMShotgun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 12000000;
+		ZetaWeapon.MinAmmo 1;
+        ZetaWeapon.AmmoType "ShotRifleShellClip";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClassName() == "ShotRifle";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 650 / sqrt(shooter.Distance3D(target) / 2);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireBullets(shooter, "Gold", target, random(2, 4), 20, 12, 10, "SMPuff");
+		shooter.A_PlaySound("weapons/sr/shoot", CHAN_WEAPON);
+        shooter.A_PlaySound("weapons/sr/reload", CHAN_WEAPON);
+	}
 }
\ No newline at end of file
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc b/ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc
index 3b11b4a..b93cc28 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc
@@ -1,31 +1,31 @@
-class ZetaAssaultGun : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 857142;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "ClipOfBullets";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "AssaultGun";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 600 - shooter.Distance2D(target) / 1.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		ZetaBullet.FireABullet(shooter, "Gold", target, random[StrifeGun]() % 3 + 1, abs(Random2[StrifeGun]() * (22.5 / 256) * AccuracyFactor()), 0, "StrifePuff");
-		
-		shooter.A_PlaySound("weapons/assaultgun", CHAN_WEAPON);
-	}
-}
+class ZetaAssaultGun : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 857142;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "ClipOfBullets";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "AssaultGun";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 600 - shooter.Distance2D(target) / 1.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		ZetaBullet.FireABullet(shooter, "Gold", target, random[StrifeGun]() % 3 + 1, abs(Random2[StrifeGun]() * (22.5 / 256) * AccuracyFactor()), 0, "StrifePuff");
+		
+		shooter.A_PlaySound("weapons/assaultgun", CHAN_WEAPON);
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc b/ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc
index 7ca5290..9d0a625 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc
@@ -1,42 +1,42 @@
-class ZetaCrossbow1 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 9142857;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "ElectricBolts";
-	}
-	
-	double pow(double a, uint b)
-	{
-        if ( b == 0 )
-            return 1;
-            
-        else
-            return a * pow(a, b - 1);
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "StrifeCrossbow";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-        if ( target.bNOBLOOD )
-            return 800 / sqrt(shooter.Distance3D(target) / 2);
-            
-        return 300 / sqrt(shooter.Distance3D(target) / 2);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("ElectricBolt", ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)), shooter.angle), tan(ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)))) + (target.pos.z - shooter.pos.z) * 30 / target.Distance2D(shooter));
-		shooter.A_PlaySound("weapons/xbowshoot", CHAN_WEAPON);
-	}
-}
+class ZetaCrossbow1 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 9142857;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "ElectricBolts";
+	}
+	
+	double pow(double a, uint b)
+	{
+        if ( b == 0 )
+            return 1;
+            
+        else
+            return a * pow(a, b - 1);
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "StrifeCrossbow";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+        if ( target.bNOBLOOD )
+            return 800 / sqrt(shooter.Distance3D(target) / 2);
+            
+        return 300 / sqrt(shooter.Distance3D(target) / 2);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("ElectricBolt", ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)), shooter.angle), tan(ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)))) + (target.pos.z - shooter.pos.z) * 30 / target.Distance2D(shooter));
+		shooter.A_PlaySound("weapons/xbowshoot", CHAN_WEAPON);
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc b/ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc
index d5638f3..80856f1 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc
@@ -1,42 +1,42 @@
-class ZetaCrossbow2 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 9142857;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "PoisonBolts";
-	}
-	
-	double pow(double a, uint b)
-	{
-        if ( b == 0 )
-            return 1;
-            
-        else
-            return a * pow(a, b - 1);
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "StrifeCrossbow2";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		if ( target.bNOBLOOD || target.bBOSS )
-            return 80 / sqrt(shooter.Distance3D(target) / 4);
-            
-        return 900 / sqrt(shooter.Distance3D(target) / 4);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("PoisonBolt", ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)), shooter.angle), tan(ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)))) + (target.pos.z - shooter.pos.z) * 30 / target.Distance2D(shooter));
-		shooter.A_PlaySound("weapons/xbowshoot", CHAN_WEAPON);
-	}
-}
+class ZetaCrossbow2 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 9142857;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "PoisonBolts";
+	}
+	
+	double pow(double a, uint b)
+	{
+        if ( b == 0 )
+            return 1;
+            
+        else
+            return a * pow(a, b - 1);
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "StrifeCrossbow2";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		if ( target.bNOBLOOD || target.bBOSS )
+            return 80 / sqrt(shooter.Distance3D(target) / 4);
+            
+        return 900 / sqrt(shooter.Distance3D(target) / 4);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("PoisonBolt", ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)), shooter.angle), tan(ZetaWeapon.RandomAngle(5.625 / pow(2, floor(shooter.accuracy / 2)))) + (target.pos.z - shooter.pos.z) * 30 / target.Distance2D(shooter));
+		shooter.A_PlaySound("weapons/xbowshoot", CHAN_WEAPON);
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc b/ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc
index cdd3aa4..27246a3 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc
@@ -1,38 +1,38 @@
-class ZetaDagger : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 4857142;
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "PunchDagger";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 10;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		let power = min(shooter.stamina / 10, 10);
-	
-		if ( shooter.LineAttack(ZetaWeapon.RandomAngle(5.625, shooter.angle), 32, 0, (power + 2) * Random(0, power * 7), "Dagger", "StrifeSpark", 0) != null )
-			shooter.A_PlaySound("misc/swish");
-			
-		else
-			shooter.A_PlaySound("misc/meathit");
-	}
-	
-	override bool IsMelee()
-	{
-		return true;
-	}
-}
+class ZetaDagger : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 4857142;
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "PunchDagger";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 10;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		let power = min(shooter.stamina / 10, 10);
+	
+		if ( shooter.LineAttack(ZetaWeapon.RandomAngle(5.625, shooter.angle), 32, 0, (power + 2) * Random(0, power * 7), "Dagger", "StrifeSpark", 0) != null )
+			shooter.A_PlaySound("misc/swish");
+			
+		else
+			shooter.A_PlaySound("misc/meathit");
+	}
+	
+	override bool IsMelee()
+	{
+		return true;
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc b/ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc
index 4422337..5922e52 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc
@@ -1,34 +1,34 @@
-class ZetaFlameThrower : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 571428;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "EnergyPod";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "FlameThrower";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 1000 - shooter.Distance2D(target) * 1.75;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-        shooter.angle += Random2[Flamethrower]() * (5.625/256.);
-		
-		FlameMissile f = FlameMissile(shooter.SpawnMissile(target, "FlameMissile", shooter));
-		
-		if ( f != null )
-            f.vel.z += 5; // based on gzdoom.pk3 ZScript
-	}
-}
+class ZetaFlameThrower : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 571428;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "EnergyPod";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "FlameThrower";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 1000 - shooter.Distance2D(target) * 1.75;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+        shooter.angle += Random2[Flamethrower]() * (5.625/256.);
+		
+		FlameMissile f = FlameMissile(shooter.SpawnMissile(target, "FlameMissile", shooter));
+		
+		if ( f != null )
+            f.vel.z += 5; // based on gzdoom.pk3 ZScript
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc b/ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc
index 06d82b2..1f87f85 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc
@@ -1,41 +1,41 @@
-class ZetaGrenade1 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 8571428;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "HEGrenadeRounds";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "StrifeGrenadeLauncher";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 700 - shooter.Distance3D(target) / 1.25;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		HEGrenade gr = HEGrenade(shooter.SpawnMissileAngle("HEGrenade", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(shooter.pitch + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10))));
-		
-		if ( gr != null )
-		{
-            uint angoffs = (Random(0, 1) * 2 - 1) * 90;
-		
-            gr.vel.z = (-clamp(tan(shooter.pitch), -5, 5)) * gr.Speed + 8;
-            
-            Vector2 offset = shooter.AngleToVector(shooter.angle, shooter.radius + gr.radius);
-			double an = shooter.angle + angoffs;
-			offset += shooter.AngleToVector(an, 15);
-			gr.SetOrigin(gr.Vec3Offset(offset.X, offset.Y, 0.), false);
-		}
-	}
-}
+class ZetaGrenade1 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 8571428;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "HEGrenadeRounds";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "StrifeGrenadeLauncher";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 700 - shooter.Distance3D(target) / 1.25;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		HEGrenade gr = HEGrenade(shooter.SpawnMissileAngle("HEGrenade", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(shooter.pitch + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10))));
+		
+		if ( gr != null )
+		{
+            uint angoffs = (Random(0, 1) * 2 - 1) * 90;
+		
+            gr.vel.z = (-clamp(tan(shooter.pitch), -5, 5)) * gr.Speed + 8;
+            
+            Vector2 offset = shooter.AngleToVector(shooter.angle, shooter.radius + gr.radius);
+			double an = shooter.angle + angoffs;
+			offset += shooter.AngleToVector(an, 15);
+			gr.SetOrigin(gr.Vec3Offset(offset.X, offset.Y, 0.), false);
+		}
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc b/ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc
index 5e6b32a..b5a33af 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc
@@ -1,41 +1,41 @@
-class ZetaGrenade2 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 8571428;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "HEGrenadeRounds";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "StrifeGrenadeLauncher2";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		return 700 - shooter.Distance3D(target) / 1.25;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		HEGrenade gr = HEGrenade(shooter.SpawnMissileAngle("PhosphorousGrenade", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(shooter.pitch + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10))));
-		
-		if ( gr != null )
-		{
-            uint angoffs = (Random(0, 1) * 2 - 1) * 90;
-		
-            gr.vel.z = (-clamp(tan(shooter.pitch), -5, 5)) * gr.Speed + 8;
-            
-            Vector2 offset = shooter.AngleToVector(shooter.angle, shooter.radius + gr.radius);
-			double an = shooter.angle + angoffs;
-			offset += shooter.AngleToVector(an, 15);
-			gr.SetOrigin(gr.Vec3Offset(offset.X, offset.Y, 0.), false);
-		}
-	}
-}
+class ZetaGrenade2 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 8571428;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "HEGrenadeRounds";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "StrifeGrenadeLauncher2";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		return 700 - shooter.Distance3D(target) / 1.25;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		HEGrenade gr = HEGrenade(shooter.SpawnMissileAngle("PhosphorousGrenade", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(shooter.pitch + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10))));
+		
+		if ( gr != null )
+		{
+            uint angoffs = (Random(0, 1) * 2 - 1) * 90;
+		
+            gr.vel.z = (-clamp(tan(shooter.pitch), -5, 5)) * gr.Speed + 8;
+            
+            Vector2 offset = shooter.AngleToVector(shooter.angle, shooter.radius + gr.radius);
+			double an = shooter.angle + angoffs;
+			offset += shooter.AngleToVector(an, 15);
+			gr.SetOrigin(gr.Vec3Offset(offset.X, offset.Y, 0.), false);
+		}
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc b/ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc
index ac6fb14..a14f171 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc
@@ -1,49 +1,49 @@
-class ZetaMauler1 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 9428571;
-		ZetaWeapon.MinAmmo 20;
-		ZetaWeapon.AmmoType "EnergyPod1";
-	}
-	
-	double pow(double a, uint b)
-	{
-        if ( b == 0 )
-            return 1;
-            
-        else
-            return a * pow(a, b - 1);
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Mauler";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-        return 600 - pow(shooter.Distance3D(target) / 3, 2);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-        for (int i = 0 ; i < 20 ; i++)
-		{
-            int damage = 5 * random[Mauler1](1, 3);
-            double ang = angle + Random2[Mauler1]() * (11.25 / 256);
-        
-            shooter.angle += ang;
-        
-            ZetaBullet.FireABullet(shooter, "Purple", target, 4 * (random[StrifeGun]() % 3 + 1), Random2[Mauler1]() * (7.097 / 256), FRandom(-4, 4), "MaulerPuff");
-            shooter.A_PlaySound("weapons/mauler1", CHAN_WEAPON);
-            
-            shooter.angle -= ang;
-        }
-	}
-}
+class ZetaMauler1 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 9428571;
+		ZetaWeapon.MinAmmo 20;
+		ZetaWeapon.AmmoType "EnergyPod1";
+	}
+	
+	double pow(double a, uint b)
+	{
+        if ( b == 0 )
+            return 1;
+            
+        else
+            return a * pow(a, b - 1);
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Mauler";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+        return 600 - pow(shooter.Distance3D(target) / 3, 2);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+        for (int i = 0 ; i < 20 ; i++)
+		{
+            int damage = 5 * random[Mauler1](1, 3);
+            double ang = angle + Random2[Mauler1]() * (11.25 / 256);
+        
+            shooter.angle += ang;
+        
+            ZetaBullet.FireABullet(shooter, "Purple", target, 4 * (random[StrifeGun]() % 3 + 1), Random2[Mauler1]() * (7.097 / 256), FRandom(-4, 4), "MaulerPuff");
+            shooter.A_PlaySound("weapons/mauler1", CHAN_WEAPON);
+            
+            shooter.angle -= ang;
+        }
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc b/ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc
index 1546e6d..6e2c018 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc
@@ -1,40 +1,40 @@
-class ZetaMauler2 : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 15428571;
-		ZetaWeapon.MinAmmo 30;
-		ZetaWeapon.AmmoType "EnergyPod";
-	}
-	
-	double pow(double a, uint b)
-	{
-        if ( b == 0 )
-            return 1;
-            
-        else
-            return a * pow(a, b - 1);
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "Mauler2";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-        return 500 - pow(shooter.Distance3D(target) / 5, 2);
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-        shooter.SpawnMissile(target, "MaulerTorpedo", shooter);
-        DamageMobj(shooter, null, 20, "Disintegrate");
-        shooter.Thrust(7.8125, shooter.Angle+180.);
-	}
-}
+class ZetaMauler2 : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 15428571;
+		ZetaWeapon.MinAmmo 30;
+		ZetaWeapon.AmmoType "EnergyPod";
+	}
+	
+	double pow(double a, uint b)
+	{
+        if ( b == 0 )
+            return 1;
+            
+        else
+            return a * pow(a, b - 1);
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "Mauler2";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+        return 500 - pow(shooter.Distance3D(target) / 5, 2);
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+        shooter.SpawnMissile(target, "MaulerTorpedo", shooter);
+        DamageMobj(shooter, null, 20, "Disintegrate");
+        shooter.Thrust(7.8125, shooter.Angle+180.);
+	}
+}
diff --git a/ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc b/ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc
index c5ca1bd..412a614 100644
--- a/ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc
+++ b/ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc
@@ -1,32 +1,32 @@
-class ZetaMiniMissile : ZetaWeapon
-{
-	default
-	{
-		ZetaWeapon.FireInterval 5428571;
-		ZetaWeapon.MinAmmo 1;
-		ZetaWeapon.AmmoType "MiniMissiles";
-	}
-
-	override bool IsPickupOf(Weapon other)
-	{
-		return other.GetClass() == "MiniMissileLauncher";
-	}
-	
-	override bool bHasAltFire(Actor shooter)
-	{
-		return false;
-	}
-	
-	override double RateSelf(Actor shooter, Actor target)
-	{
-		if ( shooter.Distance3D(target) < 120 )
-			return 300 - shooter.Distance3D(target) * 2;
-	
-		return 900 / sqrt(shooter.Distance2D(target)) * 2.5;
-	}
-	
-	override void Fire(Actor shooter, Actor target)
-	{
-		shooter.SpawnMissileAngle("MiniMissile", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10)) + (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
-	}
-}
+class ZetaMiniMissile : ZetaWeapon
+{
+	default
+	{
+		ZetaWeapon.FireInterval 5428571;
+		ZetaWeapon.MinAmmo 1;
+		ZetaWeapon.AmmoType "MiniMissiles";
+	}
+
+	override bool IsPickupOf(Weapon other)
+	{
+		return other.GetClass() == "MiniMissileLauncher";
+	}
+	
+	override bool bHasAltFire(Actor shooter)
+	{
+		return false;
+	}
+	
+	override double RateSelf(Actor shooter, Actor target)
+	{
+		if ( shooter.Distance3D(target) < 120 )
+			return 300 - shooter.Distance3D(target) * 2;
+	
+		return 900 / sqrt(shooter.Distance2D(target)) * 2.5;
+	}
+	
+	override void Fire(Actor shooter, Actor target)
+	{
+		shooter.SpawnMissileAngle("MiniMissile", shooter.angle + ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10), tan(ZetaWeapon.RandomAngle(11 - shooter.accuracy / 10)) + (target.pos.z - shooter.pos.z) * 20 / target.Distance2D(shooter));
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaBullet.zsc b/ZetaCode/WeaponSupport/ZetaBullet.zsc
index 66b9fdf..b847c94 100644
--- a/ZetaCode/WeaponSupport/ZetaBullet.zsc
+++ b/ZetaCode/WeaponSupport/ZetaBullet.zsc
@@ -1,83 +1,83 @@
-// 'Projectile' for bullet-based ZetaWeapons
-
-class ZetaBullet : Actor
-{
-	String bulletColor, puff;
-    int currDmg;
-    Actor shooter;
-	Property BulletColor: bulletColor;
-    name damageType;
-
-	Default
-	{
-		Damage (0);
-		Speed 85; // TO-DO: a more reasonable speed for a bullet while avoiding FastProjectile
-		ZetaBullet.BulletColor "Gold";
-		Species "ZetaBot";
-		+THRUSPECIES
-		Projectile;
-	}
-	
-	void SetColor(String col)
-	{
-		bulletColor = col;
-	}
-
-	static ZetaBullet FireABullet(Actor shooter, String bulletColor, Actor target, double damage, double spreadX, double spreadY, name damageType = "bullet", string puff = "BulletPuff")
-	{
-		let bullet = ZetaBullet(shooter.SpawnMissile(target, "ZetaBullet", shooter));
-		
-		if ( bullet != null )
-		{
-			bullet.currDmg = Floor(damage + 0.5);
-			bullet.angle += FRandom(-spreadX, spreadX);
-			bullet.pitch = (target.pos.z - shooter.pos.z) / target.Distance2D(shooter);
-			bullet.pitch += FRandom(-spreadY, spreadY);
-            bullet.shooter = shooter;
-            bullet.damageType = damageType;
-			ZetaBullet(bullet).SetColor(bulletColor ? bulletColor : "Gold");
-            ZetaBullet(bullet).puff = puff;
-		}
-			
-		return ZetaBullet(bullet);
-	}
-
-	static void FireBullets(Actor shooter, String bulletColor, Actor target, double damage, int numBullets, double spreadX, double spreadY, name damageType = "bullet", string puff = "BulletPuff")
-    {
-		for ( int i = 0; i < numBullets; i++ )
-			FireABullet(shooter, bulletColor, target, damage, spreadX, spreadY);
-	}
-	
-	States
-	{
-		Spawn:
-			TNT1 A 1;
-			/*
-			{
-                for ( double x = -Speed; x <= 0; x += 10 )
-                {
-                    Vector3 offs = Vec3Angle(x, angle, tan(pitch) * x);
-                    A_SpawnParticle(bulletColor, SPF_FULLBRIGHT, 18, 1.5, 180, offs.x, offs.y, offs.z);
-                }
-            }
-			*/
-			Loop;
-			
-		Death:
-			TNT1 A 0
-			{
-				if ( FRandom(0, 99.9) < 35 )
-					A_PlaySound("ztmisc/ricochet", CHAN_BODY, FRandom(0.2, 0.7));
-                
-                A_SpawnItemEx(puff);
-			}
-			Stop;
-			
-		XDeath:
-            TNT1 A 0 {
-                blockingMobj.DamageMobj(shooter, shooter, currDmg, damageType, 0, angle);
-            }
-			TNT1 A 0 A_SpawnItemEx("Blood");
-			Stop;
-	}
-}
+// 'Projectile' for bullet-based ZetaWeapons
+
+class ZetaBullet : Actor
+{
+	String bulletColor, puff;
+    int currDmg;
+    Actor shooter;
+	Property BulletColor: bulletColor;
+    name damageType;
+
+	Default
+	{
+		Damage (0);
+		Speed 85; // TO-DO: a more reasonable speed for a bullet while avoiding FastProjectile
+		ZetaBullet.BulletColor "Gold";
+		Species "ZetaBot";
+		+THRUSPECIES
+		Projectile;
+	}
+	
+	void SetColor(String col)
+	{
+		bulletColor = col;
+	}
+
+	static ZetaBullet FireABullet(Actor shooter, String bulletColor, Actor target, double damage, double spreadX, double spreadY, name damageType = "bullet", string puff = "BulletPuff")
+	{
+		let bullet = ZetaBullet(shooter.SpawnMissile(target, "ZetaBullet", shooter));
+		
+		if ( bullet != null )
+		{
+			bullet.currDmg = Floor(damage + 0.5);
+			bullet.angle += FRandom(-spreadX, spreadX);
+			bullet.pitch = (target.pos.z - shooter.pos.z) / target.Distance2D(shooter);
+			bullet.pitch += FRandom(-spreadY, spreadY);
+            bullet.shooter = shooter;
+            bullet.damageType = damageType;
+			ZetaBullet(bullet).SetColor(bulletColor ? bulletColor : "Gold");
+            ZetaBullet(bullet).puff = puff;
+		}
+			
+		return ZetaBullet(bullet);
+	}
+
+	static void FireBullets(Actor shooter, String bulletColor, Actor target, double damage, int numBullets, double spreadX, double spreadY, name damageType = "bullet", string puff = "BulletPuff")
+    {
+		for ( int i = 0; i < numBullets; i++ )
+			FireABullet(shooter, bulletColor, target, damage, spreadX, spreadY);
+	}
+	
+	States
+	{
+		Spawn:
+			TNT1 A 1;
+			/*
+			{
+                for ( double x = -Speed; x <= 0; x += 10 )
+                {
+                    Vector3 offs = Vec3Angle(x, angle, tan(pitch) * x);
+                    A_SpawnParticle(bulletColor, SPF_FULLBRIGHT, 18, 1.5, 180, offs.x, offs.y, offs.z);
+                }
+            }
+			*/
+			Loop;
+			
+		Death:
+			TNT1 A 0
+			{
+				if ( FRandom(0, 99.9) < 35 )
+					A_PlaySound("ztmisc/ricochet", CHAN_BODY, FRandom(0.2, 0.7));
+                
+                A_SpawnItemEx(puff);
+			}
+			Stop;
+			
+		XDeath:
+            TNT1 A 0 {
+                blockingMobj.DamageMobj(shooter, shooter, currDmg, damageType, 0, angle);
+            }
+			TNT1 A 0 A_SpawnItemEx("Blood");
+			Stop;
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaDoomWeapons.zsc b/ZetaCode/WeaponSupport/ZetaDoomWeapons.zsc
index fb7e52a..dbd406e 100644
--- a/ZetaCode/WeaponSupport/ZetaDoomWeapons.zsc
+++ b/ZetaCode/WeaponSupport/ZetaDoomWeapons.zsc
@@ -1,25 +1,25 @@
-#include "ZetaCode/WeaponSupport/Doom/ZetaFist.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaRL.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaPR.zsc"
-#include "ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc"
-
-class ZetaDoomWeapons : ZetaWeaponModule
-{
-	override void LoadWeapons(ZetaWeaponModule loader)
-	{
-		loader.AddWeapon("ZetaFist");
-		loader.AddWeapon("ZetaChainsaw");
-		loader.AddWeapon("ZetaPistol");
-		loader.AddWeapon("ZetaShotgun");
-		loader.AddWeapon("ZetaSSG");
-		loader.AddWeapon("ZetaChaingun");
-		loader.AddWeapon("ZetaRL");
-		loader.AddWeapon("ZetaPR");
-		loader.AddWeapon("ZetaBFG");
-	}
-}
+#include "ZetaCode/WeaponSupport/Doom/ZetaFist.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaRL.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaPR.zsc"
+#include "ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc"
+
+class ZetaDoomWeapons : ZetaWeaponModule
+{
+	override void LoadWeapons(ZetaWeaponModule loader)
+	{
+		loader.AddWeapon("ZetaFist");
+		loader.AddWeapon("ZetaChainsaw");
+		loader.AddWeapon("ZetaPistol");
+		loader.AddWeapon("ZetaShotgun");
+		loader.AddWeapon("ZetaSSG");
+		loader.AddWeapon("ZetaChaingun");
+		loader.AddWeapon("ZetaRL");
+		loader.AddWeapon("ZetaPR");
+		loader.AddWeapon("ZetaBFG");
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaSMWeapons.zsc b/ZetaCode/WeaponSupport/ZetaSMWeapons.zsc
index 18603f2..a722fd1 100644
--- a/ZetaCode/WeaponSupport/ZetaSMWeapons.zsc
+++ b/ZetaCode/WeaponSupport/ZetaSMWeapons.zsc
@@ -1,25 +1,25 @@
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc"
-#include "ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc"
-
-class ZetaSentientMushesWeapons : ZetaWeaponModule
-{
-	override void LoadWeapons(ZetaWeaponModule loader)
-	{
-		loader.AddWeapon("ZetaClaw");
-		loader.AddWeapon("ZetaColt");
-		loader.AddWeapon("ZetaSMShotgun");
-		loader.AddWeapon("ZetaAK64");
-		loader.AddWeapon("ZetaMinigun");
-		loader.AddWeapon("ZetaRockox");
-		loader.AddWeapon("ZetaRocketeer");
-		loader.AddWeapon("ZetaKnife");
-		loader.AddWeapon("ZetaHeavyMinigun");
-	}
-}
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaClaw.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaColt.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaSMShotgun.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaAK64.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaMinigun.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaRockox.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaRocketeer.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaKnife.zsc"
+#include "ZetaCode/WeaponSupport/SentientMushes/ZetaHeavyMinigun.zsc"
+
+class ZetaSentientMushesWeapons : ZetaWeaponModule
+{
+	override void LoadWeapons(ZetaWeaponModule loader)
+	{
+		loader.AddWeapon("ZetaClaw");
+		loader.AddWeapon("ZetaColt");
+		loader.AddWeapon("ZetaSMShotgun");
+		loader.AddWeapon("ZetaAK64");
+		loader.AddWeapon("ZetaMinigun");
+		loader.AddWeapon("ZetaRockox");
+		loader.AddWeapon("ZetaRocketeer");
+		loader.AddWeapon("ZetaKnife");
+		loader.AddWeapon("ZetaHeavyMinigun");
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaStrifeWeapons.zsc b/ZetaCode/WeaponSupport/ZetaStrifeWeapons.zsc
index b32f70b..65bdb79 100644
--- a/ZetaCode/WeaponSupport/ZetaStrifeWeapons.zsc
+++ b/ZetaCode/WeaponSupport/ZetaStrifeWeapons.zsc
@@ -1,27 +1,27 @@
-#include "ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc"
-#include "ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc"
-
-class ZetaStrifeWeapons : ZetaWeaponModule
-{
-	override void LoadWeapons(ZetaWeaponModule loader)
-	{
-        loader.AddWeapon("ZetaAssaultGun");
-        loader.AddWeapon("ZetaCrossbow1");
-        loader.AddWeapon("ZetaCrossbow2");
-        loader.AddWeapon("ZetaDagger");
-        loader.AddWeapon("ZetaFlameThrower");
-        loader.AddWeapon("ZetaGrenade1");
-        loader.AddWeapon("ZetaGrenade2");
-        loader.AddWeapon("ZetaMauler1");
-        loader.AddWeapon("ZetaMauler2");
-        loader.AddWeapon("ZetaMiniMissile");
-	}
-}
+#include "ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc"
+#include "ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc"
+
+class ZetaStrifeWeapons : ZetaWeaponModule
+{
+	override void LoadWeapons(ZetaWeaponModule loader)
+	{
+        loader.AddWeapon("ZetaAssaultGun");
+        loader.AddWeapon("ZetaCrossbow1");
+        loader.AddWeapon("ZetaCrossbow2");
+        loader.AddWeapon("ZetaDagger");
+        loader.AddWeapon("ZetaFlameThrower");
+        loader.AddWeapon("ZetaGrenade1");
+        loader.AddWeapon("ZetaGrenade2");
+        loader.AddWeapon("ZetaMauler1");
+        loader.AddWeapon("ZetaMauler2");
+        loader.AddWeapon("ZetaMiniMissile");
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaWeapon.zsc b/ZetaCode/WeaponSupport/ZetaWeapon.zsc
index 562d3e7..91cf191 100644
--- a/ZetaCode/WeaponSupport/ZetaWeapon.zsc
+++ b/ZetaCode/WeaponSupport/ZetaWeapon.zsc
@@ -1,115 +1,115 @@
-class ZetaWeapon : Actor
-{
-	property FireInterval: interval;
-	property AltFireInterval: altinterval;
-	property MinAmmo: minammo;
-	property AmmoType: ammotype;
-	property AltMinAmmo: altminammo;
-	property AltAmmoType: altammotype;
-	
-	int interval;
-	int altinterval;
-	int minammo;
-	string ammotype;
-	int altminammo;
-	string altammotype;
-	
-	default
-	{
-		ZetaWeapon.FireInterval 10000000;
-		ZetaWeapon.AltFireInterval 10000000;
-		ZetaWeapon.MinAmmo 0;
-		ZetaWeapon.AltMinAmmo 0;
-		ZetaWeapon.AmmoType "Clip";
-		ZetaWeapon.AltAmmoType "Clip";
-	}
-	
-	static double RandomAngle(double range, double pivot = 0)
-	{
-        return FRandom(-range, range) + pivot;
-	}
-
-	virtual bool IsPickupOf(Weapon other)
-	{
-		return false;
-	}
-	
-	virtual bool bHasAltFire(Actor shooter)
-	{
-		return true;
-	}
-	
-	virtual double RateSelf(Actor shooter, Actor target)
-	{
-		return 0;
-	}
-	
-	virtual double AltRateSelf(Actor shooter, Actor target)
-	{
-		return -1;
-	}
-	
-	virtual bool CanFireAmmo(Actor shooter)
-	{
-		return true;
-	}
-
-	virtual bool CanFire(Actor shooter, bool bUseAmmo = false)
-	{
-		Inventory inv = shooter.FindInventory(ammotype);
-
-		if ( inv == null )
-			return minammo <= 0;
-			
-		else
-		{
-			if ( bUseAmmo && inv.amount >= minammo )
-			{
-				inv.amount -= minammo;
-				return true;
-			}
-
-			return inv.amount >= minammo;
-		}
-	}
-	
-	virtual bool CanAltFire(Actor shooter, bool bUseAmmo = false)
-	{
-        if ( !bHasAltFire(shooter) )
-            return false;
-    
-		Inventory inv = shooter.FindInventory(altammotype);
-		
-		if ( inv == null )
-			return altminammo <= 0;
-		
-		else
-		{
-			if ( bUseAmmo && inv.amount >= altminammo )
-			{
-				inv.amount -= altminammo;
-				return true;
-			}
-
-			return inv.amount >= altminammo;
-		}
-	}
-	
-	virtual double IntervalSeconds()
-	{
-		return 1. * interval / 10000000;
-	}
-	
-	virtual double AltIntervalSeconds()
-	{
-		return 1. * altinterval / 10000000;
-	}
-	
-	virtual void Fire(Actor shooter, Actor target) {}
-	virtual void AltFire(Actor shooter, Actor target) {}
-	
-	virtual bool IsMelee()
-	{
-		return false;
-	}
-}
+class ZetaWeapon : Actor
+{
+	property FireInterval: interval;
+	property AltFireInterval: altinterval;
+	property MinAmmo: minammo;
+	property AmmoType: ammotype;
+	property AltMinAmmo: altminammo;
+	property AltAmmoType: altammotype;
+	
+	int interval;
+	int altinterval;
+	int minammo;
+	string ammotype;
+	int altminammo;
+	string altammotype;
+	
+	default
+	{
+		ZetaWeapon.FireInterval 10000000;
+		ZetaWeapon.AltFireInterval 10000000;
+		ZetaWeapon.MinAmmo 0;
+		ZetaWeapon.AltMinAmmo 0;
+		ZetaWeapon.AmmoType "Clip";
+		ZetaWeapon.AltAmmoType "Clip";
+	}
+	
+	static double RandomAngle(double range, double pivot = 0)
+	{
+        return FRandom(-range, range) + pivot;
+	}
+
+	virtual bool IsPickupOf(Weapon other)
+	{
+		return false;
+	}
+	
+	virtual bool bHasAltFire(Actor shooter)
+	{
+		return true;
+	}
+	
+	virtual double RateSelf(Actor shooter, Actor target)
+	{
+		return 0;
+	}
+	
+	virtual double AltRateSelf(Actor shooter, Actor target)
+	{
+		return -1;
+	}
+	
+	virtual bool CanFireAmmo(Actor shooter)
+	{
+		return true;
+	}
+
+	virtual bool CanFire(Actor shooter, bool bUseAmmo = false)
+	{
+		Inventory inv = shooter.FindInventory(ammotype);
+
+		if ( inv == null )
+			return minammo <= 0;
+			
+		else
+		{
+			if ( bUseAmmo && inv.amount >= minammo )
+			{
+				inv.amount -= minammo;
+				return true;
+			}
+
+			return inv.amount >= minammo;
+		}
+	}
+	
+	virtual bool CanAltFire(Actor shooter, bool bUseAmmo = false)
+	{
+        if ( !bHasAltFire(shooter) )
+            return false;
+    
+		Inventory inv = shooter.FindInventory(altammotype);
+		
+		if ( inv == null )
+			return altminammo <= 0;
+		
+		else
+		{
+			if ( bUseAmmo && inv.amount >= altminammo )
+			{
+				inv.amount -= altminammo;
+				return true;
+			}
+
+			return inv.amount >= altminammo;
+		}
+	}
+	
+	virtual double IntervalSeconds()
+	{
+		return 1. * interval / 10000000;
+	}
+	
+	virtual double AltIntervalSeconds()
+	{
+		return 1. * altinterval / 10000000;
+	}
+	
+	virtual void Fire(Actor shooter, Actor target) {}
+	virtual void AltFire(Actor shooter, Actor target) {}
+	
+	virtual bool IsMelee()
+	{
+		return false;
+	}
+}
diff --git a/ZetaCode/WeaponSupport/ZetaWeaponModule.zsc b/ZetaCode/WeaponSupport/ZetaWeaponModule.zsc
index 133dd1f..6f7fe32 100644
--- a/ZetaCode/WeaponSupport/ZetaWeaponModule.zsc
+++ b/ZetaCode/WeaponSupport/ZetaWeaponModule.zsc
@@ -1,45 +1,46 @@
-class ZetaWeaponModule : Actor
-{
-	Array<ZetaWeapon> weaponsLoaded;
-	
-	void LoadModule(ZetaWeaponModule module)
-	{
-		module.LoadWeapons(self);
-	}
-	
-	virtual void LoadWeapons(ZetaWeaponModule loader)
-	{
-		loader.A_Log("\cbCan not call LoadWeapons in a ZetaWeaponModule; use a subclass instead!");
-	}
-	
-	void addWeapon(String weap) // subclass ZetaWeapon, not Weapon!
-	{
-		weaponsLoaded.Push(Spawn(weap));
-	}
-	
-	ZetaWeapon CheckType(Weapon other)
-	{
-		for ( int i = 0; i < weaponsLoaded.Size(); i++ )
-		{
-			ZetaWeapon zw = weaponsLoaded[i];
-			bool isp = zw.IsPickupOf(other);
-		
-			if ( isp )
-            {
-                /*
-                if ( CVar.GetCVar("zb_debug").GetInt() == 2 )
-                {
-                    String c1 = other.GetClassName();
-                    String c2 = zw.GetClassName();
-                    
-                    A_Log("Supported weapon found: "..c1.." -> "..c2);
-                }
-                */
-                
-				return zw;
-            }
-		}
-			
-		return null;
-	}
+class ZetaWeaponModule : Actor
+{
+	Array<ZetaWeapon> weaponsLoaded;
+	
+	void LoadModule(ZetaWeaponModule module)
+	{
+		module.LoadWeapons(self);
+	}
+	
+	virtual void LoadWeapons(ZetaWeaponModule loader)
+	{
+		loader.A_Log("\cbCan not call LoadWeapons in a ZetaWeaponModule; use a subclass instead!");
+	}
+	
+	void addWeapon(String weap) // subclass ZetaWeapon, not Weapon!
+	{
+		ZetaWeapon spawnedWeap = ZetaWeapon(Spawn(weap));
+		weaponsLoaded.Push(spawnedWeap);
+	}
+	
+	ZetaWeapon CheckType(Weapon other)
+	{
+		for ( int i = 0; i < weaponsLoaded.Size(); i++ )
+		{
+			ZetaWeapon zw = weaponsLoaded[i];
+			bool isp = zw.IsPickupOf(other);
+		
+			if ( isp )
+            {
+                /*
+                if ( CVar.GetCVar("zb_debug").GetInt() == 2 )
+                {
+                    String c1 = other.GetClassName();
+                    String c2 = zw.GetClassName();
+                    
+                    A_Log("Supported weapon found: "..c1.." -> "..c2);
+                }
+                */
+                
+				return zw;
+            }
+		}
+			
+		return null;
+	}
 }
\ No newline at end of file
diff --git a/build.sh b/build
old mode 100755
new mode 100644
similarity index 80%
rename from build.sh
rename to build
index 2307523..2f5d447
--- a/build.sh
+++ b/build
@@ -10,6 +10,7 @@ SPFILES=""
 MAP=""
 LZMA=0
 PLATFORM=$(uname -s | head -c 5)
+RUN=0
 
 while [[ $# -gt 0 ]]; do
     key="$1"
@@ -20,23 +21,24 @@ while [[ $# -gt 0 ]]; do
         echo Syntax:
         echo
         echo
-        echo "  ./build.sh \[-f <output folder : out>\] \[-s \<path to source port : gzdoom\>\] -i \<path to the mod's IWAD\> \[-c \<additional cvar\>\=\<value\> \[...\]] \[-e \<source port option\>=\<value\> \[...\]\]"
+        echo "  ./build [-f|--folder <output folder : out>] [-s|--sourceport <path to source port : gzdoom>] [-i|--iwad <path to the mod's IWAD>] [-a|--file|--add <additional PWAD> [-a|--file|--add ...]] [-c|--cvar <additional cvar>=<value> [c|--cvar ...]] [-e|--extra <source port option>=<value> [...]] [-r|--run]"
         echo
         echo For example:
         echo
-        echo "    ./build.sh -f out -s gzdoom -i /usr/games/doom/doom2.wad -c zb_debug=1 -e \"-nomonsters\" -e \"-skill=1\" -e \"+map=MAP18\""
+        echo "    ./build -f out -s gzdoom -i /usr/games/doom/doom2.wad -c zb_debug=1 -e \"-nomonsters\" -e \"-skill=1\" -e \"+map=MAP18\""
         echo
         exit 0
         ;;
-        -l|--lzma)
-        LZMA=1
-        shift # past option
-        ;;
+        # LZMA was removed.
         -f|--folder)
         FOLDER="$2"
         shift # past argument
         shift # past value
         ;;
+        -r|--run)
+        RUN=1
+        shift
+        ;;
         -s|--sourceport)
         SCPORT="$2"
         shift # past argument
@@ -139,13 +141,13 @@ ADDFOLDER () {
 }
 
 # Build compilation
-if [ -e "./compile.sh" ]; then
-    . ./compile.sh >/dev/null
+if [ -e "./compile" ]; then
+    . ./compile >/dev/null
     
 fi
 
 # Pre-configuration
-. ./config.sh
+. ./config
 NUMFILES=${#FILES[@]}
 FARR=("${FILES[@]}")
 FILES=""
@@ -190,21 +192,21 @@ mkdir -p $FOLDER
 echo Adding $NUMFILES files to output \'${out}\'.
 rm $out 2>/dev/null # just to make sure file doesn't exist
 
-if [ $PLATFORM == "MINGW" ]; then
-    ZIP="./zip.exe"
-    
-else
-    ZIP=zip
-
-fi
-
 if [ $LZMA -eq 1 ]; then
-    echo $FILES | tr " " "\n" | tar cf $out --lzma -T - || {
+    echo ${FILES[@]} | tr " " "\n" | tar cf $out --lzma -T - || {
         echo "Error building PK7 output!"
         exit 1
     }
     
 else
+    if [ $PLATFORM == "MINGW" ]; then
+        ZIP="./zip.exe"
+        
+    else
+        ZIP=zip
+
+    fi
+
     $ZIP -9 $out ${FILES} || {
         echo "Error building PK3 output!"
         exit 1
@@ -213,7 +215,7 @@ else
 fi
 
 # Create launch script
-lout="${owd}/${FOLDER}/${NAME}.sh"
+lout="${owd}/${FOLDER}/${NAME}"
 echo "#!/bin/bash" >"$lout"
 printf "\"${SCPORT}\" -iwad \"${IWAD}\" -file \"./${NAME}_v${VERSION}.pk${PKEXT}\"" >>"$lout"
 
@@ -249,9 +251,18 @@ cd "$owd"
 chmod +x "$lout"
 
 # Post-build
-if [ -e "./postbuild.sh" ]; then
-    . ./postbuild.sh $OUT
+if [ -e "./postbuild" ]; then
+    . ./postbuild $OUT
     
 fi
 
+echo "cd ${FOLDER}; ./${NAME}; cd ${owd}" >run
+chmod +x run
+
+if [ "$RUN" == "1" ]; then
+    ./run >/dev/null 2>error.log &
+    disown
+
+fi
+
 echo "PK${PKEXT} built succesfully: $out"
diff --git a/compile.sh b/compile
similarity index 100%
rename from compile.sh
rename to compile
diff --git a/config.sh b/config
similarity index 94%
rename from config.sh
rename to config
index 7dfcc78..8e62783 100644
--- a/config.sh
+++ b/config
@@ -1,6 +1,6 @@
 #!/bin/bash
 NAME=ZetaBot
-VERSION=0.3.0
+VERSION=0.3.1
 
 ADDFOLDER ZetaCode
 ADDFOLDER sprites
diff --git a/run b/run
index f38cec6..938a927 100755
--- a/run
+++ b/run
@@ -1,5 +1 @@
-#!/bin/bash
-. ./build.sh $*
-cd out
-./ZetaBot.sh
-cd ..
+cd out; ./ZetaBot; cd /home/gustavo6046/Projects/ZetaBot
diff --git a/run.sh b/run.sh
deleted file mode 100644
index f8d155d..0000000
--- a/run.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-. ./build.sh $*
-cd out
-./ZetaBot.sh
-cd ..
diff --git a/source/ZETAACS.acs b/source/ZETAACS.acs
index fa05965..7b09ba6 100644
--- a/source/ZETAACS.acs
+++ b/source/ZETAACS.acs
@@ -1,6 +1,6 @@
-#include "zcommon.acs"
-
-script 1994 ENTER
-{
-    GiveInventory("BotName", 1);
-}
+#include "zcommon.acs"
+
+script 1994 ENTER
+{
+    GiveInventory("BotName", 1);
+}
diff --git a/tarcmd.sh b/tarcmd.sh
deleted file mode 100755
index 50cdd7a..0000000
--- a/tarcmd.sh
+++ /dev/null
@@ -1 +0,0 @@
-tar cf /home/gustavo6046/Projetos/ZetaBot/out/ZetaBot_v0.1.7.pk7 --lzma "./ZetaCode/Appearance.zsc" "./ZetaCode/WeaponSupport/ZetaWeapon.zsc" "./ZetaCode/WeaponSupport/ZetaDoomWeapons.zsc" "./ZetaCode/WeaponSupport/ZetaStrifeWeapons.zsc" "./ZetaCode/WeaponSupport/ZetaWeaponModule.zsc" "./ZetaCode/WeaponSupport/ZetaBullet.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaChaingun.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaPistol.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaPR.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaShotgun.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaChainsaw.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaFist.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaSSG.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaBFG.zsc" "./ZetaCode/WeaponSupport/Doom/ZetaRL.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaDagger.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaMauler1.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaMauler2.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaGrenade2.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaMiniMissile.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaCrossbow2.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaFlameThrower.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaAssaultGun.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaGrenade1.zsc" "./ZetaCode/WeaponSupport/Strife/ZetaCrossbow1.zsc" "./ZetaCode/Obstacles.zsc" "./ZetaCode/Standard.zsc" "./ZetaCode/PawnClasses/ZetaDoom.zsc" "./ZetaCode/PawnClasses/ZetaStrife.zsc" "./ZetaCode/PawnClasses/ZetaBotPawn.zsc" "./ZetaCode/Pathing.zsc" "./sprites/CAPEC1" "./sprites/CAPEB7B3" "./sprites/CAPEC6C4" "./sprites/CAPEC8C2" "./sprites/CAPEA7A3" "./sprites/CAPEB5" "./sprites/NODEA4A6" "./sprites/NODEA1" "./sprites/CAPEB6B4" "./sprites/CAPEB1" "./sprites/CAPEA1" "./sprites/CAPEA5" "./sprites/NODEA2A8" "./sprites/CAPEA6A4" "./sprites/NODEA3A7" "./sprites/CAPEC5" "./sprites/NODEA5" "./sprites/CAPEA8A2" "./sprites/CAPEB8B2" "./sprites/CAPEC7C3" "./sounds/DV3IDLE4" "./sounds/DV2ELIM3" "./sounds/DV3HURT1" "./sounds/DV1TARG3" "./sounds/DV1HIDE1" "./sounds/DV1IDLE6" "./sounds/DV1IDLE2" "./sounds/DV2HURT2" "./sounds/ZV4ELIM1" "./sounds/DV3ACTV1" "./sounds/ZSRICO4" "./sounds/DV1HURT2" "./sounds/DV1TARG1" "./sounds/DV3IDLE3" "./sounds/ZSRICO2" "./sounds/DV3IDLE5" "./sounds/ZV4HURT2" "./sounds/ZV4HURT1" "./sounds/DV1ACTV1" "./sounds/DV2HIDE3" "./sounds/DV1IDLE3" "./sounds/DV1ELIM3" "./sounds/DV1IDLE4" "./sounds/DV2IDLE3" "./sounds/ZV4ELIM3" "./sounds/DV1ELIM1" "./sounds/DV2ACTV1" "./sounds/ZV4TARG1" "./sounds/DV1ACTV4" "./sounds/DV1TARG2" "./sounds/ZV4ELIM2" "./sounds/DV2ACTV4" "./sounds/DV3IDLE2" "./sounds/DV3TARG3" "./sounds/ZV4ACTV3" "./sounds/DV3HIDE1" "./sounds/ZV4IDLE2" "./sounds/DV2IDLE2" "./sounds/DV1HURT1" "./sounds/DV2HIDE1" "./sounds/DV2IDLE1" "./sounds/DV3IDLE7" "./sounds/DV1ELIM2" "./sounds/ZV4COMM1" "./sounds/ZV4TARG2" "./sounds/DV3HIDE3" "./sounds/DV2TARG2" "./sounds/ZV4ACTV2" "./sounds/DV2ACTV3" "./sounds/DV1ACTV2" "./sounds/DV2ELIM1" "./sounds/ZV4IDLE1" "./sounds/DV2TARG3" "./sounds/DV3ELIM2" "./sounds/DV1IDLE1" "./sounds/DV2HURT1" "./sounds/DV2IDLE5" "./sounds/DV3IDLE1" "./sounds/DV2ACTV2" "./sounds/DV3ELIM3" "./sounds/DV1HURT3" "./sounds/DV2TARG1" "./sounds/DV2IDLE4" "./sounds/DV3ELIM1" "./sounds/DV3TARG2" "./sounds/DV2ELIM2" "./sounds/DV3TARG1" "./sounds/ZSRICO1" "./sounds/DV3ACTV2" "./sounds/ZV4ACTV1" "./sounds/DV1ACTV3" "./sounds/ZSRICO3" "./sounds/DV1HIDE2" "./sounds/DV3HURT3" "./sounds/DV1IDLE5" "./sounds/DV3HURT2" "./sounds/ZSJUMP" "./sounds/DV3IDLE6" "./sounds/DV3HIDE2" "./acs/ZETAACS.o" "./source/ZETAACS.acs" "./CREDITS.txt" "./CVarInfo.txt" "./KeyConf.txt" "./LICENSE" "./LoadACS.txt" "./README.md" "./SNDINFO.txt" "./ZScript.txt"
diff --git a/test.sh b/test
similarity index 100%
rename from test.sh
rename to test