Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Some mon updates to prepare for the Halloween/Xmas seasons #104

Merged
merged 8 commits into from
Sep 24, 2023
Merged

Some mon updates to prepare for the Halloween/Xmas seasons #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
9832f46
PWT mons update
Torq-A Sep 15, 2023
54165b5
Update Rematch.yaml
Torq-A Sep 16, 2023
9a8b09f
Merge branch 'master' into master
Torq-A Sep 16, 2023
953bcea
Typo fixes
Torq-A Sep 16, 2023
2d53d18
Merge branch 'master' of https://github.com/Torq-A/pbr-movesets
Torq-A Sep 16, 2023
e654378
Extra stuff
Torq-A Sep 16, 2023
faf74f9
one more
Torq-A Sep 16, 2023
a861a83
PWT updates
Torq-A Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions pokesets/1 HW_Standard/HW_Delibird.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@
ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 26}
evs: {hp: 196, atk: 72, def: 120, spA: 0, spD: 120, spe: 0}
hidden: false
---
species: Delibird
ingamename: IronBundle
displayname: Iron Bundle
setname: Halloween-P
tags: [halloween]
item: Dubious Disc
ability: Motor Drive
moves:
- [Aurora Beam]
- [Hydro Pump]
- [Zap Cannon]
- [Lock On]
gender: [m, f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Luxury]
shiny: True
nature: Adamant
ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 23}
evs: {hp: 120, atk: 0, def: 120, spA: 0, spD: 120, spe: 0}
hidden: false

Check warning on line 45 in pokesets/1 HW_Standard/HW_Delibird.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Delibird Halloween: 280 hp, 180 atk, 156 def, 181 spe, 149 spA, 156 spD
Delibird Halloween-P: 261 hp, 160 atk, 156 def, 178 spe, 149 spA, 156 spD
22 changes: 22 additions & 0 deletions pokesets/1 HW_Standard/HW_Donphan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
species: Donphan
ingamename: Great Tusk
displayname: Great Tusk
setname: Halloween
tags: [halloween]
item: Rare Bone
ability: Drought
moves:
- [Bone Rush]
- [Brick Break]
- [Rapid Spin]
- [Synthesis]
gender: [m, f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Adamant
ivs: {hp: 0, atk: 20, def: 0, spA: 0, spD: 20, spe: 0}
evs: 0
hidden: false

Check warning on line 22 in pokesets/1 HW_Standard/HW_Donphan.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Donphan Halloween: 290 hp, 291 atk, 245 def, 105 spe, 112 spA, 145 spD
26 changes: 26 additions & 0 deletions pokesets/1 HW_Standard/HW_Gallade.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,29 @@
ivs: {hp: 31, atk: 0, def: 31, spA: 31, spD: 0, spe: 31}
evs: {hp: 0, atk: 0, def: 64, spA: 252, spD: 0, spe: 252}
hidden: false
---
species: Gallade
ingamename: IronValant
displayname: Iron Valiant
setname: Halloween-P
tags: [halloween]
item: Iron Ball
ability: Download
moves:
- [Close Combat, Dragon Rush]
- [Hyper Voice, Aura Sphere]
- [Future Sight]
- [Confuse Ray]
combinations:
- [Close Combat, Hyper Voice] #so one fighting and fairy move each
- [Dragon Rush, Aura Sphere] #one phys, one spec.
gender: [m]
happiness: 255
biddable: True
rarity: 1.0
ball: [Luxury]
shiny: True
nature: Naughty
ivs: {hp: 31, atk: 0, def: 0, spA: 0, spD: 0, spe: 31}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false

Check warning on line 71 in pokesets/1 HW_Standard/HW_Gallade.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Gallade Halloween: 292 hp, 349 atk, 166 def, 259 spe, 251 spA, 239 spD
Gallade Halloween2: 277 hp, 255 atk, 182 def, 259 spe, 251 spA, 211 spD
Gallade Halloween-P: 277 hp, 280 atk, 135 def, 196 spe, 135 spA, 211 spD
22 changes: 22 additions & 0 deletions pokesets/1 HW_Standard/HW_Hariyama.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
species: Hariyama
ingamename: Iron Hands
displayname: Iron Hands
setname: Halloween
ball: [Luxury]
tags: [halloween]
item: Electirizer
ability: Iron Fist
moves:
- [Thunder Punch]
- [Arm Thrust]
- [Charge]
- [Detect]
happiness: 255
gender: [m, f]
biddable: True
rarity: 1.0
shiny: True
nature: Modest
ivs: 0
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 120}
hidden: false

