From f3e3ca8a419d568d5d6d47726e6b0dc63c3b6bab Mon Sep 17 00:00:00 2001
From: WarriorGallade <100499523+WarriorGallade@users.noreply.github.com>
Date: Tue, 20 Feb 2024 17:55:28 +0530
Subject: [PATCH 1/2] Add Siegfried

---
 data/mods/gen9ssb/abilities.ts    | 16 ++++++++++++++++
 data/mods/gen9ssb/conditions.ts   | 12 ++++++++++++
 data/mods/gen9ssb/moves.ts        | 31 +++++++++++++++++++++++++++++++
 data/mods/gen9ssb/pokedex.ts      |  6 ++++++
 data/mods/gen9ssb/random-teams.ts |  6 ++++++
 5 files changed, 71 insertions(+)

diff --git a/data/mods/gen9ssb/abilities.ts b/data/mods/gen9ssb/abilities.ts
index 393fd4d8d..9fba3ca59 100644
--- a/data/mods/gen9ssb/abilities.ts
+++ b/data/mods/gen9ssb/abilities.ts
@@ -1097,6 +1097,22 @@ export const Abilities: {[k: string]: ModdedAbilityData} = {
 		flags: {},
 	},
 
+	// Siegfried
+	magicalmysterycharge: {
+		shortDesc: "Summons Electric Terrain upon switch-in, +1 boost to Sp. Def during Electric Terrain.",
+		name: "Magical Mystery Charge",
+		onStart(source) {
+			this.field.setTerrain('electricterrain');
+		},
+		onModifySpDPriority: 5,
+		onModifySpD(spd, pokemon) {
+			if (this.field.isTerrain('electricterrain')) {
+				return this.chainModify(1.5);
+			}
+		},
+		flags: {},
+	},
+
 	// Sulo
 	protectionofthegelatin: {
 		shortDesc: "Magic Guard + Stamina",
diff --git a/data/mods/gen9ssb/conditions.ts b/data/mods/gen9ssb/conditions.ts
index a92303715..c867dc00a 100644
--- a/data/mods/gen9ssb/conditions.ts
+++ b/data/mods/gen9ssb/conditions.ts
@@ -828,6 +828,18 @@ export const Conditions: {[k: string]: ModdedConditionData & {innateName?: strin
 		innateName: "Rough and Tumble",
 		shortDesc: "Changes Sneasel forme on switch out.",
 	},
+	siegfried: {
+		noCopy: true,
+		onStart() {
+			this.add(`c:|${getName('Siegfried')}|You say goodbye and I say hello`);
+		},
+		onSwitchOut() {
+			this.add(`c:|${getName('Siegfried')}|Oh, I get by with a little help from my friends.`);
+		},
+		onFaint() {
+			this.add(`c:|${getName('Siegfried')}|Living is easy with eyes closed.`);
+		},
+	},
 	snake: {
 		noCopy: true,
 		onStart() {
diff --git a/data/mods/gen9ssb/moves.ts b/data/mods/gen9ssb/moves.ts
index a5e74a116..c34574296 100644
--- a/data/mods/gen9ssb/moves.ts
+++ b/data/mods/gen9ssb/moves.ts
@@ -1976,6 +1976,37 @@ export const Moves: {[k: string]: ModdedMoveData} = {
 		type: "Rock",
 	},
 
+	// Siegfried
+	boltbeam: {
+		accuracy: 100,
+		basePower: 0,
+		category: "Status",
+		shortDesc: "Uses Thunderbolt and Ice Beam in succession, at half power.",
+		name: "BoltBeam",
+		pp: 15,
+		priority: 0,
+		flags: {},
+		onTryMove() {
+			this.attrLastMove('[still]');
+		},
+		onTryHit(target) {
+			target.addVolatile('boltbeam');
+			this.actions.useMove("thunderbolt", target);
+			this.actions.useMove("icebeam", target);
+			return null;
+		},
+		condition: {
+			duration: 1,
+			onBasePowerPriority: 12,
+			onBasePower(basePower) {
+				return this.chainModify(0.5);
+			},
+		},
+		secondary: null,
+		target: "self",
+		type: "Electric",
+	},
+
 	// snake
 	conceptrelevant: {
 		accuracy: 100,
diff --git a/data/mods/gen9ssb/pokedex.ts b/data/mods/gen9ssb/pokedex.ts
index 327619e67..47f8bdc98 100644
--- a/data/mods/gen9ssb/pokedex.ts
+++ b/data/mods/gen9ssb/pokedex.ts
@@ -319,6 +319,12 @@ export const Pokedex: {[k: string]: ModdedSpeciesData} = {
 		abilities: {0: "Rough and Tumble"},
 	},
 
+	// Siegfried
+	ampharosmega: {
+		inherit: true,
+		abilities: {0: "Magical Mystery Charge"},
+	},
+
 	// spoo
 	mumbao: {
 		inherit: true,
diff --git a/data/mods/gen9ssb/random-teams.ts b/data/mods/gen9ssb/random-teams.ts
index 343e59bd0..64f33ce06 100644
--- a/data/mods/gen9ssb/random-teams.ts
+++ b/data/mods/gen9ssb/random-teams.ts
@@ -356,6 +356,12 @@ export const ssbSets: SSBSets = {
 		signatureMove: 'Purification',
 		evs: {hp: 252, def: 252, spd: 4}, nature: 'Bold', teraType: 'Water',
 	},
+	Siegfried: {
+		species: 'Ampharos', ability: 'Static', item: 'Ampharosite', gender: 'M',
+		moves: ['Calm Mind', 'Thunderclap', 'Ice Beam'],
+		signatureMove: 'BoltBeam',
+		evs: {hp: 252, spa: 252, spd: 4}, ivs: {atk: 0}, nature: 'Modest', shiny: 64,
+	},
 	sharp_claw: {
 		species: 'Sneasel', ability: 'Regenerator', item: 'Heavy-Duty Boots', gender: 'F',
 		moves: ['Knock Off', 'Ice Spinner', 'Ice Shard'],

From 29eb34fc9b58ef7ea7231e0265f6a0c358ad662a Mon Sep 17 00:00:00 2001
From: WarriorGallade <100499523+WarriorGallade@users.noreply.github.com>
Date: Tue, 20 Feb 2024 18:00:45 +0530
Subject: [PATCH 2/2] Update moveset

---
 data/mods/gen9ssb/random-teams.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/gen9ssb/random-teams.ts b/data/mods/gen9ssb/random-teams.ts
index 64f33ce06..ab7e2780d 100644
--- a/data/mods/gen9ssb/random-teams.ts
+++ b/data/mods/gen9ssb/random-teams.ts
@@ -358,7 +358,7 @@ export const ssbSets: SSBSets = {
 	},
 	Siegfried: {
 		species: 'Ampharos', ability: 'Static', item: 'Ampharosite', gender: 'M',
-		moves: ['Calm Mind', 'Thunderclap', 'Ice Beam'],
+		moves: ['Calm Mind', 'Thunderclap', 'Draco Meteor'],
 		signatureMove: 'BoltBeam',
 		evs: {hp: 252, spa: 252, spd: 4}, ivs: {atk: 0}, nature: 'Modest', shiny: 64,
 	},