From ffbccc2a20768dcd2cd0ace40b5af096bd207b59 Mon Sep 17 00:00:00 2001
From: Guangcong Luo <guangcongluo@gmail.com>
Date: Wed, 30 Dec 2015 14:46:46 -0600
Subject: [PATCH] NEXT updates

- Give priority to Heal Order and Defend Order
- Swarm negates Flying weaknesses for Flying-types
- Vespiquen gets Swarm
- Jump Kick now 100% accurate (it's not overpowered so it doesn't
  really need an exception)
---
 mods/gennext/README.md    | 17 ++++++++++-------
 mods/gennext/abilities.js | 28 ++++++++++++++++++----------
 mods/gennext/moves.js     | 36 ++++++++++++++++++++++++++++++++++++
 mods/gennext/scripts.js   |  3 +++
 4 files changed, 67 insertions(+), 17 deletions(-)

diff --git a/mods/gennext/README.md b/mods/gennext/README.md
index a50f2acf3f..e95c271aca 100644
--- a/mods/gennext/README.md
+++ b/mods/gennext/README.md
@@ -113,6 +113,9 @@ Major changes:
   double SR damage, heals 1/16 after using a Status move, and makes Twister
   do 1.5x Damage.
 
+- Swarm also makes the user take half damage from Rock, Ice, Electric moves,
+  and Stealth Rock if they are Flying type.
+
 - Relic Song switches Meloetta's SpA and Atk EVs, boosts, and certain natures,
   specifically: Modest <-> Adamant, Jolly <-> Timid, other natures are left
   untouched. It's now 60 base power +1 priority, with no secondary.
@@ -139,7 +142,7 @@ Major changes:
 
 - Twister is now a 80 base power Flying move with a 30% confusion chance
 
-- - Floette-Eternal-Flower and Volcanion are released.
+- Floette-Eternal-Flower and Volcanion are released.
 
 New mechanic: Signature Pokémon:
 
@@ -255,6 +258,11 @@ Minor move changes:
 - Parabolic Charge now has 40 base power, but gives -1 SpA, -1 SpD to the
   target and +1 SpA, +1 SpD to the user
 
+- Draining Kiss now has 40 base power, but gives -1 SpA, -1 Atk to the
+  target and +1 SpA, +1 Atk to the user
+
+- Defend Order and Heal Order now have +1 priority
+
 - Rock Throw now removes Stealth Rock from the user's side of the field,
   and has 100% accuracy
 
@@ -264,7 +272,7 @@ Minor move changes:
   Helmet etc. And double in power if they remove hazards.
 
 - All moves' accuracy is rounded up to the nearest multiple of 10%
-  (except Jump Kick, which will be rebalanced later)
+  (including Jump Kick)
 
 - Charge Beam and Rock Slide are now 100% accurate
 
@@ -409,11 +417,6 @@ Minor learnset changes:
 
 Minor ability changes:
 
-- Justified now caps base power to 100 against non-Dark foes:
-  Musketeers are recommended to use Sacred Sword over Close Combat and
-  Surf over Hydro Pump, other Pokémon are recommended not to use
-  Justified
-
 - Static, Poison Point, and Cute Charm now always activate on
   contact.
 
diff --git a/mods/gennext/abilities.js b/mods/gennext/abilities.js
index fae341cf0a..2fcc79c467 100644
--- a/mods/gennext/abilities.js
+++ b/mods/gennext/abilities.js
@@ -549,6 +549,24 @@ exports.BattleAbilities = {
 			}
 		}
 	},
+	"swarm": {
+		inherit: true,
+		onFoeBasePower: function (basePower, attacker, defender, move) {
+			if (defender.hasType('Flying')) {
+				if (move.type === 'Rock' || move.type === 'Electric' || move.type === 'Ice') {
+					this.add('-message', "The attack was weakened by Swarm!");
+					return basePower / 2;
+				}
+			}
+		},
+		onDamage: function (damage, defender, attacker, effect) {
+			if (defender.hasType('Flying')) {
+				if (effect && effect.id === 'stealthrock') {
+					return damage / 2;
+				}
+			}
+		},
+	},
 	"adaptability": {
 		inherit: true,
 		onModifyMove: function (move) {},
@@ -580,15 +598,5 @@ exports.BattleAbilities = {
 				pokemon.maybeTrapped = true;
 			}
 		}
-	},
-	"justified": {
-		inherit: true,
-		onBasePowerPriority: 100,
-		onBasePower: function (power, attacker, defender) {
-			if (power > 100 && !defender.hasType('Dark')) {
-				this.debug('capping base power at 100');
-				return 100;
-			}
-		}
 	}
 };
diff --git a/mods/gennext/moves.js b/mods/gennext/moves.js
index eec00d185c..0fbab1e536 100644
--- a/mods/gennext/moves.js
+++ b/mods/gennext/moves.js
@@ -756,6 +756,21 @@ exports.BattleMovedex = {
 		secondary: null
 	},
 	/******************************************************************
+	Defend Order, Heal Order:
+	- now +1 priority
+
+	Justification:
+	- Vespiquen needs viability
+	******************************************************************/
+	defendorder: {
+		inherit: true,
+		priority: 1
+	},
+	healorder: {
+		inherit: true,
+		priority: 1
+	},
+	/******************************************************************
 	Stealth Rock:
 	- 1/4 damage to Flying-types, 1/8 damage to everything else
 
@@ -1529,6 +1544,10 @@ exports.BattleMovedex = {
 	- Rock Slide is included for being similar enough to Air Slash
 	- Charge Beam is included because its 30% chance of no boost is enough
 	******************************************************************/
+	jumpkick: {
+		inherit: true,
+		accuracy: 100
+	},
 	razorshell: {
 		inherit: true,
 		accuracy: 100
@@ -1817,6 +1836,23 @@ exports.BattleMovedex = {
 			}
 		}
 	},
+	drainingkiss: {
+		inherit: true,
+		basePower: 40,
+		secondary: {
+			chance: 100,
+			boosts: {
+				spa: -1,
+				atk: -1
+			},
+			self: {
+				boosts: {
+					spa: 1,
+					atk: 1
+				}
+			}
+		}
+	},
 	stomp: {
 		inherit: true,
 		basePower: 100,
diff --git a/mods/gennext/scripts.js b/mods/gennext/scripts.js
index 6cbd2070e5..e55231a0dd 100644
--- a/mods/gennext/scripts.js
+++ b/mods/gennext/scripts.js
@@ -119,6 +119,9 @@ exports.BattleScripts = {
 		// Adaptability change
 		this.modData('Pokedex', 'crawdaunt').abilities['H'] = 'Tough Claws';
 
+		// Vespiquen
+		this.modData('Pokedex', 'vespiquen').abilities['1'] = 'Swarm';
+
 		// Every hidden ability becomes released
 		for (let i in this.data.FormatsData) {
 			this.modData('FormatsData', i).unreleasedHidden = false;