From b3c0f602398cc96cdea77829e70a2f4690a37920 Mon Sep 17 00:00:00 2001
From: Marty-D <math_man70@hotmail.com>
Date: Fri, 8 May 2015 12:20:51 -0400
Subject: [PATCH] Gen II: Fix critical hit ratios

- High crit moves start at stage 2 (stage 0 being normal moves)
- Focus Energy adds 1 stage
- Lucky Punch and Stick set the stage at 2 and skip the other effects
- Sky Attack is not a high crit move
- Also fix Razor Wind's accuracy
---
 mods/gen1/moves.js | 12 ++++++++----
 mods/gen2/items.js | 16 ++++++++++++++++
 mods/gen2/moves.js | 42 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/mods/gen1/moves.js b/mods/gen1/moves.js
index ec238024c308..ead345cf22b1 100644
--- a/mods/gen1/moves.js
+++ b/mods/gen1/moves.js
@@ -214,6 +214,10 @@ exports.BattleMovedex = {
 			return false;
 		}
 	},
+	crabhammer: {
+		inherit: true,
+		critRatio: 2
+	},
 	dig: {
 		inherit: true,
 		basePower: 100,
@@ -439,6 +443,7 @@ exports.BattleMovedex = {
 	},
 	karatechop: {
 		inherit: true,
+		critRatio: 2,
 		type: "Normal"
 	},
 	leechseed: {
@@ -631,11 +636,11 @@ exports.BattleMovedex = {
 	},
 	razorleaf: {
 		inherit: true,
+		critRatio: 2,
 		target: "normal"
 	},
 	razorwind: {
 		inherit: true,
-		accuracy: 75,
 		critRatio: 1,
 		target: "normal"
 	},
@@ -744,10 +749,9 @@ exports.BattleMovedex = {
 			return null;
 		}
 	},
-	skyattack: {
+	slash: {
 		inherit: true,
-		critRatio: 1,
-		secondary: {}
+		critRatio: 2
 	},
 	softboiled: {
 		inherit: true,
diff --git a/mods/gen2/items.js b/mods/gen2/items.js
index 3d44e193178a..5113b98ac6b2 100644
--- a/mods/gen2/items.js
+++ b/mods/gen2/items.js
@@ -81,6 +81,14 @@ exports.BattleItems = {
 		onModifyAtk: function () {},
 		onModifySpA: function () {}
 	},
+	luckypunch: {
+		inherit: true,
+		onModifyMove: function (move, user) {
+			if (user.template.species === 'Chansey') {
+				move.critRatio = 3;
+			}
+		}
+	},
 	lumberry: {
 		inherit: true,
 		gen: 2
@@ -127,6 +135,14 @@ exports.BattleItems = {
 		inherit: true,
 		gen: 2
 	},
+	stick: {
+		inherit: true,
+		onModifyMove: function (move, user) {
+			if (user.template.species === 'Farfetch\'d') {
+				move.critRatio = 3;
+			}
+		}
+	},
 	thickclub: {
 		inherit: true,
 		// On Gen 2 this happens in stat calculation directly.
diff --git a/mods/gen2/moves.js b/mods/gen2/moves.js
index e0fa3a69fb6a..3fc93250fdb7 100644
--- a/mods/gen2/moves.js
+++ b/mods/gen2/moves.js
@@ -2,6 +2,10 @@
  * Gen 2 moves
  */
 exports.BattleMovedex = {
+	aeroblast: {
+		inherit: true,
+		critRatio: 3
+	},
 	bellydrum: {
 		inherit: true,
 		onHit: function (target) {
@@ -29,6 +33,14 @@ exports.BattleMovedex = {
 		onTryHit: function () {},
 		effect: {}
 	},
+	crabhammer: {
+		inherit: true,
+		critRatio: 3
+	},
+	crosschop: {
+		inherit: true,
+		critRatio: 3
+	},
 	dig: {
 		inherit: true,
 		effect: {
@@ -119,6 +131,18 @@ exports.BattleMovedex = {
 			}
 		}
 	},
+	focusenergy: {
+		inherit: true,
+		effect: {
+			onStart: function (pokemon) {
+				this.add('-start', pokemon, 'move: Focus Energy');
+			},
+			onModifyMovePriority: 1,
+			onModifyMove: function (move) {
+				move.critRatio += 1;
+			}
+		}
+	},
 	highjumpkick: {
 		inherit: true,
 		onMoveFail: function (target, source, move) {
@@ -137,6 +161,10 @@ exports.BattleMovedex = {
 			}
 		}
 	},
+	karatechop: {
+		inherit: true,
+		critRatio: 3
+	},
 	leechseed: {
 		inherit: true,
 		onHit: function () {},
@@ -264,6 +292,15 @@ exports.BattleMovedex = {
 		// Disable does not build
 		inherit: true
 	},
+	razorleaf: {
+		inherit: true,
+		critRatio: 3
+	},
+	razorwind: {
+		inherit: true,
+		accuracy: 75,
+		critRatio: 3
+	},
 	reflect: {
 		inherit: true,
 		effect: {
@@ -316,8 +353,13 @@ exports.BattleMovedex = {
 	},
 	skyattack: {
 		inherit: true,
+		critRatio: 1,
 		secondary: {}
 	},
+	slash: {
+		inherit: true,
+		critRatio: 3
+	},
 	sleeptalk: {
 		inherit: true,
 		onHit: function (pokemon) {