Compare commits
No commits in common. "6cfc6f9341f46260ae01d214b7bd39fd7d22c00a" and "fa6b754dec088dcfec50b556bd76863c2aa97777" have entirely different histories.
6cfc6f9341
...
fa6b754dec
|
|
@ -55,7 +55,7 @@ Check out [Github Issues](https://github.com/pagefaultgames/pokerogue/issues) to
|
|||
- Pokémon Sword/Shield
|
||||
- Pokémon Legends: Arceus
|
||||
- Pokémon Scarlet/Violet
|
||||
- Firel (Custom Ice Cave, Laboratory, Metropolis, Plains, Power Plant, Seabed, Space, and Volcano biome music)
|
||||
- Firel (Custom Laboratory, Metropolis, Seabed, and Space biome music)
|
||||
- Lmz (Custom Jungle biome music)
|
||||
- Andr06 (Custom Slum and Sea biome music)
|
||||
|
||||
|
|
|
|||
28
index.css
28
index.css
|
|
@ -26,36 +26,10 @@ body {
|
|||
#app {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
#app > div:first-child {
|
||||
transform-origin: center !important;
|
||||
}
|
||||
|
||||
/*
|
||||
Supports automatic vertical centering as suggested in PR#1114, but only via CSS
|
||||
|
||||
Condition factorized to deduce CSS rules:
|
||||
true if (isLandscape && !isMobile() && !hasTouchscreen() || (hasTouchscreen() && !isTouchControlsEnabled))
|
||||
*/
|
||||
|
||||
/* isLandscape && !isMobile() && !hasTouchscreen() */
|
||||
@media (orientation: landscape) and (pointer: fine) {
|
||||
#app {
|
||||
align-items: center;
|
||||
}
|
||||
}
|
||||
|
||||
@media (pointer: coarse) {
|
||||
/* hasTouchscreen() && !isTouchControlsEnabled */
|
||||
body:has(> #touchControls[class=visible]) #app {
|
||||
align-items: start;
|
||||
}
|
||||
|
||||
body:has(> #touchControls[class=visible]) #app > div:first-child {
|
||||
transform-origin: top !important;
|
||||
}
|
||||
transform-origin: top !important;
|
||||
}
|
||||
|
||||
#layout:fullscreen #dpad, #layout:fullscreen {
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -27,7 +27,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -215,7 +215,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -315,7 +315,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -414,7 +414,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -538,7 +538,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 23,
|
||||
|
|
@ -685,7 +685,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -19,
|
||||
|
|
@ -784,7 +784,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 26,
|
||||
|
|
@ -883,7 +883,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 23.5,
|
||||
|
|
@ -994,7 +994,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 9,
|
||||
|
|
@ -1069,7 +1069,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -18.5,
|
||||
|
|
@ -1157,7 +1157,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 37.5,
|
||||
|
|
@ -1221,7 +1221,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1284,7 +1284,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1348,7 +1348,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1448,7 +1448,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1548,7 +1548,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1647,7 +1647,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 0,
|
||||
|
|
@ -1759,7 +1759,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -25.5,
|
||||
|
|
@ -1870,7 +1870,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 12,
|
||||
|
|
@ -1957,7 +1957,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -27,
|
||||
|
|
@ -2044,7 +2044,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -16,
|
||||
|
|
@ -2143,7 +2143,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -26.5,
|
||||
|
|
@ -2230,7 +2230,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 23,
|
||||
|
|
@ -2306,7 +2306,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": 24,
|
||||
|
|
@ -2346,7 +2346,7 @@
|
|||
"opacity": 255,
|
||||
"locked": true,
|
||||
"priority": 1,
|
||||
"focus": 1
|
||||
"focus": 2
|
||||
},
|
||||
{
|
||||
"x": -27,
|
||||
|
|
|
|||
|
|
@ -746,7 +746,7 @@ export class Arena {
|
|||
case Biome.TOWN:
|
||||
return 7.288;
|
||||
case Biome.PLAINS:
|
||||
return 17.485;
|
||||
return 7.693;
|
||||
case Biome.GRASS:
|
||||
return 1.995;
|
||||
case Biome.TALL_GRASS:
|
||||
|
|
@ -774,13 +774,13 @@ export class Arena {
|
|||
case Biome.DESERT:
|
||||
return 1.143;
|
||||
case Biome.ICE_CAVE:
|
||||
return 0.000;
|
||||
return 15.010;
|
||||
case Biome.MEADOW:
|
||||
return 3.891;
|
||||
case Biome.POWER_PLANT:
|
||||
return 9.447;
|
||||
return 2.810;
|
||||
case Biome.VOLCANO:
|
||||
return 17.637;
|
||||
return 5.116;
|
||||
case Biome.GRAVEYARD:
|
||||
return 3.232;
|
||||
case Biome.DOJO:
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@
|
|||
"forest": "PMD EoS Dusk Forest",
|
||||
"grass": "PMD EoS Apple Woods",
|
||||
"graveyard": "PMD EoS Mystifying Forest",
|
||||
"ice_cave": "Firel - -60F",
|
||||
"ice_cave": "PMD EoS Vast Ice Mountain",
|
||||
"island": "PMD EoS Craggy Coast",
|
||||
"jungle": "Lmz - Jungle",
|
||||
"laboratory": "Firel - Laboratory",
|
||||
|
|
@ -116,8 +116,8 @@
|
|||
"meadow": "PMD EoS Sky Peak Forest",
|
||||
"metropolis": "Firel - Metropolis",
|
||||
"mountain": "PMD EoS Mt. Horn",
|
||||
"plains": "Firel - Route 888",
|
||||
"power_plant": "Firel - The Klink",
|
||||
"plains": "PMD EoS Sky Peak Prairie",
|
||||
"power_plant": "PMD EoS Far Amp Plains",
|
||||
"ruins": "PMD EoS Deep Sealed Ruin",
|
||||
"sea": "Andr06 - Marine Mystique",
|
||||
"seabed": "Firel - Seabed",
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
"tall_grass": "PMD EoS Foggy Forest",
|
||||
"temple": "PMD EoS Aegis Cave",
|
||||
"town": "PMD EoS Random Dungeon Theme 3",
|
||||
"volcano": "Firel - Twisturn Volcano",
|
||||
"volcano": "PMD EoS Steam Cave",
|
||||
"wasteland": "PMD EoS Hidden Highland",
|
||||
"encounter_ace_trainer": "BW Trainers' Eyes Meet (Ace Trainer)",
|
||||
"encounter_backpacker": "BW Trainers' Eyes Meet (Backpacker)",
|
||||
|
|
|
|||
|
|
@ -13,10 +13,8 @@
|
|||
"ALL": "전부",
|
||||
"PASS_BATON": "배턴터치한다",
|
||||
"UNPAUSE_EVOLUTION": "진화 재개",
|
||||
"PAUSE_EVOLUTION": "진화 중지",
|
||||
"REVIVE": "되살린다",
|
||||
"RENAME": "닉네임 바꾸기",
|
||||
"SELECT": "선택한다",
|
||||
"choosePokemon": "포켓몬을 선택하세요.",
|
||||
"doWhatWithThisPokemon": "포켓몬을 어떻게 하겠습니까?",
|
||||
"noEnergy": "{{pokemonName}}[[는]] 싸울 수 있는\n기력이 남아 있지 않습니다!",
|
||||
|
|
@ -25,7 +23,6 @@
|
|||
"tooManyItems": "{{pokemonName}}[[는]] 지닌 도구의 수가\n너무 많습니다",
|
||||
"anyEffect": "써도 효과가 없다.",
|
||||
"unpausedEvolutions": "{{pokemonName}}의 진화가 재개되었다.",
|
||||
"pausedEvolutions": "{{pokemonName}}[[가]] 진화하지 않도록 했다.",
|
||||
"unspliceConfirmation": "{{pokemonName}}로부터 {{fusionName}}의 융합을 해제하시겠습니까?\n{{fusionName}}는 사라지게 됩니다.",
|
||||
"wasReverted": "{{fusionName}}은 {{pokemonName}}의 모습으로 돌아갔습니다!",
|
||||
"releaseConfirmation": "{{pokemonName}}[[를]]\n정말 놓아주겠습니까?",
|
||||
|
|
|
|||
|
|
@ -11,10 +11,6 @@
|
|||
"expGainsSpeed": "경험치 획득 속도",
|
||||
"expPartyDisplay": "파티 경험치 표시",
|
||||
"skipSeenDialogues": "본 대화 생략",
|
||||
"eggSkip": "알 스킵",
|
||||
"never": "안 함",
|
||||
"always": "항상",
|
||||
"ask": "확인하기",
|
||||
"battleStyle": "시합 룰",
|
||||
"enableRetries": "재도전 허용",
|
||||
"hideIvs": "개체값탐지기 효과 끄기",
|
||||
|
|
|
|||
|
|
@ -22,25 +22,15 @@ export function applySessionDataPatches(data: SessionSaveData) {
|
|||
} else if (m.className === "PokemonResetNegativeStatStageModifier") {
|
||||
m.className = "ResetNegativeStatStageModifier";
|
||||
} else if (m.className === "TempBattleStatBoosterModifier") {
|
||||
// Dire Hit no longer a part of the TempBattleStatBoosterModifierTypeGenerator
|
||||
if (m.typeId !== "DIRE_HIT") {
|
||||
m.className = "TempStatStageBoosterModifier";
|
||||
m.typeId = "TEMP_STAT_STAGE_BOOSTER";
|
||||
m.className = "TempStatStageBoosterModifier";
|
||||
m.typeId = "TEMP_STAT_STAGE_BOOSTER";
|
||||
|
||||
// Migration from TempBattleStat to Stat
|
||||
const newStat = m.typePregenArgs[0] + 1;
|
||||
m.typePregenArgs[0] = newStat;
|
||||
|
||||
// From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ]
|
||||
m.args = [ newStat, 5, m.args[1] ];
|
||||
} else {
|
||||
m.className = "TempCritBoosterModifier";
|
||||
m.typePregenArgs = [];
|
||||
|
||||
// From [ stat, battlesLeft ] to [ maxBattles, battleCount ]
|
||||
m.args = [ 5, m.args[1] ];
|
||||
}
|
||||
// Migration from TempBattleStat to Stat
|
||||
const newStat = m.typePregenArgs[0] + 1;
|
||||
m.typePregenArgs[0] = newStat;
|
||||
|
||||
// From [ stat, battlesLeft ] to [ stat, maxBattles, battleCount ]
|
||||
m.args = [ newStat, 5, m.args[1] ];
|
||||
} else if (m.className === "DoubleBattleChanceBoosterModifier" && m.args.length === 1) {
|
||||
let maxBattles: number;
|
||||
switch (m.typeId) {
|
||||
|
|
@ -83,7 +73,7 @@ export function applySystemDataPatches(data: SystemSaveData) {
|
|||
case "1.0.3":
|
||||
case "1.0.4":
|
||||
// --- LEGACY PATCHES ---
|
||||
if (data.starterData && data.dexData) {
|
||||
if (data.starterData) {
|
||||
// Migrate ability starter data if empty for caught species
|
||||
Object.keys(data.starterData).forEach(sd => {
|
||||
if (data.dexData[sd]?.caughtAttr && (data.starterData[sd] && !data.starterData[sd].abilityAttr)) {
|
||||
|
|
@ -114,14 +104,12 @@ export function applySystemDataPatches(data: SystemSaveData) {
|
|||
// --- PATCHES ---
|
||||
|
||||
// Fix Starter Data
|
||||
if (data.starterData && data.dexData) {
|
||||
for (const starterId of defaultStarterSpecies) {
|
||||
if (data.starterData[starterId]?.abilityAttr) {
|
||||
data.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1;
|
||||
}
|
||||
if (data.dexData[starterId]?.caughtAttr) {
|
||||
data.dexData[starterId].caughtAttr |= DexAttr.FEMALE;
|
||||
}
|
||||
for (const starterId of defaultStarterSpecies) {
|
||||
if (data.starterData[starterId]?.abilityAttr) {
|
||||
data.starterData[starterId].abilityAttr |= AbilityAttr.ABILITY_1;
|
||||
}
|
||||
if (data.dexData[starterId]?.caughtAttr) {
|
||||
data.dexData[starterId].caughtAttr |= DexAttr.FEMALE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue