Skip to content

Commit

Permalink
Norman gym update
Browse files Browse the repository at this point in the history
  • Loading branch information
@TerraPrograms
TerraPrograms committed Mar 1, 2024
1 parent 3e65b25 commit 97fc183
Show file tree
Hide file tree
Showing 18 changed files with 42 additions and 42 deletions.
2 changes: 1 addition & 1 deletion calc/src/data/moves.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ const RBY: {[name: string]: MoveData} = {
Fissure: {bp: 0, type: 'Ground'},
Fly: {bp: 70, type: 'Flying'},
'Focus Energy': {bp: 0, category: 'Status', type: 'Normal'},
'Fury Attack': {bp: 15, type: 'Normal', multihit: [2, 5]},
'Fury Attack': {bp: 20, type: 'Normal', multihit: [2, 5]},
'Fury Swipes': {bp: 18, type: 'Normal', multihit: [2, 5]},
Glare: {bp: 0, category: 'Status', type: 'Normal'},
Growth: {bp: 0, category: 'Status', type: 'Normal'},
Expand Down
8 changes: 4 additions & 4 deletions calc/src/data/species.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8985,7 +8985,7 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
Duraludon: {nfe: true},
Girafarig: {nfe: true},
Primeape: {nfe: true},
Tauros: {otherFormes: ['Tauros-Paldea', 'Tauros-Paldea-Fire', 'Tauros-Paldea-Water']},
Tauros: {otherFormes: ['Tauros-Paldea-Combat', 'Tauros-Paldea-Blaze', 'Tauros-Paldea-Aqua']},
Wooper: {otherFormes: ['Wooper-Paldea']},
Zacian: {bs: {at: 120}},
'Zacian-Crowned': {bs: {at: 150}},
Expand Down Expand Up @@ -9830,21 +9830,21 @@ const SV_PATCH: {[name: string]: DeepPartial<SpeciesData>} = {
weightkg: 8,
abilities: {0: 'Commander'},
},
'Tauros-Paldea': {
'Tauros-Paldea-Combat': {
types: ['Fighting'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
abilities: {0: 'Intimidate'},
baseSpecies: 'Tauros',
},
'Tauros-Paldea-Fire': {
'Tauros-Paldea-Blaze': {
types: ['Fighting', 'Fire'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
abilities: {0: 'Intimidate'},
baseSpecies: 'Tauros',
},
'Tauros-Paldea-Water': {
'Tauros-Paldea-Aqua': {
types: ['Fighting', 'Water'],
bs: {hp: 75, at: 110, df: 105, sa: 30, sd: 70, sp: 100},
weightkg: 88.4,
Expand Down
6 changes: 3 additions & 3 deletions calc/src/mechanics/gen789.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,11 @@ export function calculateSMSSSV(
type = 'Dark';
}
} else if (move.named('Raging Bull')) {
if (attacker.named('Tauros-Paldea')) {
if (attacker.named('Tauros-Paldea-Combat')) {
type = 'Fighting';
} else if (attacker.named('Tauros-Paldea-Fire')) {
} else if (attacker.named('Tauros-Paldea-Blaze')) {
type = 'Fire';
} else if (attacker.named('Tauros-Paldea-Water')) {
} else if (attacker.named('Tauros-Paldea-Aqua')) {
type = 'Water';
}
} else if (move.named('Ivy Cudgel')) {
Expand Down
6 changes: 3 additions & 3 deletions data/species.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/calc/data/moves.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions dist/calc/data/species.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/calc/data/species.js.map
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/calc/mechanics/gen789.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/calc/mechanics/gen789.js.map
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions dist/honkalculate.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -882,8 +882,8 @@
</script>
<script type="text/javascript" src="./calc/util.js?8fa0c7ff"></script>
<script type="text/javascript" src="./calc/stats.js?9220179f"></script>
<script type="text/javascript" src="./calc/data/species.js?8d733abe"></script>
<script type="text/javascript" src="./js/data/sets/gen9.js?650f1d63"></script>
<script type="text/javascript" src="./calc/data/species.js?598102aa"></script>
<script type="text/javascript" src="./js/data/sets/gen9.js?25721f5c"></script>
<script type="text/javascript" src="./js/data/sets/gen8.js?ecf43658"></script>
<script type="text/javascript" src="./js/data/sets/gen7.js?78168bde"></script>
<script type="text/javascript" src="./js/data/sets/gen6.js?2219279f"></script>
Expand All @@ -895,15 +895,15 @@
<script type="text/javascript" src="./calc/data/types.js?6b065b89"></script>
<script type="text/javascript" src="./calc/data/natures.js?04f00dc5"></script>
<script type="text/javascript" src="./calc/data/abilities.js?ed14e933"></script>
<script type="text/javascript" src="./calc/data/moves.js?4f7a8254"></script>
<script type="text/javascript" src="./calc/data/moves.js?dcc37d07"></script>
<script type="text/javascript" src="./calc/data/items.js?6bfb4498"></script>
<script type="text/javascript" src="./calc/data/index.js?083d2bc9"></script>
<script type="text/javascript" src="./calc/move.js?48331ad1"></script>
<script type="text/javascript" src="./calc/pokemon.js?ea90f3ad"></script>
<script type="text/javascript" src="./calc/field.js?2c7f95da"></script>
<script type="text/javascript" src="./calc/items.js?3cbea98f"></script>
<script type="text/javascript" src="./calc/mechanics/util.js?7d958cae"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?54295224"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?4a1baa7c"></script>
<script type="text/javascript" src="./calc/mechanics/gen56.js?326e578d"></script>
<script type="text/javascript" src="./calc/mechanics/gen4.js?7d2b7674"></script>
<script type="text/javascript" src="./calc/mechanics/gen3.js?2fa3d6a1"></script>
Expand All @@ -913,7 +913,7 @@
<script type="text/javascript" src="./calc/result.js?d5c7552b"></script>
<script type="text/javascript" src="./calc/adaptable.js?afeb3759"></script>
<script type="text/javascript" src="./calc/index.js?2377cbc8"></script>
<script type="text/javascript" src="./js/shared_controls.js?08aec273"></script>
<script type="text/javascript" src="./js/shared_controls.js?08b2aa60"></script>
<script type="text/javascript" src="./js/honkalculate_controls.js?23c996e5"></script>

<div style="clear:both;padding:20px;text-align:left">Created by Honko, maintained by Austin and Kris
Expand Down
10 changes: 5 additions & 5 deletions dist/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1668,8 +1668,8 @@ <h5>OHKO Colors</h5>
</script>
<script type="text/javascript" src="./calc/util.js?8fa0c7ff"></script>
<script type="text/javascript" src="./calc/stats.js?9220179f"></script>
<script type="text/javascript" src="./calc/data/species.js?8d733abe"></script>
<script type="text/javascript" src="./js/data/sets/gen9.js?650f1d63"></script>
<script type="text/javascript" src="./calc/data/species.js?598102aa"></script>
<script type="text/javascript" src="./js/data/sets/gen9.js?25721f5c"></script>
<script type="text/javascript" src="./js/data/sets/gen8.js?ecf43658"></script>
<script type="text/javascript" src="./js/data/sets/gen7.js?78168bde"></script>
<script type="text/javascript" src="./js/data/sets/gen6.js?2219279f"></script>
Expand All @@ -1681,15 +1681,15 @@ <h5>OHKO Colors</h5>
<script type="text/javascript" src="./calc/data/types.js?6b065b89"></script>
<script type="text/javascript" src="./calc/data/natures.js?04f00dc5"></script>
<script type="text/javascript" src="./calc/data/abilities.js?ed14e933"></script>
<script type="text/javascript" src="./calc/data/moves.js?4f7a8254"></script>
<script type="text/javascript" src="./calc/data/moves.js?dcc37d07"></script>
<script type="text/javascript" src="./calc/data/items.js?6bfb4498"></script>
<script type="text/javascript" src="./calc/data/index.js?083d2bc9"></script>
<script type="text/javascript" src="./calc/move.js?48331ad1"></script>
<script type="text/javascript" src="./calc/pokemon.js?ea90f3ad"></script>
<script type="text/javascript" src="./calc/field.js?2c7f95da"></script>
<script type="text/javascript" src="./calc/items.js?3cbea98f"></script>
<script type="text/javascript" src="./calc/mechanics/util.js?7d958cae"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?54295224"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?4a1baa7c"></script>
<script type="text/javascript" src="./calc/mechanics/gen56.js?326e578d"></script>
<script type="text/javascript" src="./calc/mechanics/gen4.js?7d2b7674"></script>
<script type="text/javascript" src="./calc/mechanics/gen3.js?2fa3d6a1"></script>
Expand All @@ -1699,7 +1699,7 @@ <h5>OHKO Colors</h5>
<script type="text/javascript" src="./calc/result.js?d5c7552b"></script>
<script type="text/javascript" src="./calc/adaptable.js?afeb3759"></script>
<script type="text/javascript" src="./calc/index.js?2377cbc8"></script>
<script type="text/javascript" src="./js/shared_controls.js?08aec273"></script>
<script type="text/javascript" src="./js/shared_controls.js?08b2aa60"></script>
<script type="text/javascript" src="./js/index_randoms_controls.js?34234c00"></script>
<script type="text/javascript" src="./js/moveset_import.js?7a7954dd"></script>
</div>
Expand Down
2 changes: 1 addition & 1 deletion dist/js/data/sets/gen9.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/shared_controls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ $(".set-selector").change(function () {
pok_name = "Mime%20Jr"
}
//this ruined my day
var pok = `<img class="trainer-pok right-side" src="https://raw.githubusercontent.com/May8th1995/sprites/master/${pok_name}.png" data-id="${CURRENT_TRAINER_POKS[i].split("]")[1]}" title="${next_poks[i]}, ${next_poks[i]} BP">`
var pok = `<img class="trainer-pok right-side" src="http://raw.githubusercontent.com/May8th1995/sprites/master/${pok_name}.png" data-id="${CURRENT_TRAINER_POKS[i].split("]")[1]}" title="${next_poks[i]}, ${next_poks[i]} BP">`
trpok_html += pok
}
} else {
Expand Down
8 changes: 4 additions & 4 deletions dist/randoms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1537,7 +1537,7 @@
</script>
<script type="text/javascript" src="./calc/util.js?8fa0c7ff"></script>
<script type="text/javascript" src="./calc/stats.js?9220179f"></script>
<script type="text/javascript" src="./calc/data/species.js?8d733abe"></script>
<script type="text/javascript" src="./calc/data/species.js?598102aa"></script>
<script type="text/javascript" src="https://data.pkmn.cc/randbats/js/gen9randombattle.js?"></script>
<script type="text/javascript" src="https://data.pkmn.cc/randbats/js/gen8randombattle.js?"></script>
<script type="text/javascript" src="https://data.pkmn.cc/randbats/js/gen7randombattle.js?"></script>
Expand All @@ -1550,15 +1550,15 @@
<script type="text/javascript" src="./calc/data/types.js?6b065b89"></script>
<script type="text/javascript" src="./calc/data/natures.js?04f00dc5"></script>
<script type="text/javascript" src="./calc/data/abilities.js?ed14e933"></script>
<script type="text/javascript" src="./calc/data/moves.js?4f7a8254"></script>
<script type="text/javascript" src="./calc/data/moves.js?dcc37d07"></script>
<script type="text/javascript" src="./calc/data/items.js?6bfb4498"></script>
<script type="text/javascript" src="./calc/data/index.js?083d2bc9"></script>
<script type="text/javascript" src="./calc/move.js?48331ad1"></script>
<script type="text/javascript" src="./calc/pokemon.js?ea90f3ad"></script>
<script type="text/javascript" src="./calc/field.js?2c7f95da"></script>
<script type="text/javascript" src="./calc/items.js?3cbea98f"></script>
<script type="text/javascript" src="./calc/mechanics/util.js?7d958cae"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?54295224"></script>
<script type="text/javascript" src="./calc/mechanics/gen789.js?4a1baa7c"></script>
<script type="text/javascript" src="./calc/mechanics/gen56.js?326e578d"></script>
<script type="text/javascript" src="./calc/mechanics/gen4.js?7d2b7674"></script>
<script type="text/javascript" src="./calc/mechanics/gen3.js?2fa3d6a1"></script>
Expand All @@ -1568,7 +1568,7 @@
<script type="text/javascript" src="./calc/result.js?d5c7552b"></script>
<script type="text/javascript" src="./calc/adaptable.js?afeb3759"></script>
<script type="text/javascript" src="./calc/index.js?2377cbc8"></script>
<script type="text/javascript" src="./js/shared_controls.js?08aec273"></script>
<script type="text/javascript" src="./js/shared_controls.js?08b2aa60"></script>
<script type="text/javascript" src="./js/index_randoms_controls.js?34234c00"></script>
<script type="text/javascript" src="./js/moveset_import.js?7a7954dd"></script>
</div>
Expand Down
4 changes: 2 additions & 2 deletions mechanics/gen789.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion production.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/js/data/sets/gen9.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/js/shared_controls.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ $(".set-selector").change(function () {
pok_name = "Mime%20Jr"
}
//this ruined my day
var pok = `<img class="trainer-pok right-side" src="https://raw.githubusercontent.com/May8th1995/sprites/master/${pok_name}.png" data-id="${CURRENT_TRAINER_POKS[i].split("]")[1]}" title="${next_poks[i]}, ${next_poks[i]} BP">`
var pok = `<img class="trainer-pok right-side" src="http://raw.githubusercontent.com/May8th1995/sprites/master/${pok_name}.png" data-id="${CURRENT_TRAINER_POKS[i].split("]")[1]}" title="${next_poks[i]}, ${next_poks[i]} BP">`
trpok_html += pok
}
} else {
Expand Down

0 comments on commit 97fc183

Please sign in to comment.