Merge pull request Kitteh6660#21 from Ormael7/master-wip

Master wip

classes/classes/CharSpecial.as

@@ -1680,7 +1680,7 @@ import classes.Items.*;
 			player.setJewelry(jewelries.MSIGNIT);
 			player.setUndergarment(undergarments.C_LOIN);
 			player.createKeyItem("Dark Mage’s Grimoire",0,0,0,0);
-			if (player.hasKeyItem("Backpack") < 0) player.createKeyItem("Backpack", 3, 0, 0, 0);
+			if (player.hasKeyItem("Backpack") < 0) player.createKeyItem("Backpack", 4, 0, 0, 0);
 			player.itemSlot1.setItemAndQty(consumables.H_BISCU, 5);
 
 			if (!player.hasPerk(PerkLib.PastLifeScholar)) player.createPerk(PerkLib.HistoryScholar, 0, 0, 0, 0);

classes/classes/Items/JewelryLib.as

@@ -86,6 +86,7 @@ package classes.Items
 		public const RINGSTR:RingOfStrength = new RingOfStrength();
 		public const RINGTOU:RingOfToughness = new RingOfToughness();
 		public const RINGWIS:RingOfWisdom = new RingOfWisdom();
+		public const EZEKIELS:Jewelry = new Jewelry("EzekielS", "EzekielSignet", "Ezekiel's Signet", "an Ezekiel's Signet", 0, 0, 100, "A signet rumored to be blessed by the Ezekiel himself. Is that real one or just another fake signet merchant sold you?","Ring");
 		//public const RINGWIS:Bullseye = new RingWisdom();
 
 		//Normal ring

classes/classes/Items/Weapons/AngstDaggers.as

@@ -27,7 +27,7 @@ package classes.Items.Weapons
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldSmall) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of weapons!  ");
 			return false;
 		}

classes/classes/Items/Weapons/DualBFSword.as

@@ -1,31 +1,31 @@
-/**
- * ...
- * @author Ormael
- */
-package classes.Items.Weapons
-{
-	import classes.Items.Weapon;
-	import classes.PerkLib;
-	import classes.Player;
-
-	public class DualBFSword extends Weapon {
-
-		public function DualBFSword() {
-			super("DBFSwo", "D.B.F.Sword", "dual big fucking swords", "a pair of big fucking swords", "slash", 50, 4000, "Big Fucking Swords - the best solution for a tiny e-pen complex at this side of the Mareth!  This pair of 2H 2,5 meters long swords requires 150 strength to fully unleash it power.", "Dual Large");
-		}
-
-		override public function get attack():Number {
-			var boost:int = 0;
-			if (game.player.str >= 150) boost += 20;
-			if (game.player.str >= 100) boost += 15;
-			if (game.player.str >= 50) boost += 10;
-			return (5 + boost); 
-		}
-
-		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldLarge) >= 0) return true;
-			outputText("You aren't skilled enough to handle this pair of weapons!  ");
-			return false;
-		}
-	}
+/**
+ * ...
+ * @author Ormael
+ */
+package classes.Items.Weapons
+{
+	import classes.Items.Weapon;
+	import classes.PerkLib;
+	import classes.Player;
+
+	public class DualBFSword extends Weapon {
+
+		public function DualBFSword() {
+			super("DBFSwo", "D.B.F.Sword", "dual big fucking swords", "a pair of big fucking swords", "slash", 50, 4000, "Big Fucking Swords - the best solution for a tiny e-pen complex at this side of the Mareth!  This pair of 2H 2,5 meters long swords requires 150 strength to fully unleash it power.", "Dual Large");
+		}
+
+		override public function get attack():Number {
+			var boost:int = 0;
+			if (game.player.str >= 150) boost += 20;
+			if (game.player.str >= 100) boost += 15;
+			if (game.player.str >= 50) boost += 10;
+			return (5 + boost); 
+		}
+
+		override public function canUse():Boolean {
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
+			outputText("You aren't skilled enough to handle this pair of weapons!  ");
+			return false;
+		}
+	}
 }

classes/classes/Items/Weapons/DualBFWhip.as

