diff --git a/src/library/Syroot.Worms.Armageddon/Scheme.cs b/src/library/Syroot.Worms.Armageddon/Scheme.cs
index cc660c0..80c48da 100644
--- a/src/library/Syroot.Worms.Armageddon/Scheme.cs
+++ b/src/library/Syroot.Worms.Armageddon/Scheme.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using Syroot.BinaryData;
 using Syroot.Worms.Core;
@@ -23,57 +24,12 @@ namespace Syroot.Worms.Armageddon
         private const int _objectCount10Step = 44;
         private const int _objectCountLastStep = 59;
 
-        // Lookup tables.
-        private static readonly Dictionary<byte, byte> _mapWaterRiseToRaw = new Dictionary<byte, byte>()
-        {
-            [0] = 0,
-            [5] = 1,
-            [13] = 19,
-            [20] = 2,
-            [21] = 55,
-            [29] = 43,
-            [37] = 47,
-            [45] = 3,
-            [52] = 26,
-            [53] = 25,
-            [61] = 27,
-            [64] = 8,
-            [69] = 33,
-            [77] = 13,
-            [80] = 4,
-            [84] = 18,
-            [85] = 23,
-            [93] = 11,
-            [101] = 15,
-            [109] = 29,
-            [116] = 22,
-            [117] = 57,
-            [125] = 5,
-            [133] = 63,
-            [141] = 45,
-            [148] = 30,
-            [149] = 9,
-            [157] = 21,
-            [165] = 17,
-            [173] = 61,
-            [180] = 6,
-            [181] = 39,
-            [189] = 37,
-            [197] = 31,
-            [205] = 51,
-            [208] = 12,
-            [212] = 14,
-            [213] = 41,
-            [221] = 53,
-            [229] = 49,
-            [237] = 35,
-            [244] = 10,
-            [245] = 7,
-            [253] = 59
-        };
+        // ---- FIELDS -------------------------------------------------------------------------------------------------
 
-        // ---- MEMBERS ------------------------------------------------------------------------------------------------
+        private static readonly byte[] _waterRiseRates;
 
+        private byte _fallDamage;
+        private byte _waterRiseIndex;
         private byte _objectCount;
         private byte _mineDelay;
         private byte _turnTime;
@@ -87,13 +43,21 @@ namespace Syroot.Worms.Armageddon
 
         // ---- CONSTRUCTORS & DESTRUCTOR ------------------------------------------------------------------------------
 
