From 33be9cc5a5ba0f2bf3360aaa85bfdfa8fcae3bf3 Mon Sep 17 00:00:00 2001
From: Marty-D <math_man70@hotmail.com>
Date: Fri, 17 Nov 2017 18:13:19 -0500
Subject: [PATCH] Fix spread moves' self-boost behaviour

---
 data/moves.js   | 56 ++++++++++++++++++++++++-------------------------
 data/scripts.js |  1 +
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/data/moves.js b/data/moves.js
index 2ba3382e58..92a3e0dc3c 100644
--- a/data/moves.js
+++ b/data/moves.js
@@ -2303,7 +2303,7 @@ exports.BattleMovedex = {
 		pp: 5,
 		priority: 0,
 		flags: {protect: 1, mirror: 1, sound: 1, authentic: 1},
-		self: {
+		selfBoost: {
 			boosts: {
 				def: -1,
 			},
@@ -2314,6 +2314,33 @@ exports.BattleMovedex = {
 		zMovePower: 185,
 		contestType: "Tough",
 	},
+	"clangoroussoulblaze": {
+		num: 728,
+		accuracy: true,
+		basePower: 185,
+		category: "Special",
+		desc: "Boosts the user's Attack, Defense, Sp. Atk, Sp. Def, and Speed by one stage.",
+		shortDesc: "Boosts all stats 1 stage. Hits adjacent foes.",
+		id: "clangoroussoulblaze",
+		name: "Clangorous Soulblaze",
+		pp: 1,
+		priority: 0,
+		flags: {sound: 1, authentic: 1},
+		selfBoost: {
+			boosts: {
+				atk: 1,
+				def: 1,
+				spa: 1,
+				spd: 1,
+				spe: 1,
+			},
+		},
+		isZ: "kommoniumz",
+		secondary: false,
+		target: "allAdjacentFoes",
+		type: "Dragon",
+		contestType: "Cool",
+	},
 	"clearsmog": {
 		num: 499,
 		accuracy: true,
@@ -3704,33 +3731,6 @@ exports.BattleMovedex = {
 		zMovePower: 195,
 		contestType: "Beautiful",
 	},
-	"clangoroussoulblaze": {
-		num: 728,
-		accuracy: true,
-		basePower: 185,
-		category: "Special",
-		desc: "Boosts the user's Attack, Defense, Sp. Atk, Sp. Def, and Speed by one stage.",
-		shortDesc: "Boosts all stats 1 stage. Hits adjacent foes.",
-		id: "clangoroussoulblaze",
-		name: "Clangorous Soulblaze",
-		pp: 1,
-		priority: 0,
-		flags: {sound: 1, authentic: 1},
-		self: {
-			boosts: {
-				atk: 1,
-				def: 1,
-				spa: 1,
-				spd: 1,
-				spe: 1,
-			},
-		},
-		isZ: "kommoniumz",
-		secondary: false,
-		target: "allAdjacentFoes",
-		type: "Dragon",
-		contestType: "Cool",
-	},
 	"dragonascent": {
 		num: 620,
 		accuracy: 100,
diff --git a/data/scripts.js b/data/scripts.js
index 9c492d3ddf..8331327bd0 100644
--- a/data/scripts.js
+++ b/data/scripts.js
@@ -290,6 +290,7 @@ exports.BattleScripts = {
 			damage = this.tryMoveHit(target, pokemon, move);
 			if (damage || damage === 0 || damage === undefined) moveResult = true;
 		}
+		if (move.selfBoost && moveResult) this.moveHit(pokemon, pokemon, move, move.selfBoost, false, true);
 		if (!pokemon.hp) {
 			this.faint(pokemon, pokemon, move);
 		}