Check warning on line 22 in pokesets/1 HW_Standard/HW_Hariyama.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Hariyama Halloween: 398 hp, 220 atk, 125 def, 135 spe, 93 spA, 125 spD
22 changes: 22 additions & 0 deletions pokesets/1 HW_Standard/HW_Raikou.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,25 @@
ivs: {hp: 0, atk: 31, def: 0, spA: 31, spD: 0, spe: 0}
evs: {hp: 0, atk: 252, def: 0, spA: 100, spD: 0, spe: 0}
hidden: false
---
species: Raikou
ingamename: RagingBolt
displayname: Raging Bolt
setname: Halloween-P
tags: [halloween]
item: Thick Club
ability: Solar Power
moves:
- [Thunder Shock]
- [Twister]
- [Sucker Punch]
- [Growth]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Adamant
ivs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false

Check warning on line 43 in pokesets/1 HW_Standard/HW_Raikou.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Raikou Halloween: 290 hp, 295 atk, 155 def, 235 spe, 291 spA, 184 spD
Raikou Halloween-P: 290 hp, 192 atk, 155 def, 235 spe, 211 spA, 205 spD
23 changes: 23 additions & 0 deletions pokesets/1 HW_Standard/HW_Salamence.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@
ivs: {hp: 0, atk: 0, def: 10, spA: 31, spD: 10, spe: 0}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false
---
species: Salamence
ingamename: RoarinMoon
displayname: Roaring Moon
setname: Halloween-P
tags: [halloween]
item: Old Amber
ability: Chlorophyll
moves:
- [Bite]
- [Dragon Claw]
- [Bone Rush]
- [Howl]
gender: [m, f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Modest
ivs: {hp: 0, atk: 0, def: 10, spA: 31, spD: 10, spe: 0}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false

Check warning on line 45 in pokesets/1 HW_Standard/HW_Salamence.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Salamence Halloween: 300 hp, 247 atk, 175 def, 205 spe, 281 spA, 175 spD
Salamence Halloween-P: 300 hp, 247 atk, 175 def, 205 spe, 281 spA, 175 spD
22 changes: 22 additions & 0 deletions pokesets/1 HW_Standard/HW_Suicune.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,25 @@
ivs: {hp: 0, atk: 31, def: 0, spA: 31, spD: 0, spe: 0}
evs: {hp: 0, atk: 252, def: 0, spA: 252, spD: 0, spe: 0}
hidden: false
---
species: Suicune
ingamename: WalkinWake
displayname: Walking Wake
setname: Halloween-P
tags: [halloween]
item: Claw Fossil
ability: Drought
moves:
- [Water Pulse]
- [Dragon Breath]
- [Flamethrower]
- [Roar]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Lax
ivs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false

Check warning on line 43 in pokesets/1 HW_Standard/HW_Suicune.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Suicune Halloween: 310 hp, 249 atk, 235 def, 175 spe, 306 spA, 211 spD
Suicune Halloween-P: 310 hp, 155 atk, 258 def, 175 spe, 185 spA, 211 spD
22 changes: 22 additions & 0 deletions pokesets/1 XM_Standard/XM_Donphan.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
species: Donphan
ingamename: IronTreads
displayname: Iron Treads
setname: Christmas
tags: [christmas]
item: Metal Coat
ability: Lightning Rod
moves:
- [Dig]
- [Iron Head]
- [Spark]
- [Rain Dance]
gender: [m,f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Premier]
shiny: True
nature: Serious
ivs: {hp: 0, atk: 20, def: 0, spA: 0, spD: 20, spe: 0}
evs: 0
hidden: false

Check warning on line 22 in pokesets/1 XM_Standard/XM_Donphan.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Donphan Christmas: 290 hp, 265 atk, 245 def, 105 spe, 125 spA, 145 spD
26 changes: 26 additions & 0 deletions pokesets/1 XM_Standard/XM_Gardevoir.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,29 @@
ivs: {hp: 31, atk: 0, def: 31, spA: 0, spD: 0, spe: 31}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 88}
hidden: false
---
species: Gardevoir
ingamename: IronValant
displayname: Iron Valiant
setname: Christmas-P
tags: [christmas]
item: Iron Ball
ability: Download
moves:
- [Close Combat, Dragon Rush]
- [Hyper Voice, Aura Sphere]
- [Future Sight]
- [Confuse Ray]
combinations:
- [Close Combat, Hyper Voice] #so one fighting and fairy move each
- [Dragon Rush, Aura Sphere] #one phys, one spec.
gender: [m,f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Luxury]
shiny: True
nature: Naughty
ivs: {hp: 31, atk: 0, def: 0, spA: 0, spD: 0, spe: 31}
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: false

