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

Fixed: some items not working in battle, typo in Shell Trap's AI, Vs animation not triggering, Battle Factory Pokémon being chosen incorrectly, Battle Factory double mode being single battles, some game data not being cleared when compiling

Browse Source
This commit is contained in:
Maruno17
2021-06-12 15:44:13 +01:00
parent 7c3fdb9ef8
commit 63fb7aadf7
9 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/015_Trainers and player/001_Trainer.rb
View File

@@ -170,7 +170,7 @@ class Trainer
#=============================================================================
def initialize(name, trainer_type)
@trainer_type = trainer_type
@trainer_type = GameData::TrainerType.get(trainer_type).id
@name = name
@id = rand(2 ** 16) | rand(2 ** 16) << 16
@language = pbGetLanguage

7
Data/Scripts/015_Trainers and player/004_Player.rb
View File

@@ -31,6 +31,13 @@ class Player < Trainer
# @return [Array<Array>] downloaded Mystery Gift data
attr_accessor :mystery_gifts
def trainer_type
if @trainer_type.is_a?(Integer)
@trainer_type = GameData::Metadata.get_player(@character_ID || 0)[0]
end
return @trainer_type
end
# Sets the player's money. It can not exceed {Settings::MAX_MONEY}.
# @param value [Integer] new money value
def money=(value)