+        static Scheme()
+        {
+            // Generate water rise rate lookup array.
+            _waterRiseRates = new byte[256];
+            for (int i = 0; i < 256; i++)
+                _waterRiseRates[i] = (byte)(Math.Pow(i, 2) * 5 % 256);
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="Scheme"/> class.
         /// </summary>
         public Scheme()
         {
             Version = SchemeVersion.Extended;
-            Weapons = new SchemeWeaponSetting[GetWeaponCount()];
+            Weapons = new SchemeWeapon[GetWeaponCount()];
         }
 
         /// <summary>
@@ -111,6 +75,39 @@ namespace Syroot.Worms.Armageddon
 
         // ---- PROPERTIES ---------------------------------------------------------------------------------------------
 
+        /// <summary>
+        /// Gets the available mine or oil drum object counts.
+        /// </summary>
+        public static IEnumerable<int> ValidObjectCounts
+        {
+            get
+            {
+                for (int i = 1; i < 30; i++)
+                    yield return i;
+                for (int i = 30; i < 100; i += 5)
+                    yield return i;
+                for (int i = 100; i <= 250; i += 10)
+                    yield return i;
+            }
+        }
+
+        /// <summary>
+        /// Gets the available fall damage percentages.
+        /// </summary>
+        public static IEnumerable<int> ValidFallDamages
+        {
+            get
+            {
+                for (int i = 0; i <= 508; i += 4)
+                    yield return i;
+            }
+        }
+
+        /// <summary>
+        /// Gets the available unique and ordered water rise rates in pixels.
+        /// </summary>
+        public static IEnumerable<byte> ValidWateRiseRates => _waterRiseRates.Distinct().OrderBy(x => x);
+
         /// <summary>
         /// Gets or sets the <see cref="SchemeVersion"/> of this scheme, controlling whether super weapon settings
         /// are stored or not.
@@ -146,9 +143,22 @@ namespace Syroot.Worms.Armageddon
         public bool AutomaticReplays { get; set; }
 
         /// <summary>
-        /// Gets or sets the percentual amount of fall damage applied, relative to normal fall damage being 100%.
+        /// Gets or sets the percentual amount of fall damage applied, relative to normal fall damage being 100%. Valid
+        /// values lie between 0-508, at a granularity of 4. Note that changing this value rounds it down to a valid
+        /// granularity.
         /// </summary>
-        public SchemeFallDamage FallDamage { get; set; }
+        /// <remarks>Valid settings can be enumerated through <see cref="ValidFallDamages"/>.</remarks>
+        /// <exception cref="ArgumentOutOfRangeException">The value is not between 0-508.</exception>
+        public int FallDamage
+        {
+            get => _fallDamage;
+            set
+            {
+                if (value < 0 || value > 508)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Fall damage must be between 0-508.");
+                _fallDamage = (byte)(value >> 2 << 2);
+            }
+        }
 
         /// <summary>
         /// Gets or sets a value indicating whether worms cannot walk and are mostly stuck at their current position
@@ -179,8 +189,26 @@ namespace Syroot.Worms.Armageddon
 
         /// <summary>
         /// Gets or sets the amount in pixels which the water will rise between turns after Sudden Death was triggered.
+        /// Note that changing this value rounds it down to a valid setting.
         /// </summary>
-        public SchemeWaterRise WaterRiseRate { get; set; }
+        /// <remarks>Valid settings can be enumerated through <see cref="ValidWateRiseRates"/>.</remarks>
+        public byte WaterRiseRate
+        {
+            get => _waterRiseRates[_waterRiseIndex];
+            set
+            {
+                int smallestDeviation = Int32.MaxValue;
+                for (int i = 0; i < _waterRiseRates.Length; i++)
+                {
+                    int deviation = Math.Abs(value - _waterRiseRates[i]);
+                    if (deviation >= 0 && smallestDeviation > deviation)
+                    {
+                        smallestDeviation = deviation;
+                        _waterRiseIndex = (byte)i;
+                    }
+                }
+            }
+        }
 
         /// <summary>
         /// Gets or sets the percentual probability of a weapon crate to drop between turns. Negative values might crash
@@ -216,9 +244,10 @@ namespace Syroot.Worms.Armageddon
         public SchemeObjectType ObjectTypes { get; set; }
 
         /// <summary>
-        /// Gets or sets the maximum number of objects (mines or oil drums) on the map. Note that setting this value
-        /// rounds it valid count.
+        /// Gets or sets the maximum number of objects (mines or oil drums) on the map. Note that changing this value
+        /// rounds it down to a valid setting.
         /// </summary>
+        /// <remarks>Valid settings can be enumerated through <see cref="ValidObjectCounts"/>.</remarks>
         public byte ObjectCount
         {
             get => _objectCount;
@@ -238,13 +267,14 @@ namespace Syroot.Worms.Armageddon
         /// <summary>
         /// Gets or sets the number of seconds a mine requires to explode. Can be 1-3 and 5-127 seconds.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is not between 0-127 or 4.</exception>
         public byte MineDelay
         {
             get => _mineDelay;
             set
             {
-                if (value == 4 || value > 0x7F)
-                    throw new ArgumentException("Mine delay must be between 0-127 and not be 4.", nameof(value));
+                if (value == 4 || value > 127)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Mine delay must be between 0-127 and not be 4.");
                 _mineDelay = value;
             }
         }
@@ -274,13 +304,14 @@ namespace Syroot.Worms.Armageddon
         /// <summary>
         /// Gets or sets the turn time in seconds available for the player to move. Must be in the range of 0-127.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is not between 0-127.</exception>
         public byte TurnTime
         {
             get => _turnTime;
             set
             {
-                if (value > 0x7F)
-                    throw new ArgumentException("Turn time must be between 0-127.", nameof(value));
+                if (value > 127)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Turn time must be between 0-127.");
                 _turnTime = value;
             }
         }
@@ -294,13 +325,14 @@ namespace Syroot.Worms.Armageddon
         /// <summary>
         /// Gets or sets the round time before sudden death is triggered between 0-127 minutes.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is not between 0-127.</exception>
         public byte RoundTimeMinutes
         {
             get => _roundTimeMinutes;
             set
             {
-                if (value > 0x7F)
-                    throw new ArgumentException("Round time must be between 0-127 minutes.", nameof(value));
+                if (value > 127)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Round time must be between 0-127 minutes.");
                 _roundTimeMinutes = value;
             }
         }
@@ -309,13 +341,14 @@ namespace Syroot.Worms.Armageddon
         /// Gets or sets the round time before sudden death is triggered in between 0-128 seconds. When 0,
         /// <see cref="RoundTimeMinutes"/> is used instead.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is not between 0-128.</exception>
         public byte RoundTimeSeconds
         {
             get => _roundTimeSeconds;
             set
             {
-                if (value > 0x80)
-                    throw new ArgumentException("Round time must be between 0-128 seconds.", nameof(value));
+                if (value > 128)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Round time must be between 0-128 seconds.");
                 _roundTimeSeconds = value;
             }
         }
@@ -323,13 +356,14 @@ namespace Syroot.Worms.Armageddon
         /// <summary>
         /// Gets or sets the number of round wins required to win the game. Must not be 0.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is 0.</exception>
         public byte NumberOfWins
         {
             get => _numberOfWins;
             set
             {
                 if (value == 0)
-                    throw new ArgumentException("Number of wins must not be 0.", nameof(value));
+                    throw new ArgumentOutOfRangeException(nameof(value), "Number of wins must not be 0.");
                 _numberOfWins = value;
             }
         }
@@ -392,11 +426,11 @@ namespace Syroot.Worms.Armageddon
         public bool EnableSuperWeapons { get; set; }
 
         /// <summary>
-        /// Gets the array of <see cref="SchemeWeaponSetting"/> instances, each mapping to one weapon at the index of
-        /// the <see cref="SchemeWeapon"/> enumeration. Depending on the scheme <see cref="Version"/>, super weapons
+        /// Gets the array of <see cref="SchemeWeapon"/> instances, each mapping to one weapon at the index of
+        /// the <see cref="SchemeWeaponName"/> enumeration. Depending on the scheme <see cref="Version"/>, super weapons
         /// might not be stored in this array.
         /// </summary>
-        public SchemeWeaponSetting[] Weapons { get; set; }
+        public SchemeWeapon[] Weapons { get; set; }
 
         // ---- RubberWorm Settings ----
 
@@ -525,13 +559,14 @@ namespace Syroot.Worms.Armageddon
         /// Gets or sets the Kaos game scheme mod. 0 for none, 1-5 for the corresponding mod. Configurable with the
         /// /kaosmod command.
         /// </summary>
+        /// <exception cref="ArgumentOutOfRangeException">Value is bigger than 15.</exception>
         public byte RwKaosMod
         {
             get => _rwKaosMod;
             set
             {
-                if (value > 0xF)
-                    throw new ArgumentException("Kaos mod must not be greater than 15.");
+                if (value > 15)
+                    throw new ArgumentOutOfRangeException(nameof(value), "Kaos mod must not be greater than 15.");
                 _rwKaosMod = value;
             }
         }
@@ -635,13 +670,13 @@ namespace Syroot.Worms.Armageddon
             RetreatTimeRope = reader.Read1Byte();
             ShowRoundTime = reader.ReadBoolean();
             AutomaticReplays = reader.ReadBoolean();
-            FallDamage = (SchemeFallDamage)(reader.ReadByte() * 50 % 0x100 * 2);
+            FallDamage = reader.ReadByte() * 50 % 256 * 2;
             ArtilleryMode = reader.ReadBoolean();
             SchemeEditor = reader.ReadEnum<SchemeEditor>(false);
             StockpilingMode = reader.ReadEnum<SchemeStockpiling>(true);
             WormSelectMode = reader.ReadEnum<SchemeWormSelect>(true);
             SuddenDeathEvent = reader.ReadEnum<SchemeSuddenDeathEvent>(true);
-            WaterRiseRate = (SchemeWaterRise)(Math.Pow(reader.ReadByte(), 2) * 5 % 0x100);
+            _waterRiseIndex = reader.Read1Byte();
             WeaponCrateProbability = reader.ReadSByte();
             DonorCards = reader.ReadBoolean();
             HealthCrateProbability = reader.ReadSByte();
@@ -668,10 +703,10 @@ namespace Syroot.Worms.Armageddon
             EnableSuperWeapons = reader.ReadBoolean();
 
             // Read the weapon settings. Old versions do not store super weapon settings.
-            Weapons = new SchemeWeaponSetting[64];
+            Weapons = new SchemeWeapon[64];
             int weaponCount = GetWeaponCount();
             for (int i = 0; i < weaponCount; i++)
-                Weapons[i] = reader.ReadStruct<SchemeWeaponSetting>();
+                Weapons[i] = reader.ReadStruct<SchemeWeapon>();
 
             // Ignore possible unknown WWP trash at the end of the file.
 
@@ -714,13 +749,13 @@ namespace Syroot.Worms.Armageddon
             writer.Write(RetreatTimeRope);
             writer.Write(ShowRoundTime);
             writer.Write(AutomaticReplays);
-            writer.Write((byte)((int)FallDamage / 4 * 41 % 0x80));
+            writer.Write((byte)(FallDamage / 4 * 41 % 128));
             writer.Write(ArtilleryMode);
             writer.WriteEnum(SchemeEditor, false);
             writer.WriteEnum(StockpilingMode, true);
             writer.WriteEnum(WormSelectMode, true);
             writer.WriteEnum(SuddenDeathEvent, true);
-            writer.Write(_mapWaterRiseToRaw[(byte)WaterRiseRate]);
+            writer.Write(_waterRiseIndex);
             writer.Write(WeaponCrateProbability);
             writer.Write(DonorCards);
             writer.Write(HealthCrateProbability);
@@ -751,7 +786,7 @@ namespace Syroot.Worms.Armageddon
 
             // Write the weapon settings. Old versions do not store super weapon settings.
             int weaponCount = GetWeaponCount();
-            foreach (SchemeWeaponSetting weapon in Weapons)
+            foreach (SchemeWeapon weapon in Weapons)
                 writer.WriteStruct(weapon);
         }
 
@@ -774,6 +809,8 @@ namespace Syroot.Worms.Armageddon
 
         // ---- METHODS (PRIVATE) --------------------------------------------------------------------------------------
 
+        private int GetWeaponCount() => Version == SchemeVersion.Extended ? 64 : 45;
+
         private void LoadObjectTypesAndCount(BinaryStream reader)
         {
             byte raw = reader.Read1Byte();
@@ -800,31 +837,15 @@ namespace Syroot.Worms.Armageddon
         private void LoadMineDelayConfig(BinaryStream reader)
         {
             byte raw = reader.Read1Byte();
-            if (raw == 4 || raw > 0x7F)
-            {
-                MineDelay = 0;
-                MineDelayRandom = true;
-            }
-            else
-            {
-                MineDelay = raw;
-                MineDelayRandom = false;
-            }
+            MineDelayRandom = raw == 4 || raw > 0x7F;
+            MineDelay = MineDelayRandom ? (byte)0 : raw;
         }
 
         private void LoadTurnTimeConfig(BinaryStream reader)
         {
             byte raw = reader.Read1Byte();
-            if (raw > 0x7F)
-            {
-                TurnTime = 0;
-                TurnTimeInfinite = true;
-            }
-            else
-            {
-                TurnTime = raw;
-                TurnTimeInfinite = false;
-            }
+            TurnTimeInfinite = raw > 0x7F;
+            TurnTime = TurnTimeInfinite ? (byte)0 : raw;
         }
 
         private void LoadRoundTimeConfig(BinaryStream reader)
@@ -844,18 +865,18 @@ namespace Syroot.Worms.Armageddon
 
         private void LoadRubberWormSettings()
         {
-            RwEarthquakeProb earthquakeProb = (RwEarthquakeProb)Weapons[(int)SchemeWeapon.Earthquake].Probability;
+            RwEarthquakeProb earthquakeProb = (RwEarthquakeProb)Weapons[(int)SchemeWeaponName.Earthquake].Probability;
             RwAntiLockPower = earthquakeProb.HasFlag(RwEarthquakeProb.AntiLockPower);
             RwAutoReaim = earthquakeProb.HasFlag(RwEarthquakeProb.AutoReaim);
             RwCircularAim = earthquakeProb.HasFlag(RwEarthquakeProb.CircularAim);
             RwShotDoesntEndTurnAll = earthquakeProb.HasFlag(RwEarthquakeProb.ShotDoesntEndTurnAll);
             RwKaosMod = ((byte)earthquakeProb).DecodeByte(4, 4);
 
-            RwAntiSink = Weapons[(int)SchemeWeapon.SheepStrike].Probability != 0;
-            RwCrateLimit = (byte)Weapons[(int)SchemeWeapon.MagicBullet].Probability;
-            RwCrateRate = (byte)Weapons[(int)SchemeWeapon.NuclearTest].Probability;
+            RwAntiSink = Weapons[(int)SchemeWeaponName.SheepStrike].Probability != 0;
+            RwCrateLimit = (byte)Weapons[(int)SchemeWeaponName.MagicBullet].Probability;
+            RwCrateRate = (byte)Weapons[(int)SchemeWeaponName.NuclearTest].Probability;
 
-            RwMoleSquadronProb moleSquadronProb = (RwMoleSquadronProb)Weapons[(int)SchemeWeapon.MoleSquadron]
+            RwMoleSquadronProb moleSquadronProb = (RwMoleSquadronProb)Weapons[(int)SchemeWeaponName.MoleSquadron]
                 .Probability;
             RwCrateShower = moleSquadronProb.HasFlag(RwMoleSquadronProb.CrateShower);
             RwExtendedFuse = moleSquadronProb.HasFlag(RwMoleSquadronProb.ExtendedFuse);
@@ -866,11 +887,11 @@ namespace Syroot.Worms.Armageddon
             RwUpgradedRope = moleSquadronProb.HasFlag(RwMoleSquadronProb.UpgradedRope);
             RwWeaponsDontChange = moleSquadronProb.HasFlag(RwMoleSquadronProb.WeaponsDontChange);
 
-            RwFlameLimit = (byte)Weapons[(int)SchemeWeapon.ScalesOfJustice].Probability;
-            RwFriction = (byte)Weapons[(int)SchemeWeapon.SalvationArmy].Probability;
+            RwFlameLimit = (byte)Weapons[(int)SchemeWeaponName.ScalesOfJustice].Probability;
+            RwFriction = (byte)Weapons[(int)SchemeWeaponName.SalvationArmy].Probability;
 
             // 8th and 7th bit control constant / proportional black hole gravity, otherwise normal gravity.
-            byte mailStrikeProb = (byte)Weapons[(int)SchemeWeapon.MailStrike].Probability;
+            byte mailStrikeProb = (byte)Weapons[(int)SchemeWeaponName.MailStrike].Probability;
             if (!mailStrikeProb.GetBit(7))
                 RwGravity = mailStrikeProb.DecodeSByte(7);
             else if (mailStrikeProb.GetBit(6))
@@ -878,24 +899,18 @@ namespace Syroot.Worms.Armageddon
             else
                 RwGravityConstBlackHole = mailStrikeProb.DecodeSByte(6);
 
-            RwKnockForce = (byte)Weapons[(int)SchemeWeapon.SuperBananaBomb].Probability;
-            RwMaxRopeSpeed = (byte)Weapons[(int)SchemeWeapon.MineStrike].Probability;
-            RwSelectWormAnytime = ((byte)Weapons[(int)SchemeWeapon.MBBomb].Probability).GetBit(1);
+            RwKnockForce = (byte)Weapons[(int)SchemeWeaponName.SuperBananaBomb].Probability;
+            RwMaxRopeSpeed = (byte)Weapons[(int)SchemeWeaponName.MineStrike].Probability;
+            RwSelectWormAnytime = ((byte)Weapons[(int)SchemeWeaponName.MBBomb].Probability).GetBit(1);
 
             byte[] versionBytes = new byte[2];
-            versionBytes[0] = (byte)Weapons[(int)SchemeWeapon.SelectWorm].Probability;
-            versionBytes[1] = (byte)Weapons[(int)SchemeWeapon.Freeze].Probability;
+            versionBytes[0] = (byte)Weapons[(int)SchemeWeaponName.SelectWorm].Probability;
+            versionBytes[1] = (byte)Weapons[(int)SchemeWeaponName.Freeze].Probability;
             RwVersionOverride = BitConverter.ToUInt16(versionBytes, 0);
 
-            RwViscosity = (byte)Weapons[(int)SchemeWeapon.ConcreteDonkey].Probability;
-            RwWindPower = (byte)Weapons[(int)SchemeWeapon.SuicideBomber].Probability;
-            RwWormBouncyness = (byte)Weapons[(int)SchemeWeapon.Armageddon].Probability;
-        }
-
-        private int GetWeaponCount()
-        {
-            // Old versions do not store super weapon settings.
-            return Version == SchemeVersion.Extended ? 64 : 45;
+            RwViscosity = (byte)Weapons[(int)SchemeWeaponName.ConcreteDonkey].Probability;
+            RwWindPower = (byte)Weapons[(int)SchemeWeaponName.SuicideBomber].Probability;
+            RwWormBouncyness = (byte)Weapons[(int)SchemeWeaponName.Armageddon].Probability;
         }
 
         private void SaveObjectTypesAndCount(BinaryStream writer, SchemeSaveFormat format)
@@ -921,29 +936,13 @@ namespace Syroot.Worms.Armageddon
             writer.Write(raw);
         }
 
-        private void SaveMineDelayConfig(BinaryStream writer)
-        {
-            if (MineDelayRandom)
-                writer.Write((byte)4);
-            else
-                writer.Write(MineDelay);
-        }
+        private void SaveMineDelayConfig(BinaryStream writer) => writer.Write(MineDelayRandom ? (byte)4 : MineDelay);
 
-        private void SaveTurnTimeConfig(BinaryStream writer)
-        {
-            if (TurnTimeInfinite)
-                writer.Write((byte)0xFF);
-            else
-                writer.Write(TurnTime);
-        }
+        private void SaveTurnTimeConfig(BinaryStream writer) => writer.Write(TurnTimeInfinite ? (byte)0xFF : TurnTime);
 
-        private void SaveRoundTimeConfig(BinaryStream writer)
-        {
-            if (RoundTimeSeconds > 0)
-                writer.Write((byte)(0xFF - (RoundTimeSeconds - 1)));
-            else
-                writer.Write(RoundTimeMinutes);
-        }
+        private void SaveRoundTimeConfig(BinaryStream writer) => writer.Write(RoundTimeSeconds > 0
+            ? (byte)(0xFF - (RoundTimeSeconds - 1))
+            : RoundTimeMinutes);
 
         private void SaveRubberWormSettings()
         {
@@ -953,11 +952,11 @@ namespace Syroot.Worms.Armageddon
             if (RwCircularAim) earthquakeProb |= (byte)RwEarthquakeProb.CircularAim;
             if (RwShotDoesntEndTurnAll) earthquakeProb |= (byte)RwEarthquakeProb.ShotDoesntEndTurnAll;
             earthquakeProb = earthquakeProb.Encode(RwKaosMod, 4);
-            Weapons[(int)SchemeWeapon.Earthquake].Probability = (sbyte)earthquakeProb;
+            Weapons[(int)SchemeWeaponName.Earthquake].Probability = (sbyte)earthquakeProb;
 
-            Weapons[(int)SchemeWeapon.SheepStrike].Probability = (sbyte)(RwAntiSink ? 1 : 0);
-            Weapons[(int)SchemeWeapon.MagicBullet].Probability = (sbyte)RwCrateLimit;
-            Weapons[(int)SchemeWeapon.NuclearTest].Probability = (sbyte)RwCrateRate;
+            Weapons[(int)SchemeWeaponName.SheepStrike].Probability = (sbyte)(RwAntiSink ? 1 : 0);
+            Weapons[(int)SchemeWeaponName.MagicBullet].Probability = (sbyte)RwCrateLimit;
+            Weapons[(int)SchemeWeaponName.NuclearTest].Probability = (sbyte)RwCrateRate;
 
             RwMoleSquadronProb moleSquadronProb = RwMoleSquadronProb.None;
             if (RwCrateShower) moleSquadronProb |= RwMoleSquadronProb.CrateShower;
@@ -968,10 +967,10 @@ namespace Syroot.Worms.Armageddon
             if (RwShotDoesntEndTurn) moleSquadronProb |= RwMoleSquadronProb.ShotDoesntEndTurn;
             if (RwUpgradedRope) moleSquadronProb |= RwMoleSquadronProb.UpgradedRope;
             if (RwWeaponsDontChange) moleSquadronProb |= RwMoleSquadronProb.WeaponsDontChange;
-            Weapons[(int)SchemeWeapon.MoleSquadron].Probability = (sbyte)moleSquadronProb;
+            Weapons[(int)SchemeWeaponName.MoleSquadron].Probability = (sbyte)moleSquadronProb;
 
-            Weapons[(int)SchemeWeapon.ScalesOfJustice].Probability = (sbyte)RwFlameLimit;
-            Weapons[(int)SchemeWeapon.SalvationArmy].Probability = (sbyte)RwFriction;
+            Weapons[(int)SchemeWeaponName.ScalesOfJustice].Probability = (sbyte)RwFlameLimit;
+            Weapons[(int)SchemeWeaponName.SalvationArmy].Probability = (sbyte)RwFriction;
 
             // 8th and 7th bit control constant / proportional black hole gravity, otherwise normal gravity.
             byte mailStrikeProb = 0;
@@ -990,28 +989,28 @@ namespace Syroot.Worms.Armageddon
                 mailStrikeProb = mailStrikeProb.EnableBit(6);
                 mailStrikeProb = mailStrikeProb.Encode(RwGravityPropBlackHole, 6);
             }
-            Weapons[(int)SchemeWeapon.MailStrike].Probability = (sbyte)mailStrikeProb;
+            Weapons[(int)SchemeWeaponName.MailStrike].Probability = (sbyte)mailStrikeProb;
 
-            Weapons[(int)SchemeWeapon.SuperBananaBomb].Probability = (sbyte)RwKnockForce;
-            Weapons[(int)SchemeWeapon.MineStrike].Probability = (sbyte)RwMaxRopeSpeed;
-            byte mbBombProb = ((byte)Weapons[(int)SchemeWeapon.MBBomb].Probability).SetBit(0, RwSelectWormAnytime);
-            Weapons[(int)SchemeWeapon.MBBomb].Probability = (sbyte)mbBombProb;
+            Weapons[(int)SchemeWeaponName.SuperBananaBomb].Probability = (sbyte)RwKnockForce;
+            Weapons[(int)SchemeWeaponName.MineStrike].Probability = (sbyte)RwMaxRopeSpeed;
+            byte mbBombProb = ((byte)Weapons[(int)SchemeWeaponName.MBBomb].Probability).SetBit(0, RwSelectWormAnytime);
+            Weapons[(int)SchemeWeaponName.MBBomb].Probability = (sbyte)mbBombProb;
 
             byte[] versionBytes = BitConverter.GetBytes(RwVersionOverride);
-            Weapons[(int)SchemeWeapon.SelectWorm].Probability = (sbyte)versionBytes[0];
-            Weapons[(int)SchemeWeapon.Freeze].Probability = (sbyte)versionBytes[1];
+            Weapons[(int)SchemeWeaponName.SelectWorm].Probability = (sbyte)versionBytes[0];
+            Weapons[(int)SchemeWeaponName.Freeze].Probability = (sbyte)versionBytes[1];
 
-            Weapons[(int)SchemeWeapon.ConcreteDonkey].Probability = (sbyte)RwViscosity;
-            Weapons[(int)SchemeWeapon.SuicideBomber].Probability = (sbyte)RwWindPower;
-            Weapons[(int)SchemeWeapon.Armageddon].Probability = (sbyte)RwWormBouncyness;
+            Weapons[(int)SchemeWeaponName.ConcreteDonkey].Probability = (sbyte)RwViscosity;
+            Weapons[(int)SchemeWeaponName.SuicideBomber].Probability = (sbyte)RwWindPower;
+            Weapons[(int)SchemeWeaponName.Armageddon].Probability = (sbyte)RwWormBouncyness;
         }
 
