DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-10 06:34:59 +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

8
Data/Scripts/016_Pokemon/001_Pokemon.rb
View File

@@ -139,7 +139,7 @@ class Pokemon
yield if block_given?
MultipleForms.call("onSetForm", self, value, oldForm)
calc_stats
pbSeenForm(self)
$Trainer.pokedex.register(self)
end
def setForm(value)
@@ -781,7 +781,7 @@ class Pokemon
@owner = new_owner
end
# @param trainer [PlayerTrainer, NPCTrainer] the trainer to compare to the original trainer
# @param trainer [Player, NPCTrainer] the trainer to compare to the original trainer
# @return [Boolean] whether the given trainer is not this Pokémon's original trainer
def foreign?(trainer)
return @owner.id != trainer.id || @owner.name != trainer.name
@@ -1045,7 +1045,7 @@ class Pokemon
# Creates a new Pokémon object.
# @param species [Symbol, String, Integer] Pokémon species
# @param level [Integer] Pokémon level
# @param owner [Owner, PlayerTrainer, NPCTrainer] Pokémon owner (the player by default)
# @param owner [Owner, Player, NPCTrainer] Pokémon owner (the player by default)
# @param withMoves [TrueClass, FalseClass] whether the Pokémon should have moves
# @param rechech_form [TrueClass, FalseClass] whether to auto-check the form
def initialize(species, level, owner = $Trainer, withMoves = true, recheck_form = true)
@@ -1089,7 +1089,7 @@ class Pokemon
end
if owner.is_a?(Owner)
@owner = owner
elsif owner.is_a?(PlayerTrainer) || owner.is_a?(NPCTrainer)
elsif owner.is_a?(Player) || owner.is_a?(NPCTrainer)
@owner = Owner.new_from_trainer(owner)
else
@owner = Owner.new(0, '', 2, 2)

4
Data/Scripts/016_Pokemon/006_Pokemon_Owner.rb
View File

@@ -25,10 +25,10 @@ class Pokemon
end
# Returns a new Owner object populated with values taken from +trainer+.
# @param trainer [PlayerTrainer, NPCTrainer] trainer object to read data from
# @param trainer [Player, NPCTrainer] trainer object to read data from
# @return [Owner] new Owner object
def self.new_from_trainer(trainer)
validate trainer => [PlayerTrainer, NPCTrainer]
validate trainer => [Player, NPCTrainer]
return new(trainer.id, trainer.name, trainer.gender, trainer.language)
end