corrupted data

This commit is contained in:
chardub
2025-03-26 18:25:57 -04:00
parent eba2c7c90c
commit dafa19fa38
25 changed files with 47 additions and 8 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.

View File

@@ -42,6 +42,7 @@ class PokeBattle_Battler
attr_accessor :tookPhysicalHit attr_accessor :tookPhysicalHit
attr_accessor :damageState attr_accessor :damageState
attr_accessor :initialHP # Set at the start of each move's usage attr_accessor :initialHP # Set at the start of each move's usage
attr_accessor :hasTempSpeciesChange
#============================================================================= #=============================================================================
# Complex accessors # Complex accessors

View File

@@ -616,7 +616,6 @@ class PokeBattle_Battler
end end
# def changeUnfusedSpecies(pokemon, newSpecies, animation = "UltraBurst2") # def changeUnfusedSpecies(pokemon, newSpecies, animation = "UltraBurst2")
# #
# end # end

View File

@@ -1504,6 +1504,48 @@ BattleHandlers::TargetAbilityOnHit.add(:JUSTIFIED,
} }
) )
BattleHandlers::TargetAbilityOnHit.add(:CORRUPTION,
proc { |ability,user,target,move,battle|
next if user.fainted?
next if user.ability == :CORRUPTION
oldAbil = nil
#next if user.unstoppableAbility? || user.ability == ability
if move.specialMove?
user.pokemon.tempSpeciesChange_originalSpecies = user.pokemon.species if !user.pokemon.tempSpeciesChange_originalSpecies
user.pokemon.species = user.pokemon.tempSpeciesChange_originalSpecies
battle.pbShowAbilitySplash(target) if user.opposes?(target)
body_species_number = GameData::Species.get(user.pokemon.species).get_body_species
body_species = GameData::Species.get(body_species_number).id
oldAbil = user.ability
user.ability = ability
user.changeSpecies(user.pokemon, body_species, :MISSINGNO, "Paralysis")
user.pbUpdate(true)
battle.scene.pbChangePokemon(user,user.pokemon)
battle.scene.pbRefreshOne(user.index)
elsif move.physicalMove?
user.pokemon.tempSpeciesChange_originalSpecies = user.pokemon.species if !user.pokemon.tempSpeciesChange_originalSpecies
user.pokemon.species = user.pokemon.tempSpeciesChange_originalSpecies
battle.pbShowAbilitySplash(target) if user.opposes?(target)
head_species_number = GameData::Species.get(user.pokemon.species).get_head_species
head_species = GameData::Species.get(head_species_number).id
user.changeSpecies(user.pokemon, head_species, :MISSINGNO, "Paralysis")
user.pbUpdate(true)
oldAbil = user.ability
user.ability = ability
battle.scene.pbChangePokemon(user,user.pokemon)
battle.scene.pbRefreshOne(user.index)
end
user.pbOnAbilityChanged(oldAbil) if oldAbil != nil
battle.pbHideAbilitySplash(target) if user.opposes?(target)
}
)
BattleHandlers::TargetAbilityOnHit.add(:MUMMY, BattleHandlers::TargetAbilityOnHit.add(:MUMMY,
proc { |ability,user,target,move,battle| proc { |ability,user,target,move,battle|
next if !move.pbContactMove?(user) next if !move.pbContactMove?(user)

View File

@@ -717,6 +717,7 @@ def pbAfterBattle(decision,canLose)
pkmn.statusCount = 0 if pkmn.status == :POISON # Bad poison becomes regular pkmn.statusCount = 0 if pkmn.status == :POISON # Bad poison becomes regular
pkmn.makeUnmega pkmn.makeUnmega
pkmn.makeUnprimal pkmn.makeUnprimal
pkmn.species = pkmn.tempSpeciesChange_originalSpecies if pkmn.tempSpeciesChange_originalSpecies
end end
if $PokemonGlobal.partner if $PokemonGlobal.partner
$Trainer.heal_party $Trainer.heal_party

View File

@@ -112,6 +112,7 @@ class Pokemon
attr_accessor :size_category #the size attribute for scaling the sprite (used only for gourgeist/pumpkaboo) attr_accessor :size_category #the size attribute for scaling the sprite (used only for gourgeist/pumpkaboo)
attr_accessor :force_disobey attr_accessor :force_disobey
attr_accessor :tempSpeciesChange_originalSpecies
# Max total IVs # Max total IVs
IV_STAT_LIMIT = 31 IV_STAT_LIMIT = 31

View File

@@ -41,6 +41,7 @@ class Pokemon
self.form = unmegaForm if unmegaForm >= 0 self.form = unmegaForm if unmegaForm >= 0
end end
def megaName def megaName
formName = species_data.form_name formName = species_data.form_name
return (formName && !formName.empty?) ? formName : _INTL("Mega {1}", species_data.name) return (formName && !formName.empty?) ? formName : _INTL("Mega {1}", species_data.name)

View File

@@ -857,17 +857,12 @@ def replaceFusionSpecies(pokemon, speciesToChange, newSpecies)
should_update_body = currentBody == speciesToChange should_update_body = currentBody == speciesToChange
should_update_head = currentHead == speciesToChange should_update_head = currentHead == speciesToChange
echoln speciesToChange
echoln currentBody
echoln currentHead
return if !should_update_body && !should_update_head return if !should_update_body && !should_update_head
newSpeciesBody = should_update_body ? newSpecies : currentBody newSpeciesBody = should_update_body ? newSpecies : currentBody
newSpeciesHead = should_update_head ? newSpecies : currentHead newSpeciesHead = should_update_head ? newSpecies : currentHead
newSpecies = getFusionSpecies(newSpeciesBody, newSpeciesHead) newSpecies = getFusionSpecies(newSpeciesBody, newSpeciesHead)
echoln newSpecies.id_number
pokemon.species = newSpecies pokemon.species = newSpecies
end end

View File

@@ -73,7 +73,6 @@ def fetch_sprite_from_web(url, destinationPath)
return true return true
end end
echoln "Failed to download #{url}" echoln "Failed to download #{url}"
echoln caller
return false return false
rescue MKXPError => e rescue MKXPError => e
echoln "MKXPError: #{e.message}" echoln "MKXPError: #{e.message}"

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.