-        // ---- ENUMERATIONS -------------------------------------------------------------------------------------------
+        // ---- CLASSES, STRUCTS & ENUMS -------------------------------------------------------------------------------
 
         [Flags]
         private enum RwEarthquakeProb : byte
         {
-            None = 0,
+            None,
             AutoReaim = 1 << 0,
             CircularAim = 1 << 1,
             AntiLockPower = 1 << 2,
@@ -1022,7 +1021,7 @@ namespace Syroot.Worms.Armageddon
         [Flags]
         private enum RwMoleSquadronProb : byte
         {
-            None = 0,
+            None,
             ShotDoesntEndTurn = 1 << 0,
             LoseControlDoesntEndTurn = 1 << 1,
             FireDoesntPauseTimer = 1 << 2,
diff --git a/src/library/Syroot.Worms.Armageddon/SchemeEnums.cs b/src/library/Syroot.Worms.Armageddon/SchemeEnums.cs
index 295b74a..9981e13 100644
--- a/src/library/Syroot.Worms.Armageddon/SchemeEnums.cs
+++ b/src/library/Syroot.Worms.Armageddon/SchemeEnums.cs
@@ -7,14 +7,9 @@ namespace Syroot.Worms.Armageddon
     /// </summary>
     public enum SchemeVersion : byte
     {
-        /// <summary>
-        /// The standard format used by WA before version 3.6.28.0 and WWP. It does not store super weapon settings.
-        /// </summary>
+        /// <summary>Default format used by WA before version 3.6.28.0 and WWP.</summary>
         Standard = 1,
-
-        /// <summary>
-        /// The extended format used by WA since version 3.6.28.0.
-        /// </summary>
+        /// <summary>Extended format used by WA since version 3.6.28.0, storing super weapon settings.</summary>
         Extended = 2
     }
 
@@ -23,676 +18,24 @@ namespace Syroot.Worms.Armageddon
     /// </summary>
     public enum SchemeSaveFormat
     {
-        /// <summary>
-        /// Represents the <see cref="SchemeVersion.Standard"/> format.
-        /// </summary>
+        /// <summary>Represents <see cref="SchemeVersion.Standard"/>.</summary>
         Standard,
-
-        /// <summary>
-        /// Represents the <see cref="SchemeVersion.Extended"/> format, and does not store object counts.
-        /// </summary>
+        /// <summary>Represents <see cref="SchemeVersion.Extended"/>.</summary>
         Extended,
-
-        /// <summary>
-        /// Represents the <see cref="SchemeVersion.Extended"/> format, and stores object counts (supported since WA
-        /// 3.6.28.0).
-        /// </summary>
+        /// <summary>Represents <see cref="SchemeVersion.Extended"/> and stores object counts since WA 3.6.28.0.</summary>
         ExtendedWithObjectCount
     }
 
-    /// <summary>
-    /// Represents the fall damage in percent, relative to the normal fall damage being 100%.
-    /// </summary>
-    public enum SchemeFallDamage
-    {
-        /// <summary>
-        /// No fall damage.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// 4% fall damage.
-        /// </summary>
-        Percent4 = 4,
-
-        /// <summary>
-        /// 8% fall damage.
-        /// </summary>
-        Percent8 = 8,
-
-        /// <summary>
-        /// 12% fall damage.
-        /// </summary>
-        Percent12 = 12,
-
-        /// <summary>
-        /// 16% fall damage.
-        /// </summary>
-        Percent16 = 16,
-
-        /// <summary>
-        /// 20% fall damage.
-        /// </summary>
-        Percent20 = 20,
-
-        /// <summary>
-        /// 24% fall damage.
-        /// </summary>
-        Percent24 = 24,
-
-        /// <summary>
-        /// 28% fall damage.
-        /// </summary>
-        Percent28 = 28,
-
-        /// <summary>
-        /// 32% fall damage.
-        /// </summary>
-        Percent32 = 32,
-
-        /// <summary>
-        /// 36% fall damage.
-        /// </summary>
-        Percent36 = 36,
-
-        /// <summary>
-        /// 40% fall damage.
-        /// </summary>
-        Percent40 = 40,
-
-        /// <summary>
-        /// 44% fall damage.
-        /// </summary>
-        Percent44 = 44,
-
-        /// <summary>
-        /// 48% fall damage.
-        /// </summary>
-        Percent48 = 48,
-
-        /// <summary>
-        /// 52% fall damage.
-        /// </summary>
-        Percent52 = 52,
-
-        /// <summary>
-        /// 56% fall damage.
-        /// </summary>
-        Percent56 = 56,
-
-        /// <summary>
-        /// 60% fall damage.
-        /// </summary>
-        Percent60 = 60,
-
-        /// <summary>
-        /// 64% fall damage.
-        /// </summary>
-        Percent64 = 64,
-
-        /// <summary>
-        /// 68% fall damage.
-        /// </summary>
-        Percent68 = 68,
-
-        /// <summary>
-        /// 72% fall damage.
-        /// </summary>
-        Percent72 = 72,
-
-        /// <summary>
-        /// 76% fall damage.
-        /// </summary>
-        Percent76 = 76,
-
-        /// <summary>
-        /// 80% fall damage.
-        /// </summary>
-        Percent80 = 80,
-
-        /// <summary>
-        /// 84% fall damage.
-        /// </summary>
-        Percent84 = 84,
-
-        /// <summary>
-        /// 88% fall damage.
-        /// </summary>
-        Percent88 = 88,
-
-        /// <summary>
-        /// 92% fall damage.
-        /// </summary>
-        Percent92 = 92,
-
-        /// <summary>
-        /// 96% fall damage.
-        /// </summary>
-        Percent96 = 96,
-
-        /// <summary>
-        /// 100% fall damage.
-        /// </summary>
-        Percent100 = 100,
-
-        /// <summary>
-        /// 104% fall damage.
-        /// </summary>
-        Percent104 = 104,
-
-        /// <summary>
-        /// 108% fall damage.
-        /// </summary>
-        Percent108 = 108,
-
-        /// <summary>
-        /// 112% fall damage.
-        /// </summary>
-        Percent112 = 112,
-
-        /// <summary>
-        /// 116% fall damage.
-        /// </summary>
-        Percent116 = 116,
-
-        /// <summary>
-        /// 120% fall damage.
-        /// </summary>
-        Percent120 = 120,
-
-        /// <summary>
-        /// 124% fall damage.
-        /// </summary>
-        Percent124 = 124,
-
-        /// <summary>
-        /// 128% fall damage.
-        /// </summary>
-        Percent128 = 128,
-
-        /// <summary>
-        /// 132% fall damage.
-        /// </summary>
-        Percent132 = 132,
-
-        /// <summary>
-        /// 136% fall damage.
-        /// </summary>
-        Percent136 = 136,
-
-        /// <summary>
-        /// 140% fall damage.
-        /// </summary>
-        Percent140 = 140,
-
-        /// <summary>
-        /// 144% fall damage.
-        /// </summary>
-        Percent144 = 144,
-
-        /// <summary>
-        /// 148% fall damage.
-        /// </summary>
-        Percent148 = 148,
-
-        /// <summary>
-        /// 152% fall damage.
-        /// </summary>
-        Percent152 = 152,
-
-        /// <summary>
-        /// 156% fall damage.
-        /// </summary>
-        Percent156 = 156,
-
-        /// <summary>
-        /// 160% fall damage.
-        /// </summary>
-        Percent160 = 160,
-
-        /// <summary>
-        /// 164% fall damage.
-        /// </summary>
-        Percent164 = 164,
-
-        /// <summary>
-        /// 168% fall damage.
-        /// </summary>
-        Percent168 = 168,
-
-        /// <summary>
-        /// 172% fall damage.
-        /// </summary>
-        Percent172 = 172,
-
-        /// <summary>
-        /// 176% fall damage.
-        /// </summary>
-        Percent176 = 176,
-
-        /// <summary>
-        /// 180% fall damage.
-        /// </summary>
-        Percent180 = 180,
-
-        /// <summary>
-        /// 184% fall damage.
-        /// </summary>
-        Percent184 = 184,
-
-        /// <summary>
-        /// 188% fall damage.
-        /// </summary>
-        Percent188 = 188,
-
-        /// <summary>
-        /// 192% fall damage.
-        /// </summary>
-        Percent192 = 192,
-
-        /// <summary>
-        /// 196% fall damage.
-        /// </summary>
-        Percent196 = 196,
-
-        /// <summary>
-        /// 200% fall damage.
-        /// </summary>
-        Percent200 = 200,
-
-        /// <summary>
-        /// 204% fall damage.
-        /// </summary>
-        Percent204 = 204,
-
-        /// <summary>
-        /// 208% fall damage.
-        /// </summary>
-        Percent208 = 208,
-
-        /// <summary>
-        /// 212% fall damage.
-        /// </summary>
-        Percent212 = 212,
-
-        /// <summary>
-        /// 216% fall damage.
-        /// </summary>
-        Percent216 = 216,
-
-        /// <summary>
-        /// 220% fall damage.
-        /// </summary>
-        Percent220 = 220,
-
-        /// <summary>
-        /// 224% fall damage.
-        /// </summary>
-        Percent224 = 224,
-
-        /// <summary>
-        /// 228% fall damage.
-        /// </summary>
-        Percent228 = 228,
-
-        /// <summary>
-        /// 232% fall damage.
-        /// </summary>
-        Percent232 = 232,
-
-        /// <summary>
-        /// 236% fall damage.
-        /// </summary>
-        Percent236 = 236,
-
-        /// <summary>
-        /// 240% fall damage.
-        /// </summary>
-        Percent240 = 240,
-
-        /// <summary>
-        /// 244% fall damage.
-        /// </summary>
-        Percent244 = 244,
-
-        /// <summary>
-        /// 248% fall damage.
-        /// </summary>
-        Percent248 = 248,
-
-        /// <summary>
-        /// 252% fall damage.
-        /// </summary>
-        Percent252 = 252,
-
-        /// <summary>
-        /// 256% fall damage.
-        /// </summary>
-        Percent256 = 256,
-
-        /// <summary>
-        /// 260% fall damage.
-        /// </summary>
-        Percent260 = 260,
-
-        /// <summary>
-        /// 264% fall damage.
-        /// </summary>
-        Percent264 = 264,
-
-        /// <summary>
-        /// 268% fall damage.
-        /// </summary>
-        Percent268 = 268,
-
-        /// <summary>
-        /// 272% fall damage.
-        /// </summary>
-        Percent272 = 272,
-
-        /// <summary>
-        /// 276% fall damage.
-        /// </summary>
-        Percent276 = 276,
-
-        /// <summary>
-        /// 280% fall damage.
-        /// </summary>
-        Percent280 = 280,
-
-        /// <summary>
-        /// 284% fall damage.
-        /// </summary>
-        Percent284 = 284,
-
-        /// <summary>
-        /// 288% fall damage.
-        /// </summary>
-        Percent288 = 288,
-
-        /// <summary>
-        /// 292% fall damage.
-        /// </summary>
-        Percent292 = 292,
-
-        /// <summary>
-        /// 296% fall damage.
-        /// </summary>
-        Percent296 = 296,
-
-        /// <summary>
-        /// 300% fall damage.
-        /// </summary>
-        Percent300 = 300,
-
-        /// <summary>
-        /// 304% fall damage.
-        /// </summary>
-        Percent304 = 304,
-
-        /// <summary>
-        /// 308% fall damage.
-        /// </summary>
-        Percent308 = 308,
-
-        /// <summary>
-        /// 312% fall damage.
-        /// </summary>
-        Percent312 = 312,
-
-        /// <summary>
-        /// 316% fall damage.
-        /// </summary>
-        Percent316 = 316,
-
-        /// <summary>
-        /// 320% fall damage.
-        /// </summary>
-        Percent320 = 320,
-
-        /// <summary>
-        /// 324% fall damage.
-        /// </summary>
-        Percent324 = 324,
-
-        /// <summary>
-        /// 328% fall damage.
-        /// </summary>
-        Percent328 = 328,
-
-        /// <summary>
-        /// 332% fall damage.
-        /// </summary>
-        Percent332 = 332,
-
-        /// <summary>
-        /// 336% fall damage.
-        /// </summary>
-        Percent336 = 336,
-
-        /// <summary>
-        /// 340% fall damage.
-        /// </summary>
-        Percent340 = 340,
-
-        /// <summary>
-        /// 344% fall damage.
-        /// </summary>
-        Percent344 = 344,
-
-        /// <summary>
-        /// 348% fall damage.
-        /// </summary>
-        Percent348 = 348,
-
-        /// <summary>
-        /// 352% fall damage.
-        /// </summary>
-        Percent352 = 352,
-
-        /// <summary>
-        /// 356% fall damage.
-        /// </summary>
-        Percent356 = 356,
-
-        /// <summary>
-        /// 360% fall damage.
-        /// </summary>
-        Percent360 = 360,
-
-        /// <summary>
-        /// 364% fall damage.
-        /// </summary>
-        Percent364 = 364,
-
-        /// <summary>
-        /// 368% fall damage.
-        /// </summary>
-        Percent368 = 368,
-
-        /// <summary>
-        /// 372% fall damage.
-        /// </summary>
-        Percent372 = 372,
-
-        /// <summary>
-        /// 376% fall damage.
-        /// </summary>
-        Percent376 = 376,
-
-        /// <summary>
-        /// 380% fall damage.
-        /// </summary>
-        Percent380 = 380,
-
-        /// <summary>
-        /// 384% fall damage.
-        /// </summary>
-        Percent384 = 384,
-
-        /// <summary>
-        /// 388% fall damage.
-        /// </summary>
-        Percent388 = 388,
-
-        /// <summary>
-        /// 392% fall damage.
-        /// </summary>
-        Percent392 = 392,
-
-        /// <summary>
-        /// 396% fall damage.
-        /// </summary>
-        Percent396 = 396,
-
-        /// <summary>
-        /// 400% fall damage.
-        /// </summary>
-        Percent400 = 400,
-
-        /// <summary>
-        /// 404% fall damage.
-        /// </summary>
-        Percent404 = 404,
-
-        /// <summary>
-        /// 408% fall damage.
-        /// </summary>
-        Percent408 = 408,
-
-        /// <summary>
-        /// 412% fall damage.
-        /// </summary>
-        Percent412 = 412,
-
-        /// <summary>
-        /// 416% fall damage.
-        /// </summary>
-        Percent416 = 416,
-
-        /// <summary>
-        /// 420% fall damage.
-        /// </summary>
-        Percent420 = 420,
-
-        /// <summary>
-        /// 424% fall damage.
-        /// </summary>
-        Percent424 = 424,
-
-        /// <summary>
-        /// 428% fall damage.
-        /// </summary>
-        Percent428 = 428,
-
-        /// <summary>
-        /// 432% fall damage.
-        /// </summary>
-        Percent432 = 432,
-
-        /// <summary>
-        /// 436% fall damage.
-        /// </summary>
-        Percent436 = 436,
-
-        /// <summary>
-        /// 440% fall damage.
-        /// </summary>
-        Percent440 = 440,
-
-        /// <summary>
-        /// 444% fall damage.
-        /// </summary>
-        Percent444 = 444,
-
-        /// <summary>
-        /// 448% fall damage.
-        /// </summary>
-        Percent448 = 448,
-
-        /// <summary>
-        /// 452% fall damage.
-        /// </summary>
-        Percent452 = 452,
-
-        /// <summary>
-        /// 456% fall damage.
-        /// </summary>
-        Percent456 = 456,
-
-        /// <summary>
-        /// 460% fall damage.
-        /// </summary>
-        Percent460 = 460,
-
-        /// <summary>
-        /// 464% fall damage.
-        /// </summary>
-        Percent464 = 464,
-
-        /// <summary>
-        /// 468% fall damage.
-        /// </summary>
-        Percent468 = 468,
-
-        /// <summary>
-        /// 472% fall damage.
-        /// </summary>
-        Percent472 = 472,
-
-        /// <summary>
-        /// 476% fall damage.
-        /// </summary>
-        Percent476 = 476,
-
-        /// <summary>
-        /// 480% fall damage.
-        /// </summary>
-        Percent480 = 480,
-
-        /// <summary>
-        /// 484% fall damage.
-        /// </summary>
-        Percent484 = 484,
-
-        /// <summary>
-        /// 488% fall damage.
-        /// </summary>
-        Percent488 = 488,
-
-        /// <summary>
-        /// 492% fall damage.
-        /// </summary>
-        Percent492 = 492,
-
-        /// <summary>
-        /// 496% fall damage.
-        /// </summary>
-        Percent496 = 496,
-
-        /// <summary>
-        /// 500% fall damage.
-        /// </summary>
-        Percent500 = 500,
-
-        /// <summary>
-        /// 504% fall damage.
-        /// </summary>
-        Percent504 = 504,
-
-        /// <summary>
-        /// 508% fall damage.
-        /// </summary>
-        Percent508 = 508
-    }
-
     /// <summary>
     /// Represents the known identifiers of scheme editors stored in schemes modified by them.
     /// </summary>
     public enum SchemeEditor : byte
     {
-        None = 0,
+        /// <summary>Default (Worms Armageddon internal editor or those that do not set a recognition byte.</summary>
+        None,
+        /// <summary>LeTotalKiller's PHP online editor.</summary>
         LeTotalKiller = 0x5F,
+        /// <summary>SchemeEddy's Win32 editor.</summary>
         SchemeEddy = 0x89
     }
 
@@ -701,9 +44,12 @@ namespace Syroot.Worms.Armageddon
     /// </summary>
     public enum SchemeStockpiling : byte
     {
-        Off = 0,
-        On = 1,
-        Anti = 2
+        /// <summary>Each round starts with the exact amount of weapons set in the scheme.</summary>
+        Off,
+        /// <summary>Weapons collected additionally to the ones set in the scheme are transfered to the next round.</summary>
+        On,
+        /// <summary>Weapons are only given out at start of first round, and not renewed in following rounds.</summary>
+        Anti
     }
 
     /// <summary>
@@ -711,20 +57,12 @@ namespace Syroot.Worms.Armageddon
     /// </summary>
     public enum SchemeWormSelect : byte
     {
-        /// <summary>
-        /// Worms are selected in the order in which they appear in the team.
-        /// </summary>
-        Sequential = 0,
-
-        /// <summary>
-        /// Worms are selected by the player.
-        /// </summary>
-        Manual = 1,
-
-        /// <summary>
-        /// Worms are selected randomly.
-        /// </summary>
-        Random = 2
+        /// <summary>Worms are selected in the order in which they appear in the team.</summary>
+        Sequential,
+        /// <summary>Worms are selected by the player.</summary>
+        Manual,
+        /// <summary>Worms are selected randomly.</summary>
+        Random
     }
 
     /// <summary>
@@ -732,251 +70,14 @@ namespace Syroot.Worms.Armageddon
     /// </summary>
     public enum SchemeSuddenDeathEvent : byte
     {
-        /// <summary>
-        /// The round ends and is drawn.
-        /// </summary>
-        RoundEnd = 0,
-
-        /// <summary>
-        /// A nuklear test is triggered.
-        /// </summary>
-        NuclearStrike = 1,
-
-        /// <summary>
-        /// The worms health is reduced to 1.
-        /// </summary>
-        HealthDrop = 2,
-
-        /// <summary>
-        /// No special event is triggered and the water only rises in the rate specified in the scheme.
-        /// </summary>
-        WaterRise = 3
-    }
-
-    /// <summary>
-    /// Represents the water rise in pixels after sudden death was triggered.
-    /// </summary>
-    public enum SchemeWaterRise : byte
-    {
-        /// <summary>
-        /// No water rise.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// 5 pixels water rise.
-        /// </summary>
-        Pixels5 = 5,
-
-        /// <summary>
-        /// 13 pixels water rise.
-        /// </summary>
-        Pixels13 = 13,
-
-        /// <summary>
-        /// 20 pixels water rise.
-        /// </summary>
-        Pixels20 = 20,
-
-        /// <summary>
-        /// 21 pixels water rise.
-        /// </summary>
-        Pixels21 = 21,
-
-        /// <summary>
-        /// 29 pixels water rise.
-        /// </summary>
-        Pixels29 = 29,
-
-        /// <summary>
-        /// 37 pixels water rise.
-        /// </summary>
-        Pixels37 = 37,
-
-        /// <summary>
-        /// 45 pixels water rise.
-        /// </summary>
-        Pixels45 = 45,
-
-        /// <summary>
-        /// 52 pixels water rise.
-        /// </summary>
-        Pixels52 = 52,
-
-        /// <summary>
-        /// 53 pixels water rise.
-        /// </summary>
-        Pixels53 = 53,
-
-        /// <summary>
-        /// 61 pixels water rise.
-        /// </summary>
-        Pixels61 = 61,
-
-        /// <summary>
-        /// 64 pixels water rise.
-        /// </summary>
-        Pixels64 = 64,
-
-        /// <summary>
-        /// 69 pixels water rise.
-        /// </summary>
-        Pixels69 = 69,
-
-        /// <summary>
-        /// 77 pixels water rise.
-        /// </summary>
-        Pixels77 = 77,
-
-        /// <summary>
-        /// 80 pixels water rise.
-        /// </summary>
-        Pixels80 = 80,
-
-        /// <summary>
-        /// 84 pixels water rise.
-        /// </summary>
-        Pixels84 = 84,
-
-        /// <summary>
-        /// 85 pixels water rise.
-        /// </summary>
-        Pixels85 = 85,
-
-        /// <summary>
-        /// 93 pixels water rise.
-        /// </summary>
-        Pixels93 = 93,
-
-        /// <summary>
-        /// 101 pixels water rise.
-        /// </summary>
-        Pixels101 = 101,
-
-        /// <summary>
-        /// 109 pixels water rise.
-        /// </summary>
-        Pixels109 = 109,
-
-        /// <summary>
-        /// 116 pixels water rise.
-        /// </summary>
-        Pixels116 = 116,
-
-        /// <summary>
-        /// 117 pixels water rise.
-        /// </summary>
-        Pixels117 = 117,
-
-        /// <summary>
-        /// 125 pixels water rise.
-        /// </summary>
-        Pixels125 = 125,
-
-        /// <summary>
-        /// 133 pixels water rise.
-        /// </summary>
-        Pixels133 = 133,
-
-        /// <summary>
-        /// 141 pixels water rise.
-        /// </summary>
-        Pixels141 = 141,
-
-        /// <summary>
-        /// 148 pixels water rise.
-        /// </summary>
-        Pixels148 = 148,
-
-        /// <summary>
-        /// 149 pixels water rise.
-        /// </summary>
-        Pixels149 = 149,
-
-        /// <summary>
-        /// 157 pixels water rise.
-        /// </summary>
-        Pixels157 = 157,
-
-        /// <summary>
-        /// 165 pixels water rise.
-        /// </summary>
-        Pixels165 = 165,
-
-        /// <summary>
-        /// 173 pixels water rise.
-        /// </summary>
-        Pixels173 = 173,
-
-        /// <summary>
-        /// 180 pixels water rise.
-        /// </summary>
-        Pixels180 = 180,
-
-        /// <summary>
-        /// 181 pixels water rise.
-        /// </summary>
-        Pixels181 = 181,
-
-        /// <summary>
-        /// 189 pixels water rise.
-        /// </summary>
-        Pixels189 = 189,
-
-        /// <summary>
-        /// 197 pixels water rise.
-        /// </summary>
-        Pixels197 = 197,
-
-        /// <summary>
-        /// 205 pixels water rise.
-        /// </summary>
-        Pixels205 = 205,
-
-        /// <summary>
-        /// 208 pixels water rise.
-        /// </summary>
-        Pixels208 = 208,
-
-        /// <summary>
-        /// 212 pixels water rise.
-        /// </summary>
-        Pixels212 = 212,
-
-        /// <summary>
-        /// 213 pixels water rise.
-        /// </summary>
-        Pixels213 = 213,
-
-        /// <summary>
-        /// 221 pixels water rise.
-        /// </summary>
-        Pixels221 = 221,
-
-        /// <summary>
-        /// 229 pixels water rise.
-        /// </summary>
-        Pixels229 = 229,
-
-        /// <summary>
-        /// 237 pixels water rise.
-        /// </summary>
-        Pixels237 = 237,
-
-        /// <summary>
-        /// 244 pixels water rise.
-        /// </summary>
-        Pixels244 = 244,
-
-        /// <summary>
-        /// 245 pixels water rise.
-        /// </summary>
-        Pixels245 = 245,
-
-        /// <summary>
-        /// 253 pixels water rise.
-        /// </summary>
-        Pixels253 = 253
+        /// <summary>The round ends and is drawn.</summary>
+        RoundEnd,
+        /// <summary>A nuklear test is triggered.</summary>
+        NuclearStrike,
+        /// <summary>The worms health is reduced to 1.</summary>
+        HealthDrop,
+        /// <summary>No special event is triggered and the water only rises in the rate specified in the scheme.</summary>
+        WaterRise
     }
 
     /// <summary>
@@ -985,335 +86,148 @@ namespace Syroot.Worms.Armageddon
     [Flags]
     public enum SchemeObjectType
     {
+        /// <summary>Neither mines or oil drums are placed on the map.</summary>
         None,
+        /// <summary>Only mines are placed on the map.</summary>
         Mines = 1 << 0,
+        /// <summary>Only oil drums are placed on the map.</summary>
         OilDrums = 1 << 1,
+        /// <summary>Both mines and oil drums are placed on the map.</summary>
         Both = Mines | OilDrums
     }
 
     /// <summary>
     /// Represents the weapons in the game.
     /// </summary>
-    public enum SchemeWeapon
+    public enum SchemeWeaponName
     {
-        /// <summary>
-        /// The Bazooka weapon.
-        /// </summary>
+        /// <summary>The Bazooka weapon.</summary>
         Bazooka,
-
-        /// <summary>
-        /// The Homing Missile weapon.
-        /// </summary>
+        /// <summary>The Homing Missile weapon.</summary>
         HomingMissile,
-
-        /// <summary>
-        /// The Mortar weapon.
-        /// </summary>
+        /// <summary>The Mortar weapon.</summary>
         Mortar,
-
-        /// <summary>
-        /// The Grenade weapon.
-        /// </summary>
+        /// <summary>The Grenade weapon.</summary>
         Grenade,
-
-        /// <summary>
-        /// The Cluster Bomb weapon.
-        /// </summary>
+        /// <summary>The Cluster Bomb weapon.</summary>
         ClusterBomb,
-
-        /// <summary>
-        /// The Skunk weapon.
-        /// </summary>
+        /// <summary>The Skunk weapon.</summary>
         Skunk,
-
-        /// <summary>
-        /// The Petrol Bomb weapon.
-        /// </summary>
+        /// <summary>The Petrol Bomb weapon.</summary>
         PetrolBomb,
-
-        /// <summary>
-        /// The Banana Bomb weapon.
-        /// </summary>
+        /// <summary>The Banana Bomb weapon.</summary>
         BananaBomb,
-
-        /// <summary>
-        /// The Handgun weapon.
-        /// </summary>
+        /// <summary>The Handgun weapon.</summary>
         Handgun,
-
-        /// <summary>
-        /// The Shotgun weapon.
-        /// </summary>
+        /// <summary>The Shotgun weapon.</summary>
         Shotgun,
-
-        /// <summary>
-        /// The Uzi weapon.
-        /// </summary>
+        /// <summary>The Uzi weapon.</summary>
         Uzi,
-
-        /// <summary>
-        /// The Minigun weapon.
-        /// </summary>
+        /// <summary>The Minigun weapon.</summary>
         Minigun,
-
-        /// <summary>
-        /// The Longbow weapon.
-        /// </summary>
+        /// <summary>The Longbow weapon.</summary>
         Longbow,
-
-        /// <summary>
-        /// The Airstrike weapon.
-        /// </summary>
+        /// <summary>The Airstrike weapon.</summary>
         Airstrike,
-
-        /// <summary>
-        /// The Napalm Strike weapon.
-        /// </summary>
+        /// <summary>The Napalm Strike weapon.</summary>
         NapalmStrike,
-
-        /// <summary>
-        /// The Mine weapon.
-        /// </summary>
+        /// <summary>The Mine weapon.</summary>
         Mine,
-
-        /// <summary>
-        /// The Firepunch weapon.
-        /// </summary>
+        /// <summary>The Firepunch weapon.</summary>
         Firepunch,
-
-        /// <summary>
-        /// The Dragonball weapon.
-        /// </summary>
+        /// <summary>The Dragonball weapon.</summary>
         Dragonball,
-
-        /// <summary>
-        /// The Kamikaze weapon.
-        /// </summary>
+        /// <summary>The Kamikaze weapon.</summary>
         Kamikaze,
-
-        /// <summary>
-        /// The Prod weapon.
-        /// </summary>
+        /// <summary>The Prod weapon.</summary>
         Prod,
-
-        /// <summary>
-        /// The Battle Axe weapon.
-        /// </summary>
+        /// <summary>The Battle Axe weapon.</summary>
         BattleAxe,
-
-        /// <summary>
-        /// The Blowtorch weapon.
-        /// </summary>
+        /// <summary>The Blowtorch weapon.</summary>
         Blowtorch,
-
-        /// <summary>
-        /// The Pneumatic Drill weapon.
-        /// </summary>
+        /// <summary>The Pneumatic Drill weapon.</summary>
         PneumaticDrill,
-
-        /// <summary>
-        /// The Girder weapon.
-        /// </summary>
+        /// <summary>The Girder weapon.</summary>
         Girder,
-
-        /// <summary>
-        /// The Ninja Rope weapon.
-        /// </summary>
+        /// <summary>The Ninja Rope weapon.</summary>
         NinjaRope,
-
-        /// <summary>
-        /// The Parachute weapon.
-        /// </summary>
+        /// <summary>The Parachute weapon.</summary>
         Parachute,
-
-        /// <summary>
-        /// The Bungee weapon.
-        /// </summary>
+        /// <summary>The Bungee weapon.</summary>
         Bungee,
-
-        /// <summary>
-        /// The Teleport weapon.
-        /// </summary>
+        /// <summary>The Teleport weapon.</summary>
         Teleport,
-
-        /// <summary>
-        /// The Dynamite weapon.
-        /// </summary>
+        /// <summary>The Dynamite weapon.</summary>
         Dynamite,
-
-        /// <summary>
-        /// The Sheep weapon.
-        /// </summary>
+        /// <summary>The Sheep weapon.</summary>
         Sheep,
-
-        /// <summary>
-        /// The Baseball Bat weapon.
-        /// </summary>
+        /// <summary>The Baseball Bat weapon.</summary>
         BaseballBat,
-
-        /// <summary>
-        /// The Flame Thrower weapon.
-        /// </summary>
+        /// <summary>The Flame Thrower weapon.</summary>
         Flamethrower,
-
-        /// <summary>
-        /// The Homing Pigeon weapon.
-        /// </summary>
+        /// <summary>The Homing Pigeon weapon.</summary>
         HomingPigeon,
-
-        /// <summary>
-        /// The Mad Cow weapon.
-        /// </summary>
+        /// <summary>The Mad Cow weapon.</summary>
         MadCow,
-
-        /// <summary>
-        /// The Holy Hand Grenade weapon.
-        /// </summary>
+        /// <summary>The Holy Hand Grenade weapon.</summary>
         HolyHandGrenade,
-
-        /// <summary>
-        /// The Old Woman weapon.
-        /// </summary>
+        /// <summary>The Old Woman weapon.</summary>
         OldWoman,
-
-        /// <summary>
-        /// The Sheep Launcher weapon.
-        /// </summary>
+        /// <summary>The Sheep Launcher weapon.</summary>
         SheepLauncher,
-
-        /// <summary>
-        /// The Super Sheep or Aqua Sheep weapon.
-        /// </summary>
+        /// <summary>The Super Sheep or Aqua Sheep weapon.</summary>
         SuperSheep,
-
-        /// <summary>
-        /// The Mole Bomb weapon.
-        /// </summary>
+        /// <summary>The Mole Bomb weapon.</summary>
         MoleBomb,
-
-        /// <summary>
-        /// The Jetpack utility.
-        /// </summary>
+        /// <summary>The Jetpack utility.</summary>
         Jetpack,
-
-        /// <summary>
-        /// The Low Gravity utility.
-        /// </summary>
+        /// <summary>The Low Gravity utility.</summary>
         LowGravity,
-
-        /// <summary>
-        /// The Laser Sight utility.
-        /// </summary>
+        /// <summary>The Laser Sight utility.</summary>
         LaserSight,
-
-        /// <summary>
-        /// The Fast Walk utility.
-        /// </summary>
+        /// <summary>The Fast Walk utility.</summary>
         FastWalk,
-
-        /// <summary>
-        /// The Invisibility utility.
-        /// </summary>
+        /// <summary>The Invisibility utility.</summary>
         Invisibility,
-
-        /// <summary>
-        /// The Damage x2 utility.
-        /// </summary>
+        /// <summary>The Damage x2 utility.</summary>
         DamageX2,
-
-        /// <summary>
-        /// The Freeze super weapon.
-        /// </summary>
+        /// <summary>The Freeze super weapon.</summary>
         Freeze,
-
-        /// <summary>
-        /// The Super Banana Bomb super weapon.
-        /// </summary>
+        /// <summary>The Super Banana Bomb super weapon.</summary>
         SuperBananaBomb,
-
-        /// <summary>
-        /// The Mine Strike super weapon.
-        /// </summary>
+        /// <summary>The Mine Strike super weapon.</summary>
         MineStrike,
-
-        /// <summary>
-        /// The Girder Starter Pack super weapon.
-        /// </summary>
+        /// <summary>The Girder Starter Pack super weapon.</summary>
         GirderStarterPack,
-
-        /// <summary>
-        /// The Earthquake super weapon.
-        /// </summary>
+        /// <summary>The Earthquake super weapon.</summary>
         Earthquake,
-
-        /// <summary>
-        /// The Scales Of Justice super weapon.
-        /// </summary>
+        /// <summary>The Scales Of Justice super weapon.</summary>
         ScalesOfJustice,
-
-        /// <summary>
-        /// The Ming Vase super weapon.
-        /// </summary>
+        /// <summary>The Ming Vase super weapon.</summary>
         MingVase,
-
-        /// <summary>
-        /// The Mike's Carpet Bomb super weapon.
-        /// </summary>
+        /// <summary>The Mike's Carpet Bomb super weapon.</summary>
         MikesCarpetBomb,
-
-        /// <summary>
-        /// The Patsy's Magic Bullet super weapon.
-        /// </summary>
+        /// <summary>The Patsy's Magic Bullet super weapon.</summary>
         MagicBullet,
-
-        /// <summary>
-        /// The Indian Nuclear Test super weapon.
-        /// </summary>
+        /// <summary>The Indian Nuclear Test super weapon.</summary>
         NuclearTest,
-
-        /// <summary>
-        /// The Select Worm super weapon.
-        /// </summary>
+        /// <summary>The Select Worm super weapon.</summary>
         SelectWorm,
-
-        /// <summary>
-        /// The Salvation Army super weapon.
-        /// </summary>
+        /// <summary>The Salvation Army super weapon.</summary>
         SalvationArmy,
-
-        /// <summary>
-        /// The Mole Squadron super weapon.
-        /// </summary>
+        /// <summary>The Mole Squadron super weapon.</summary>
         MoleSquadron,
-
-        /// <summary>
-        /// The MB Bomb super weapon.
-        /// </summary>
+        /// <summary>The MB Bomb super weapon.</summary>
         MBBomb,
-
-        /// <summary>
-        /// The Concrete Donkey super weapon.
-        /// </summary>
+        /// <summary>The Concrete Donkey super weapon.</summary>
         ConcreteDonkey,
-
-        /// <summary>
-        /// The Suicide Bomber super weapon.
-        /// </summary>
+        /// <summary>The Suicide Bomber super weapon.</summary>
         SuicideBomber,
-
-        /// <summary>
-        /// The Sheep Strike super weapon.
-        /// </summary>
+        /// <summary>The Sheep Strike super weapon.</summary>
         SheepStrike,
-
-        /// <summary>
-        /// The Mail Strike super weapon.
-        /// </summary>
+        /// <summary>The Mail Strike super weapon.</summary>
         MailStrike,
-
-        /// <summary>
-        /// The Armageddon super weapon.
-        /// </summary>
+        /// <summary>The Armageddon super weapon.</summary>
         Armageddon
     }
 }
diff --git a/src/library/Syroot.Worms.Armageddon/SchemeWeapon.cs b/src/library/Syroot.Worms.Armageddon/SchemeWeapon.cs
new file mode 100644
index 0000000..abab23b
--- /dev/null
+++ b/src/library/Syroot.Worms.Armageddon/SchemeWeapon.cs
@@ -0,0 +1,25 @@
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace Syroot.Worms.Armageddon
+{
+    /// <summary>
+    /// Represents the configuration of a weapon. 
+    /// </summary>
+    [DebuggerDisplay("Ammo={Ammunition} Power={Power} Delay={Delay} Prob={Probability}")]
+    [StructLayout(LayoutKind.Sequential)]
+    public struct SchemeWeapon
+    {
+        // ---- FIELDS -------------------------------------------------------------------------------------------------
+
+        /// <summary>Amount with which a team is equipped at game start. 10 and negative values represent infinity.</summary>
+        public sbyte Ammunition;
+        /// <summary>Power of this weapon.</summary>
+        public byte Power;
+        /// <summary>Number of turns required to be taken by each team before this weapon becomes available. Negative
+        /// values represent infinity.</summary>
+        public sbyte Delay;
+        /// <summary>Percentual chance of this weapon to appear in crates. Has no effect for super weapons.</summary>
+        public sbyte Probability;
+    }
+}
diff --git a/src/library/Syroot.Worms.Armageddon/SchemeWeaponSetting.cs b/src/library/Syroot.Worms.Armageddon/SchemeWeaponSetting.cs
deleted file mode 100644
index 3f5d56f..0000000
--- a/src/library/Syroot.Worms.Armageddon/SchemeWeaponSetting.cs
+++ /dev/null
@@ -1,35 +0,0 @@
-using System.Diagnostics;
-using System.Runtime.InteropServices;
-
-namespace Syroot.Worms.Armageddon
-{
-    /// <summary>
-    /// Represents the configuration of a weapon. 
-    /// </summary>
-    [DebuggerDisplay("Ammo={Ammunition} Power={Power} Delay={Delay} Prob={Probability}")]
-    [StructLayout(LayoutKind.Sequential)]
-    public struct SchemeWeaponSetting
-    {
-        /// <summary>
-        /// The amount of this weapon with which a team is equipped at game start. 10 and negative values represent
-        /// infinity.
-        /// </summary>
-        public sbyte Ammunition;
-
-        /// <summary>
-        /// The power of this weapon.
-        /// </summary>
-        public byte Power;
-
-        /// <summary>
-        /// The number of turns required to be taken by each team before this weapon becomes available. Negative values
-        /// represent infinity.
-        /// </summary>
-        public sbyte Delay;
-
-        /// <summary>
-        /// The percentual chance of this weapon to appear in crates. Has no effect for super weapons.
-        /// </summary>
-        public sbyte Probability;
-    }
-}
diff --git a/src/library/Syroot.Worms.Armageddon/Syroot.Worms.Armageddon.csproj b/src/library/Syroot.Worms.Armageddon/Syroot.Worms.Armageddon.csproj
index 5e460aa..e7e9c10 100644
--- a/src/library/Syroot.Worms.Armageddon/Syroot.Worms.Armageddon.csproj
+++ b/src/library/Syroot.Worms.Armageddon/Syroot.Worms.Armageddon.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <AssemblyName>Syroot.Worms.Armageddon</AssemblyName>
     <Description>.NET library for loading and modifying files of Team17's Worms Armageddon.</Description>
-    <PackageReleaseNotes>Simplify scheme object count usage. Fix saving files. Uniquely leave open Stream instances when saving into them.</PackageReleaseNotes>
+    <PackageReleaseNotes>Simplify scheme fall damage and water rise usage.</PackageReleaseNotes>
     <PackageTags>$(PackageTags);worms armageddon</PackageTags>
   </PropertyGroup>
   <ItemGroup>