Fix Gen 5 Randoms damage calc

smogon · Oct 14, 2023 · d079590 · d079590
1 parent 00985cb
commit d079590
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/js/shared_controls.js b/src/js/shared_controls.js
@@ -577,7 +577,7 @@ $(".set-selector").change(function () {
 			$(this).closest('.poke-info').find(".extraSetAbilities").text(listAbilities.join(', '));
 			if (gen >= 2) $(this).closest('.poke-info').find(".item-pool").show();
 			$(this).closest('.poke-info').find(".extraSetItems").text(listItems.join(', '));
-			if (gen >= 9 || gen === 7 || gen === 6) {
+			if (gen >= 9 || gen === 7 || gen === 6 || gen === 5) {
 				$(this).closest('.poke-info').find(".role-pool").show();
 				if (gen >= 9) $(this).closest('.poke-info').find(".tera-type-pool").show();
 			}
@@ -631,7 +631,7 @@ $(".set-selector").change(function () {
 			}
 			var setMoves = set.moves;
 			if (randset) {
-				if (gen < 9 && gen !== 7 && gen !== 6) {
+				if (gen < 9 && gen !== 7 && gen !== 6 && gen !== 5) {
 					setMoves = randset.moves;
 				} else {
 					setMoves = [];
@@ -896,7 +896,7 @@ function createPokemon(pokeInfo) {
 			evs[stat] = (set.evs && typeof set.evs[legacyStat] !== "undefined") ? set.evs[legacyStat] : 0;
 		}
 		var moveNames = set.moves;
-		if (isRandoms && (gen >= 9 || gen === 7 || gen === 6)) {
+		if (isRandoms && (gen >= 9 || gen === 7 || gen === 6 || gen === 5)) {
 			moveNames = [];
 			for (var role in set.roles) {
 				for (var q = 0; q < set.roles[role].moves.length; q++) {

diff --git a/src/randoms.template.html b/src/randoms.template.html
@@ -495,7 +495,7 @@
                         <div>Tera Type Pool</div>
                         <small class="extraSetTeraTypes"></small>
                     </div>
-                    <div class="role-pool gen-specific g9">
+                    <div class="role-pool gen-specific g5 g6 g7 g9">
                         <div>Role Pool</div>
                         <small class="extraSetRoles"></small>
                     </div>
@@ -1339,7 +1339,7 @@
                             <option value="spe">Speed</option>
                         </select>
                 </div>
-                         <div class="gen-specific g2 g3 g4 g5 g6 g7 g8 g9">
+                <div class="gen-specific g2 g3 g4 g5 g6 g7 g8 g9">
                     <label for="itemR1">Item</label>
                     <select class="item terrain-trigger calc-trigger" id="itemR1"></select>
                 </div>
@@ -1356,7 +1356,7 @@
                         <div>Tera Type Pool</div>
                         <small class="extraSetTeraTypes"></small>
                     </div>
-                    <div class="role-pool gen-specific g6 g7 g9">
+                    <div class="role-pool gen-specific g5 g6 g7 g9">
                         <div>Role Pool</div>
                         <small class="extraSetRoles"></small>
                     </div>