Check warning on line 48 in pokesets/1 XM_Standard/XM_Gardevoir.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Gardevoir Christmas: 277 hp, 148 atk, 166 def, 218 spe, 255 spA, 211 spD
Gardevoir Christmas-P: 277 hp, 148 atk, 135 def, 196 spe, 255 spA, 211 spD
24 changes: 24 additions & 0 deletions pokesets/1 XM_Standard/XM_Jiggypuff.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,27 @@
ivs: 31
evs: {hp: 60, atk: 0, def: 64, spA: 252, spD: 68, spe: 64}
hidden: false
---
species: Jigglypuff
ingamename: ScreamTail
displayname: Scream Tail
setname: Christmas-P
tags: [christmas]
item: Dome Fossil
ability: Solar Power
moves:
- [Psychic]
- [Hyper Voice]
- [Ancient Power]
- [Sunny Day]
gender: [m,f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Rash
ivs: 31
evs: {hp: 60, atk: 0, def: 64, spA: 252, spD: 68, spe: 64}
hidden: false

Check warning on line 69 in pokesets/1 XM_Standard/XM_Jiggypuff.yaml

View workflow job for this annotation

GitHub Actions / changes_info 

Stats (Not a warning, just for information):
Jigglypuff Christmas: 434 hp, 149 atk, 106 def, 68 spe, 126 spA, 106 spD
Jigglypuff Christmas2: 386 hp, 126 atk, 92 def, 92 spe, 207 spA, 92 spD
Jigglypuff Christmas-P: 386 hp, 126 atk, 92 def, 92 spe, 207 spA, 92 spD
21 changes: 21 additions & 0 deletions pokesets/1 XM_Standard/XM_Magneton.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
species: Magneton
ingamename: SandyShock
displayname: Sandy Shocks
setname: Christmas
tags: [christmas]
item: Earth Plate
ability: Solar Power
moves:
- [Earth Power]
- [Charge Beam]
- [Solar Beam]
- [Sunny Day]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Hardy
evs: {hp: 172, atk: 84, def: 84, spA: 84, spD: 84, spe: 84}
ivs: 11
hidden: false
23 changes: 23 additions & 0 deletions pokesets/1 XM_Standard/XM_Misdreavus.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@ nature: Brave
ivs: {hp: 31, atk: 26, def: 31, spA: 31, spD: 31, spe: 14}
evs: {hp: 140, atk: 124, def: 96, spA: 0, spD: 0, spe: 0}
hidden: false
---
species: Misdreavus
ingamename: FluterMane
displayname: Flutter Mane
setname: Christmas
tags: [christmas]
item: Icicle Plate
ability: Flower Gift
moves:
- [Shadow Ball]
- [Dragon Pulse]
- [Charm]
- [Memento]
gender: [m, f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Safari]
shiny: True
nature: Adamant
ivs: {hp: 31, atk: 31, def: 31, spA: 31, spD: 31, spe: 31}
evs: {hp: 180, atk: 0, def: 32, spA: 96, spD: 0, spe: 80}
hidden: false
22 changes: 22 additions & 0 deletions pokesets/1 XM_Standard/XM_Rampardos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
species: Rampardos
ingamename: DinoDance
displayname: DinoDance
setname: Christmas
tags: [christmas]
item: Metronome
ability: Vital Spirit
moves:
- [Petal Dance]
- [Hidden Power]
- [Teeter Dance]
- [Dragon Dance]
gender: [m,f]
happiness: 255
biddable: True
rarity: 1.0
ball: [Timer]
shiny: True
nature: Calm
ivs: 20
evs: {hp: 64, atk: 0, def: 64, spA: 252, spD: 64, spe: 64}
hidden: false
22 changes: 22 additions & 0 deletions pokesets/1 XM_Standard/XM_Tyranitar.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
species: Tyranitar
ingamename: IronThorns
displayname: Iron Thorns
setname: Christmas
tags: [christmas]
item: Zap Plate
ability: Volt Absorb
moves:
- [Volt Tackle]
- [Stone Edge]
- [Pin Missile]
- [Conversion 2]
happiness: 255
biddable: True
rarity: 1.0
gender: [m,f]
ball: [Premier]
shiny: True
nature: Modest
ivs: 0
evs: {hp: 0, atk: 0, def: 0, spA: 0, spD: 0, spe: 0}
hidden: False
5 changes: 4 additions & 1 deletion pokesets/Anime/Friede.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
species: Charizard
setname: Friede
ability: [Blaze]
item: [null]
item: [Dread Plate]
ball: [Poke]
moves:
- [Flamethrower]
- [Dragon Claw]
- [Dark Pulse]
- [Conversion]
gender: [m]
happiness: 255
biddable: true
Expand All @@ -27,6 +29,7 @@ moves:
- [Volt Tackle]
- [Thunder Punch]
- [Double Team]
- [Bounce]
gender: [m]
happiness: 255
biddable: true
Expand Down
Loading
Loading