mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2026-03-12 11:21:59 +00:00
update 6.7
This commit is contained in:
@@ -8,20 +8,19 @@ class Player < Trainer
|
||||
alias pokemonEssentials_player_initialize initialize
|
||||
def initialize(*args)
|
||||
pokemonEssentials_player_initialize(*args)
|
||||
@rival_appearance = init_rival_appearance
|
||||
end
|
||||
|
||||
|
||||
|
||||
def init_rival_appearance
|
||||
if isPlayerMale
|
||||
return TrainerAppearance.new(5,
|
||||
@rival_appearance= TrainerAppearance.new(5,
|
||||
HAT_MAY,
|
||||
CLOTHES_MAY,
|
||||
getFullHairId(HAIR_MAY,3) ,
|
||||
0, 0, 0)
|
||||
else
|
||||
return TrainerAppearance.new(5,
|
||||
@rival_appearance= TrainerAppearance.new(5,
|
||||
HAT_BRENDAN,
|
||||
CLOTHES_BRENDAN,
|
||||
getFullHairId(HAIR_BRENDAN,3),
|
||||
@@ -69,7 +68,7 @@ class Sprite_Character
|
||||
end
|
||||
end
|
||||
|
||||
def get_rival_starter
|
||||
def get_hoenn_rival_starter
|
||||
case get_rival_starter_type()
|
||||
when :GRASS
|
||||
return obtainStarter(0)
|
||||
@@ -225,11 +224,11 @@ def initializeRivalBattledTrainer
|
||||
trainer_type = :RIVAL1
|
||||
trainer_name = isPlayerMale ? "May" : "Brendan"
|
||||
trainer_appearance = $Trainer.rival_appearance
|
||||
rivalBattledTrainer = BattledTrainer.new(trainer_type,trainer_name,0)
|
||||
rivalBattledTrainer = BattledTrainer.new(trainer_type,trainer_name,0,BATTLED_TRAINER_RIVAL_KEY)
|
||||
rivalBattledTrainer.set_custom_appearance(trainer_appearance)
|
||||
echoln rivalBattledTrainer.currentTeam
|
||||
team = []
|
||||
team<<Pokemon.new(get_rival_starter,5)
|
||||
team<<Pokemon.new(get_hoenn_rival_starter,5)
|
||||
rivalBattledTrainer.currentTeam =team
|
||||
return rivalBattledTrainer
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user