Merge branch 'pvpoke:master' into master

Author: chrisisth

src/data/gamemaster.json

@@ -26266,8 +26266,9 @@
             "hp": 181
         },
         "types": ["bug", "grass"],
-        "fastMoves": ["RAZOR_LEAF", "BUG_BITE"],
+        "fastMoves": ["RAZOR_LEAF", "BUG_BITE", "SHADOW_CLAW"],
         "chargedMoves": ["LEAF_BLADE", "X_SCISSOR", "SILVER_WIND", "LEAF_STORM"],
+        "eliteMoves": ["SHADOW_CLAW"],
         "defaultIVs": {
             "cp500": [7.5, 5, 12, 5],
             "cp1500": [22, 4, 9, 11],
@@ -36651,6 +36652,13 @@
             "cp1500": [29, 5, 15, 8],
             "cp2500": [50, 15, 15, 15]
         },
+        "formChange": {
+            "type": "toggle",
+            "trigger": "charged_move",
+            "moveId": "ANY",
+            "defaultFormId": "morpeko_full_belly",
+            "alternativeFormId": "morpeko_hangry"
+        },
         "searchPriority": 3,
         "buddyDistance": 3,
         "thirdMoveCost": 50000,
@@ -40478,11 +40486,7 @@
         "archetype": "Boost",
         "buffs": [1, 0],
         "buffTarget": "self",
-        "buffApplyChance": "1",
-        "formChange": {
-            "type": "set",
-            "formId": "morpeko_hangry"
-        }
+        "buffApplyChance": "1"
     }, {
         "moveId": "AURA_WHEEL_DARK",
         "name": "Aura Wheel",
@@ -40495,11 +40499,7 @@
         "archetype": "Boost",
         "buffs": [1, 0],
         "buffTarget": "self",
-        "buffApplyChance": "1",
-        "formChange": {
-            "type": "set",
-            "formId": "morpeko_full_belly"
-        }
+        "buffApplyChance": "1"
     }, {
         "moveId": "AURORA_BEAM",
         "name": "Aurora Beam",

src/data/gamemaster.min.json

@@ -130,11 +130,7 @@
     "archetype": "Boost",
 	"buffs": [1, 0],
     "buffTarget": "self",
-    "buffApplyChance": "1",
-	"formChange": {
-		"type": "set",
-		"formId": "morpeko_hangry"
-	}
+    "buffApplyChance": "1"
 }, {
     "moveId": "AURA_WHEEL_DARK",
     "name": "Aura Wheel",
@@ -147,11 +143,7 @@
     "archetype": "Boost",
 	"buffs": [1, 0],
     "buffTarget": "self",
-    "buffApplyChance": "1",
-	"formChange": {
-		"type": "set",
-		"formId": "morpeko_full_belly"
-	}
+    "buffApplyChance": "1"
 }, {
     "moveId": "AURORA_BEAM",
     "name": "Aurora Beam",

src/data/gamemaster/moves.json

@@ -25548,8 +25548,9 @@
         "hp": 181
     },
     "types": ["bug", "grass"],
-    "fastMoves": ["RAZOR_LEAF", "BUG_BITE"],
+    "fastMoves": ["RAZOR_LEAF", "BUG_BITE", "SHADOW_CLAW"],
     "chargedMoves": ["LEAF_BLADE", "X_SCISSOR", "SILVER_WIND", "LEAF_STORM"],
+	"eliteMoves": ["SHADOW_CLAW"],
     "defaultIVs": {
         "cp500": [7.5, 5, 12, 5],
         "cp1500": [22, 4, 9, 11],
@@ -35933,6 +35934,13 @@
         "cp1500": [29, 5, 15, 8],
         "cp2500": [50, 15, 15, 15]
     },
+	"formChange": {
+		"type": "toggle",
+		"trigger": "charged_move",
+		"moveId": "ANY",
+		"defaultFormId": "morpeko_full_belly",
+		"alternativeFormId": "morpeko_hangry"
+	},
 	"searchPriority": 3,
     "buddyDistance": 3,
     "thirdMoveCost": 50000,

src/data/gamemaster/pokemon.json

