german changes pt2

This commit is contained in:
José Ricardo Fleury Oliveira 2024-05-18 17:39:13 -03:00
parent e99dec4451
commit e8ba3f7961

View File

@ -1308,25 +1308,29 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
this.classicWinIcons[s].setVisible(slotVisible && this.scene.gameData.starterData[speciesId].classicWinCount > 0); this.classicWinIcons[s].setVisible(slotVisible && this.scene.gameData.starterData[speciesId].classicWinCount > 0);
if (!starterColors[speciesId]) { if (!starterColors[speciesId]) {
starterColors[speciesId] = [ 'ffffff', 'ffffff' ]; // Default to white if no colors are found // Default to white if no colors are found
starterColors[speciesId] = [ 'ffffff', 'ffffff' ];
} }
// Set the candy colors // Set the candy colors
this.candyUpgradeIcon[s].setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][0]))); this.candyUpgradeIcon[s].setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][0])));
this.candyUpgradeOverlayIcon[s].setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][1]))); this.candyUpgradeOverlayIcon[s].setTint(argbFromRgba(Utils.rgbHexToRgba(starterColors[speciesId][1])));
if (this.scene.candyUpgradeIconsMode == 0) { // 'Off' mode // 'Off' mode
if (this.scene.candyUpgradeIconsMode == 0) {
this.candyUpgradeIcon[s].setVisible(false); this.candyUpgradeIcon[s].setVisible(false);
this.candyUpgradeOverlayIcon[s].setVisible(false); this.candyUpgradeOverlayIcon[s].setVisible(false);
} else if (this.scene.candyUpgradeIconsMode == 1) { // 'Only Passive Unlocks' mode // 'Only Passive Unlocks' mode
} else if (this.scene.candyUpgradeIconsMode == 1) {
this.candyUpgradeIcon[s].setVisible( this.candyUpgradeIcon[s].setVisible(
slotVisible && ( slotVisible && (
this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) &&
!(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED))); !(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED)));
this.candyUpgradeOverlayIcon[s].setVisible(slotVisible && this.candyUpgradeIcon[s].visible); this.candyUpgradeOverlayIcon[s].setVisible(slotVisible && this.candyUpgradeIcon[s].visible);
} else if (this.scene.candyUpgradeIconsMode == 2) { // 'On' mode // 'On' mode
} else if (this.scene.candyUpgradeIconsMode == 2) {
this.candyUpgradeIcon[s].setVisible( this.candyUpgradeIcon[s].setVisible(
slotVisible && ( slotVisible && (
(this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && (this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) &&
@ -1823,15 +1827,18 @@ export default class StarterSelectUiHandler extends MessageUiHandler {
const speciesId = this.genSpecies[this.getGenCursorWithScroll()][cursor].speciesId; const speciesId = this.genSpecies[this.getGenCursorWithScroll()][cursor].speciesId;
switch (this.scene.candyUpgradeIconsMode) { switch (this.scene.candyUpgradeIconsMode) {
case 0: // 'Off' mode // 'Off' mode
case 0:
return return
case 1: // 'Only Passive Unlocks' mode // 'Only Passive Unlocks' mode
case 1:
this.candyUpgradeIcon[cursor].setVisible(this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && !(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED)); this.candyUpgradeIcon[cursor].setVisible(this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && !(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED));
this.candyUpgradeOverlayIcon[cursor].setVisible(this.candyUpgradeIcon[cursor].visible); this.candyUpgradeOverlayIcon[cursor].setVisible(this.candyUpgradeIcon[cursor].visible);
return; return;
case 2: // 'On' mode // 'On' mode
case 2:
this.candyUpgradeIcon[cursor].setVisible( this.candyUpgradeIcon[cursor].setVisible(
(this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && !(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED)) || (this.scene.gameData.starterData[speciesId].candyCount >= getPassiveCandyCount(speciesStarters[speciesId]) && !(this.scene.gameData.starterData[speciesId].passiveAttr & PassiveAttr.UNLOCKED)) ||
(this.scene.gameData.starterData[speciesId].candyCount >= getValueReductionCandyCounts(speciesStarters[speciesId])[this.scene.gameData.starterData[speciesId].valueReduction]) && (this.scene.gameData.starterData[speciesId].candyCount >= getValueReductionCandyCounts(speciesStarters[speciesId])[this.scene.gameData.starterData[speciesId].valueReduction]) &&