@@ -34,7 +34,7 @@ package classes.Items.Weapons
         }
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldLarge) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of weapons!  ");
 			return false;
 		}

classes/classes/Items/Weapons/DualDaggers.as

@@ -16,7 +16,7 @@ package classes.Items.Weapons
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldSmall) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of weapons!  ");
 			return false;
 		}

classes/classes/Items/Weapons/DualHugeWarhammer.as

@@ -1,30 +1,30 @@
-/**
- * ...
- * @author Ormael
- */
-package classes.Items.Weapons 
-{
-	import classes.Items.Weapon;
-	import classes.PerkLib;
-	import classes.Player;
-
-	public class DualHugeWarhammer extends Weapon {
-
-		public function DualHugeWarhammer() 
-		{
-			super("D.WHam", "D.WarHam", "dual huge warhammer", "a dual huge warhammer", "smash", 15, 2400, "A pair of huge war-hammers made almost entirely of steel that only the strongest warriors could use.  Getting hit with this might stun the victim.", "Dual Large");
-		}
-
-		override public function get attack():Number {
-			var boost:int = 0;
-			if (game.player.str >= 80) boost += 8;
-			return (7 + boost); 
-		}
-
-		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldLarge) >= 0) return true;
-			outputText("You aren't skilled enough to handle this pair of weapons!  ");
-			return false;
-		}
-	}
+/**
+ * ...
+ * @author Ormael
+ */
+package classes.Items.Weapons 
+{
+	import classes.Items.Weapon;
+	import classes.PerkLib;
+	import classes.Player;
+
+	public class DualHugeWarhammer extends Weapon {
+
+		public function DualHugeWarhammer() 
+		{
+			super("D.WHam", "D.WarHam", "dual huge warhammer", "a dual huge warhammer", "smash", 15, 2400, "A pair of huge war-hammers made almost entirely of steel that only the strongest warriors could use.  Getting hit with this might stun the victim.", "Dual Large");
+		}
+
+		override public function get attack():Number {
+			var boost:int = 0;
+			if (game.player.str >= 80) boost += 8;
+			return (7 + boost); 
+		}
+
+		override public function canUse():Boolean {
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
+			outputText("You aren't skilled enough to handle this pair of weapons!  ");
+			return false;
+		}
+	}
 }

classes/classes/Items/Weapons/DualLargeAxe.as

@@ -21,7 +21,7 @@ package classes.Items.Weapons
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldLarge) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of weapons!  ");
 			return false;
 		}	

classes/classes/Items/Weapons/DualSuccubiWhip.as