@@ -1,5 +1,5 @@
 <?php require_once 'modules/config.php';
-$SITE_VERSION = '1.32.1.16';
+$SITE_VERSION = '1.32.1.18';
 
 // This prevents caching on local testing
 if (strpos($WEB_ROOT, 'src') !== false) {

src/data/overrides/all/1500.json

@@ -2731,19 +2731,18 @@ function Battle(){
 		}
 
 		// Apply form changes
-		if(move.formChange){
-			switch(move.formChange.type){
-				case "set":
-				attacker.changeForm(move.formChange.formId);
-				break;
-			}
+		if(attacker.formChange){
+			if(attacker.formChange.trigger == "charged_move" && move.energy > 0 && (attacker.formChange.moveId == "ANY" || attacker.formChange.moveId == move.moveId)){
+				attacker.changeForm();
 
-			timelineDescriptions.push("Form Change");
-			self.logDecision(turns, attacker, " has changed forms into " + attacker.activeFormId);
+				timelineDescriptions.push("Form Change");
+				self.logDecision(turns, attacker, " has changed forms into " + attacker.activeFormId);
 
-			if(mode == "emulate"){
-				self.pushAnimation(attacker.index, "formchange", attacker.activeFormId);
+				if(mode == "emulate"){
+					self.pushAnimation(attacker.index, "formchange", attacker.activeFormId);
+				}
 			}
+
 		}
 
 		timeline.push(new TimelineEvent(type, move.name, attacker.index, displayTime, turns, timelineDescriptions));

src/data/overrides/sunshine/1500.json

@@ -71,6 +71,10 @@ function Pokemon(id, i, b){
 		this.family = data.family;
 	}
 
+	if(data.formChange){
+		this.formChange = data.formChange;
+	}
+
 	this.typeEffectiveness = getTypeEffectivenessArray(b);
 
 	this.fastMove = null;
@@ -2272,7 +2276,15 @@ function Pokemon(id, i, b){
 
 	// Change the Pokemon's form during battle
 
-	this.changeForm = function(formId){
+	this.changeForm = function(id){
+		id = typeof id !== 'undefined' ? id : null;
+
+		var formId = id;
+
+		if(this.formChange.type == "toggle"){
+			formId = this.activeFormId == this.formChange.defaultFormId ? this.formChange.alternativeFormId : this.formChange.defaultFormId;
+		}
+
 		var form = gm.getPokemonById(formId);
 
 		this.speciesName = form.speciesName;

src/data/rankings/all/attackers/rankings-10000.json

@@ -2,6 +2,14 @@
 <rss version="2.0">
 
 	<channel>
+		<item>
+			<title>Leavanny Rankings</title>
+			<description>
+				<![CDATA[Sewaddle Community Day this Saturday brings Shadow Claw to Leavanny! It'll be a spicy pick that may even see some themed cup play thanks to Leaf Blade and X-Scissor, both powerful 35-energy attacks. It won't stick around the battlefield for a long time, but it'll be a fun one!]]>
+			</description>
+			<link>https://pvpoke.com/rankings/all/1500/overall/leavanny/</link>
+			<pubDate>Thu, 03 Oct 2024 22:56:55 GMT</pubDate>
+		</item>
 		<item>
 			<title>Sunshine Cup Rankings</title>
 			<description>
@@ -122,14 +130,6 @@
 			<link>https://pvpoke.com/train/analysis/</link>
 			<pubDate>Mon, 24 Jun 2024 19:03:55 GMT</pubDate>
 		</item>
-		<item>
-			<title>Great League Ranking Updates</title>
-			<description>
-				<![CDATA[With NAIC behind us, I've brushed up the Great League rankings and meta group based on early usage so far. I've also adjusted a few recommended movesets—Cresselia is now back to Moonblast and Talonflame features a double Flying moveset that has been prominent in tournament play. As always, the rankings are just a starting point. Good luck in your upcoming battles!]]>
-			</description>
-			<link>https://pvpoke.com/rankings/all/1500/overall/</link>
-			<pubDate>Tue, 18 Jun 2024 01:03:30 GMT</pubDate>
-		</item>
 
 		<title>PvPoke</title>
 		<link>https://pvpoke.com/</link>