Mt. Silver - finished

This commit is contained in:
infinitefusion
2022-11-27 14:11:41 -05:00
parent 1482c4c1d0
commit 572796d7cc
68 changed files with 37132 additions and 29 deletions

View File

@@ -205,7 +205,7 @@ module GameData
def self.check_cry_file(species, form)
species_data = self.get_species_form(species, form)
return nil if species_data.nil?
return "Cries/BIRDBOSS_2" if $game_switches[SWITCH_BIRDBOSS_BATTLE]
return "Cries/BIRDBOSS_2" if $game_switches[SWITCH_TRIPLE_BOSS_BATTLE] && !$game_switches[SWITCH_SILVERBOSS_BATTLE]
if species_data.is_fusion
species_data = GameData::Species.get(getHeadID(species_data))
end

View File

@@ -126,6 +126,10 @@ module PokeBattle_BattleCommon
pbDisplay(_INTL("Gah! It was so close, too!"))
BallHandlers.onFailCatch(ball,self,battler)
when 4
if $game_switches[SWITCH_SILVERBOSS_BATTLE]
pkmn.species=:PALDIATINA
pkmn.name = "Paldiatina"
end
pbDisplayBrief(_INTL("Gotcha! {1} was caught!",pkmn.name))
@scene.pbThrowSuccess # Play capture success jingle
pbRemoveFromParty(battler.index,battler.pokemonIndex)

View File

@@ -202,8 +202,12 @@ class PokeBattle_Battle
msg += _INTL("{1} sent out {2} and {3}!",t.full_name,
@battlers[sent[0]].name,@battlers[sent[1]].name)
when 3
if $game_switches[SWITCH_BIRDBOSS_BATTLE]
msg += _INTL("{1} sent out Zapmolcuno!",t.full_name)
if $game_switches[SWITCH_TRIPLE_BOSS_BATTLE]
if $game_switches[SWITCH_SILVERBOSS_BATTLE]
msg += _INTL("A wild Paldiatina appeared!",t.full_name)
else
msg += _INTL("{1} sent out Zapmolcuno!",t.full_name)
end
else
msg += _INTL("{1} sent out {2}, {3} and {4}!",t.full_name,
@battlers[sent[0]].name,@battlers[sent[1]].name,@battlers[sent[2]].name)

View File

@@ -308,7 +308,7 @@ class PokeBattle_Scene
def showFaintingAnimation(battler)
return true if !battler.opposes?
return false if $game_switches[SWITCH_BIRDBOSS_BATTLE] && battler.battle.pbAbleCount(1) > 0
return false if $game_switches[SWITCH_TRIPLE_BOSS_BATTLE] && battler.battle.pbAbleCount(1) > 0
return true
end

View File

@@ -384,6 +384,19 @@ def pbTripleWildBattle(species1, level1, species2, level2, species3, level3,
return (decision!=2 && decision!=5)
end
def pb1v3WildBattle(species1, level1, species2, level2, species3, level3,
outcomeVar=1, canRun=true, canLose=false)
# Set some battle rules
setBattleRule("outcomeVar",outcomeVar) if outcomeVar!=1
setBattleRule("cannotRun") if !canRun
setBattleRule("canLose") if canLose
setBattleRule("1v3")
# Perform the battle
decision = pbWildBattleCore(species1, level1, species2, level2, species3, level3)
# Return false if the player lost or drew the battle, and true if any other result
return (decision!=2 && decision!=5)
end
#===============================================================================
# Start a trainer battle
#===============================================================================

View File

@@ -48,9 +48,17 @@ ItemHandlers::CanUseInBattle.addIf(proc { |item| GameData::Item.get(item).is_pok
# them if they are trying to catch a non-Shadow Pokémon.)
if battle.pbOpposingBattlerCount>1 && !(GameData::Item.get(item).is_snag_ball? && battle.trainerBattle?)
if battle.pbOpposingBattlerCount==2
scene.pbDisplay(_INTL("It's no good! It's impossible to aim when there are two Pokémon!")) if showMessages
if $game_switches[SWITCH_SILVERBOSS_BATTLE]
scene.pbDisplay(_INTL("It's no good! It's still too agitated to aim!")) if showMessages
else
scene.pbDisplay(_INTL("It's no good! It's impossible to aim when there are two Pokémon!")) if showMessages
end
else
scene.pbDisplay(_INTL("It's no good! It's impossible to aim when there are more than one Pokémon!")) if showMessages
if $game_switches[SWITCH_SILVERBOSS_BATTLE]
scene.pbDisplay(_INTL("It's no good! It's still too agitated to aim!")) if showMessages
else
scene.pbDisplay(_INTL("It's no good! It's impossible to aim when there are more than one Pokémon!")) if showMessages
end
end
next false
end

View File

@@ -733,6 +733,7 @@ module Compiler
pbSetWindowText(nil)
end
def main
return
return if !$DEBUG

View File

@@ -130,4 +130,5 @@ DIRECTION_DOWN = 2
DIRECTION_UP = 8
DUST_ANIMATION_ID=2
SWITCH_BIRDBOSS_BATTLE = 824
SWITCH_TRIPLE_BOSS_BATTLE = 824
SWITCH_SILVERBOSS_BATTLE = 675

View File

@@ -62,26 +62,24 @@ class Movie
end
# not really necessary I think
def pbAutoregulador()
hora_inicio = $game_variables[VARIABLE_TIME_INITIAL]
hora_actual = Time.now
diferencia = (hora_actual - hora_inicio) * 20 #20 frames corresponde a 1 seg
#Redondeo
diferencia_entera = diferencia.to_i
diferencia_entera = diferencia_entera.to_f
if diferencia - diferencia_entera >= 0.5
diferencia_entera = diferencia_entera + 1
end
$game_variables[VARIABLE_CURRENT_FRAME] = diferencia_entera.to_int
$game_variables[VARIABLE_TIME_ELAPSED] = Time.now
return $game_variables[VARIABLE_CURRENT_FRAME]
end
# def pbAutoregulador()
# hora_inicio = $game_variables[VARIABLE_TIME_INITIAL]
# hora_actual = Time.now
# diferencia = (hora_actual - hora_inicio) * 20 #20 frames corresponde a 1 seg
# #Redondeo
# diferencia_entera = diferencia.to_i
#
# diferencia_entera = diferencia_entera.to_f
#
# if diferencia - diferencia_entera >= 0.5
# diferencia_entera = diferencia_entera + 1
# end
#
# $game_variables[VARIABLE_CURRENT_FRAME] = diferencia_entera.to_int
#
# $game_variables[VARIABLE_TIME_ELAPSED] = Time.now
#
# return $game_variables[VARIABLE_CURRENT_FRAME]
# end
end
def pbPlayMovie(framesPath, bgm, maxFrame = 1000, imageNumber = 12) end