@@ -1,25 +1,31 @@
-/**
- * ...
- * @author Ormael
- */
-package classes.Items.Weapons 
-{
-	import classes.PerkLib;
-	import classes.Player;
-	import classes.Items.Weapon;
-
-	public class DualSuccubiWhip extends Weapon
-	{
-
-		public function DualSuccubiWhip() 
-		{
-			super("PSWhip","P.SucWhip","pair of succubi whips","a pair of succubi whips","sexy whipping",10,800,"This pair of coiled length of midnight-black leather practically exudes lust.  Though it looks like it could do a lot of damage, the feel of that slick leather impacting flesh is sure to inspire lust.  However, it might slowly warp the mind of wielder.");
-		}
-
-		override public function get attack():Number {
-			var boost:int = 0;
-			if (game.player.findPerk(PerkLib.ArcaneLash) >= 0) boost += 8;
-			return (10 + boost); 
-		}
-	}
+/**
+ * ...
+ * @author Ormael
+ */
+package classes.Items.Weapons 
+{
+	import classes.PerkLib;
+	import classes.Player;
+	import classes.Items.Weapon;
+
+	public class DualSuccubiWhip extends Weapon
+	{
+
+		public function DualSuccubiWhip() 
+		{
+			super("PSWhip","P.SucWhip","pair of succubi whips","a pair of succubi whips","sexy whipping",10,800,"This pair of coiled length of midnight-black leather practically exudes lust.  Though it looks like it could do a lot of damage, the feel of that slick leather impacting flesh is sure to inspire lust.  However, it might slowly warp the mind of wielder.");
+		}
+
+		override public function get attack():Number {
+			var boost:int = 0;
+			if (game.player.findPerk(PerkLib.ArcaneLash) >= 0) boost += 8;
+			return (10 + boost); 
+		}
+
+		override public function canUse():Boolean {
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
+			outputText("You aren't skilled enough to handle this pair of weapons!  ");
+			return false;
+		}
+	}
 }

classes/classes/Items/Weapons/DualWhip.as

@@ -1,25 +1,31 @@
-/**
- * ...
- * @author Ormael
- */
-package classes.Items.Weapons 
-{
-	import classes.PerkLib;
-	import classes.Player;
-	import classes.Items.Weapon;
-
-	public class DualWhip extends Weapon
-	{
-
-		public function DualWhip() 
-		{
-			super("P.Whip ", "P.Whip", "pair of coiled whips", "a pair of coiled whips", "whip-crack", 5, 400, "A pair of coiled length of leather designed to lash your foes into submission.  There's a chance the bondage inclined might enjoy it!");
-		}
-
-		override public function get attack():Number {
-			var boost:int = 0;
-			if (game.player.findPerk(PerkLib.ArcaneLash) >= 0) boost += 2;
-			return (5 + boost); 
-		}
-	}
+/**
+ * ...
+ * @author Ormael
+ */
+package classes.Items.Weapons 
+{
+	import classes.PerkLib;
+	import classes.Player;
+	import classes.Items.Weapon;
+
+	public class DualWhip extends Weapon
+	{
+
+		public function DualWhip() 
+		{
+			super("P.Whip ", "P.Whip", "pair of coiled whips", "a pair of coiled whips", "whip-crack", 5, 400, "A pair of coiled length of leather designed to lash your foes into submission.  There's a chance the bondage inclined might enjoy it!");
+		}
+
+		override public function get attack():Number {
+			var boost:int = 0;
+			if (game.player.findPerk(PerkLib.ArcaneLash) >= 0) boost += 2;
+			return (5 + boost); 
+		}
+
+		override public function canUse():Boolean {
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
+			outputText("You aren't skilled enough to handle this pair of weapons!  ");
+			return false;
+		}
+	}
 }

classes/classes/Items/Weapons/NorthernerIcePicks.as

@@ -16,7 +16,7 @@ package classes.Items.Weapons
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldSmall) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of weapons!  ");
 			return false;
 		}

classes/classes/Items/WeaponsRange/TwinDartPistol.as

@@ -16,7 +16,7 @@ package classes.Items.WeaponsRange
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldFirearms) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of firearms!  ");
 			return false;
 		}

classes/classes/Items/WeaponsRange/TwinGrakaturd.as

@@ -16,7 +16,7 @@ package classes.Items.WeaponsRange
 		}
 
 		override public function canUse():Boolean {
-			if (game.player.findPerk(PerkLib.DualWieldFirearms) >= 0) return true;
+			if (game.player.findPerk(PerkLib.DualWield) >= 0) return true;
 			outputText("You aren't skilled enough to handle this pair of firearms!  ");
 			return false;
 		}

classes/classes/PerkLib.as

@@ -950,8 +950,8 @@ public class PerkLib
 				"Further increases dragon breath attacks power and allows to combine all 4 basic breath types more often. (+600% to dragon breaths damage, +10% of max core Spe as phantom Spe)",
 				"You've chosen the 'Draconic Lungs (Final Form)' perk. Further increases increases dragon breath attacks power and allows to combine all 4 basic breath types more often.").withBuffs({'spe.mult':0.20});
 		public static const DualWield:PerkType = mk("Dual Wield", "Dual Wield",
-				"Allows you to wield two normal sized melee weapons (excluding staffs).",
-				"You've chosen the 'Dual Wield' perk, training skill of using two melee weapons excluding staffs.");
+				"Allows you to wield two melee weapons.",
+				"You've chosen the 'Dual Wield' perk, training skill of using two melee weapons.");
 		public static const DualWieldFirearms:PerkType = mk("Dual Wield (Firearms)", "Dual Wield (Firearms)",
 				"Allows you to wield two firearms (non 2H ones).",
 				"You've chosen the 'Dual Wield (Firearms)' perk, training skill of using two firearms (non 2H ones).");