DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-08 21:54:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed class PlayerTrainer to class Player, implemented class Player#Pokedex

Browse Source
This commit is contained in:
Maruno17
2021-04-11 20:45:44 +01:00
parent dcd0fe8b21
commit e49ddde198
32 changed files with 637 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Data/Scripts/012_Battle/003_Battle/001_PokeBattle_BattleCommon.rb
View File

@@ -42,20 +42,17 @@ module PokeBattle_BattleCommon
# Register all caught Pokémon in the Pokédex, and store them.
def pbRecordAndStoreCaughtPokemon
@caughtPokemon.each do |pkmn|
pbSeenForm(pkmn) # In case the form changed upon leaving battle
pbPlayer.pokedex.register(pkmn) # In case the form changed upon leaving battle
# Record the Pokémon's species as owned in the Pokédex
if !pbPlayer.hasOwned?(pkmn.species)
pbPlayer.set_owned(pkmn.species)
if $Trainer.pokedex
pbPlayer.pokedex.set_owned(pkmn.species)
if $Trainer.has_pokedex
pbDisplayPaused(_INTL("{1}'s data was added to the Pokédex.",pkmn.name))
@scene.pbShowPokedex(pkmn.species)
end
end
# Record a Shadow Pokémon's species as having been caught
if pkmn.shadowPokemon?
pbPlayer.owned_shadow = {} if !pbPlayer.owned_shadow
pbPlayer.owned_shadow[pkmn.species] = true
end
pbPlayer.pokedex.set_shadow_pokemon_owned(pkmn.species) if pkmn.shadowPokemon?
# Store caught Pokémon
pbStorePokemon(pkmn)
end
@@ -194,7 +191,7 @@ module PokeBattle_BattleCommon
# Critical capture check
if Settings::ENABLE_CRITICAL_CAPTURES
c = 0
numOwned = $Trainer.owned_count
numOwned = $Trainer.pokedex.owned_count
if numOwned>600; c = x*5/12
elsif numOwned>450; c = x*4/12
elsif numOwned>300; c = x*3/12

5
Data/Scripts/012_Battle/003_Battle/002_PokeBattle_Battle.rb
View File

@@ -115,7 +115,7 @@ class PokeBattle_Battle
@caughtPokemon = []
player = [player] if !player.nil? && !player.is_a?(Array)
opponent = [opponent] if !opponent.nil? && !opponent.is_a?(Array)
@player = player # Array of PlayerTrainer/NPCTrainer objects, or nil
@player = player # Array of Player/NPCTrainer objects, or nil
@opponent = opponent # Array of NPCTrainer objects, or nil
@items = nil
@endSpeeches = []
@@ -622,8 +622,7 @@ class PokeBattle_Battle
def pbSetSeen(battler)
return if !battler || !@internalBattle
pbPlayer.set_seen(battler.displaySpecies)
pbSeenForm(battler.displaySpecies,battler.displayGender,battler.displayForm)
pbPlayer.pokedex.register(battler.displaySpecies,battler.displayGender,battler.displayForm)
end
def nextPickupUse

3
Data/Scripts/012_Battle/006_Other battle types/002_PokeBattle_SafariZone.rb
View File

@@ -421,8 +421,7 @@ class PokeBattle_SafariZone
def pbStartBattle
begin
pkmn = @party2[0]
self.pbPlayer.set_seen(pkmn.species)
pbSeenForm(pkmn)
self.pbPlayer.pokedex.register(pkmn)
@scene.pbStartBattle(self)
pbDisplayPaused(_INTL("Wild {1} appeared!",pkmn.name))
@scene.pbSafariStart

6
Data/Scripts/012_Battle/006_Other battle types/006_PokeBattle_BattleRecord.rb
View File

@@ -146,15 +146,15 @@ module BattlePlayerHelper
return nil if !trainer
if trainer.length>1
ret = []
ret[0]=PlayerTrainer.new(trainer[0][1],trainer[0][0])
ret[0]=Player.new(trainer[0][1],trainer[0][0])
ret[0].id = trainer[0][2]
ret[0].badges = trainer[0][3]
ret[1] = PlayerTrainer.new(trainer[1][1],trainer[1][0])
ret[1] = Player.new(trainer[1][1],trainer[1][0])
ret[1].id = trainer[1][2]
ret[1].badges = trainer[1][3]
return ret
else
ret = PlayerTrainer.new(trainer[0][1],trainer[0][0])
ret = Player.new(trainer[0][1],trainer[0][0])
ret.id = trainer[0][2]
ret.badges = trainer[0][3]
return ret