Cinnabar cutscene changes + resort gorgeous fix

This commit is contained in:
infinitefusion
2023-05-20 09:48:48 -04:00
parent 89977a8d49
commit 62f96bf55c
24 changed files with 29647 additions and 19474 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,7 @@ module Settings
LEADER_VICTORY_MUSIC="Battle victory leader" LEADER_VICTORY_MUSIC="Battle victory leader"
TRAINER_VICTORY_MUSIC="trainer-victory" TRAINER_VICTORY_MUSIC="trainer-victory"
WILD_VICTORY_MUSIC="wild-victory" WILD_VICTORY_MUSIC="wild-victory"
# #getRandomCustomFusionForIntro
FUSION_ICON_SPRITE_OFFSET = 10 FUSION_ICON_SPRITE_OFFSET = 10
#Infinite fusion settings #Infinite fusion settings
@@ -42,7 +42,8 @@ module Settings
BACKSPRITE_POSITION_OFFSET = 20 BACKSPRITE_POSITION_OFFSET = 20
FRONTSPRITE_POSITION = 200 FRONTSPRITE_POSITION = 200
SHINY_HUE_OFFSET = 75 SHINY_HUE_OFFSET = 75
NO_LEVEL_MODE_LEVEL = 25 NO_LEVEL_MODE_LEVEL_INCR = 5.8
NO_LEVEL_MODE_LEVEL_BASE = 6
RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW) RIVAL_STARTER_PLACEHOLDER_SPECIES = :MEW #(MEW)
VAR_1_PLACEHOLDER_SPECIES = :DIALGA VAR_1_PLACEHOLDER_SPECIES = :DIALGA

View File

@@ -1139,6 +1139,16 @@ class Pokemon
return ((((base * 2 + iv + (ev / 4)) * level / 100).floor + 5) * nat / 100).floor return ((((base * 2 + iv + (ev / 4)) * level / 100).floor + 5) * nat / 100).floor
end end
def adjust_level_for_base_stats_mode()
nb_badges = $Trainer.badge_count
this_level = ((nb_badges * Settings::NO_LEVEL_MODE_LEVEL_INCR) + Settings::NO_LEVEL_MODE_LEVEL_BASE).ceil
if this_level > Settings::MAXIMUM_LEVEL
this_level = Settings::MAXIMUM_LEVEL
end
return this_level
end
# Recalculates this Pokémon's stats. # Recalculates this Pokémon's stats.
def calc_stats def calc_stats
base_stats = self.baseStats base_stats = self.baseStats
@@ -1146,7 +1156,7 @@ class Pokemon
this_IV = self.calcIV this_IV = self.calcIV
if $game_switches[SWITCH_NO_LEVELS_MODE] if $game_switches[SWITCH_NO_LEVELS_MODE]
this_level = Settings::NO_LEVEL_MODE_LEVEL this_level = adjust_level_for_base_stats_mode()
end end
# Format stat multipliers due to nature # Format stat multipliers due to nature

View File

@@ -429,7 +429,7 @@ def getCustomSpeciesList(allowOnline = true, redownload_file=false)
end end
end end
if speciesList.length <= 200 && allowOnline if speciesList.length <= 20000 && allowOnline
if redownload_file && Kernel.pbConfirmMessage(_INTL("Not enough local sprites found. Attempt to fetch list from the internet?")) if redownload_file && Kernel.pbConfirmMessage(_INTL("Not enough local sprites found. Attempt to fetch list from the internet?"))
updateOnlineCustomSpritesFile updateOnlineCustomSpritesFile
end end

View File

@@ -162,7 +162,6 @@ def getRandomCustomFusionForIntro(returnRandomPokemonIfNoneFound = true, customP
randPoke << rand(maxPoke) + 1 randPoke << rand(maxPoke) + 1
end end
end end
return randPoke return randPoke
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.