Moved battle music filenames to Settings, improved PluginManager's version comparer, removed player bump animation, fixed No Guard not applying to OHKO moves, can reuse the same Repel item quicker

This commit is contained in:
Maruno17
2025-01-22 23:02:34 +00:00
parent db2df5c8b4
commit 6f37cb7e33
16 changed files with 130 additions and 73 deletions

View File

@@ -10,6 +10,8 @@
# Graphics/Battlers/eggCracks.
#===============================================================================
class PokemonEggHatch_Scene
EGG_HATCH_BGM = "Evolution"
def pbStartScene(pokemon)
@sprites = {}
@pokemon = pokemon
@@ -50,7 +52,7 @@ class PokemonEggHatch_Scene
end
def pbMain
pbBGMPlay("Evolution")
pbBGMPlay(EGG_HATCH_BGM)
# Egg animation
updateScene(1.5)
pbPositionHatchMask(0)

View File

@@ -2,6 +2,8 @@
# Evolution screen
#===============================================================================
class PokemonEvolutionScene
EVOLUTION_BGM = "Evolution"
def self.pbDuplicatePokemon(pkmn, new_species)
new_pkmn = pkmn.clone
new_pkmn.species = new_species
@@ -95,7 +97,7 @@ class PokemonEvolutionScene
break if System.uptime - timer_start >= 1
end
pbMEPlay("Evolution start")
pbBGMPlay("Evolution")
pbBGMPlay(EVOLUTION_BGM)
canceled = false
timer_start = System.uptime
loop do

View File

@@ -2,6 +2,8 @@
#
#===============================================================================
class PokemonTrade_Scene
TRADE_BGM = "Evolution"
def pbUpdate
pbUpdateSpriteHash(@sprites)
end
@@ -181,7 +183,7 @@ class PokemonTrade_Scene
@pokemon.name, @pokemon.owner.public_id, @pokemon.owner.name) + "\\wtnp[0]") { pbUpdate }
pbMessageWaitForInput(@sprites["msgwindow"], 50, true) { pbUpdate }
pbPlayDecisionSE
pbBGMPlay("Evolution")
pbBGMPlay(TRADE_BGM)
pbScene1
pbMessageDisplay(@sprites["msgwindow"],
_INTL("For {1}'s {2},\n{3} sends {4}.", @trader1, speciesname1, @trader2, speciesname2) + "\1") { pbUpdate }

View File

@@ -36,7 +36,7 @@
class Scene_Credits
# Backgrounds to show in credits. Found in Graphics/Titles/ folder
BACKGROUNDS_LIST = ["credits1", "credits2", "credits3", "credits4", "credits5"]
BGM = "Credits"
CREDITS_BGM = "Credits"
SCROLL_SPEED = 40 # Pixels per second
SECONDS_PER_BACKGROUND = 11
TEXT_OUTLINE_COLOR = Color.new(0, 0, 128, 255)
@@ -174,7 +174,7 @@ class Scene_Credits
pbBGSStop
pbSEStop
pbBGMFade(2.0)
pbBGMPlay(BGM)
pbBGMPlay(CREDITS_BGM)
Graphics.transition
loop do
Graphics.update

View File

@@ -58,6 +58,10 @@ end
#
#===============================================================================
class PokemonJukeboxScreen
HIGHER_ENCOUNTER_RATE_BGM = "Radio - March"
LOWER_ENCOUNTER_RATE_BGM = "Radio - Lullaby"
NORMAL_ENCOUNTER_RATE_BGM = "Radio - Oak"
def initialize(scene)
@scene = scene
end
@@ -83,21 +87,21 @@ class PokemonJukeboxScreen
break
elsif cmdMarch >= 0 && cmd == cmdMarch
pbPlayDecisionSE
pbBGMPlay("Radio - March", 100, 100)
pbBGMPlay(HIGHER_ENCOUNTER_RATE_BGM, 100, 100)
if $PokemonMap
$PokemonMap.lower_encounter_rate = false
$PokemonMap.higher_encounter_rate = true
end
elsif cmdLullaby >= 0 && cmd == cmdLullaby
pbPlayDecisionSE
pbBGMPlay("Radio - Lullaby", 100, 100)
pbBGMPlay(LOWER_ENCOUNTER_RATE_BGM, 100, 100)
if $PokemonMap
$PokemonMap.lower_encounter_rate = true
$PokemonMap.higher_encounter_rate = false
end
elsif cmdOak >= 0 && cmd == cmdOak
pbPlayDecisionSE
pbBGMPlay("Radio - Oak", 100, 100)
pbBGMPlay(NORMAL_ENCOUNTER_RATE_BGM, 100, 100)
if $PokemonMap
$PokemonMap.lower_encounter_rate = false
$PokemonMap.higher_encounter_rate = false