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

Split PokeBattle_Trainer into PlayerTrainer and NPCTrainer

Browse Source
This commit is contained in:
Maruno17
2021-01-24 17:55:39 +00:00
parent 7de034957b
commit 4098b1cd11
60 changed files with 748 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/018_Minigames/001_PMinigame_Duel.rb
View File

@@ -49,9 +49,9 @@ class PokemonDuel
@viewport.z = 99999
@sprites = {}
@sprites["player"] = IconSprite.new(-128 - 32, 96, @viewport)
@sprites["player"].setBitmap(GameData::TrainerType.front_sprite_filename($Trainer.trainertype))
@sprites["player"].setBitmap(GameData::TrainerType.front_sprite_filename($Trainer.trainer_type))
@sprites["opponent"] = IconSprite.new(Graphics.width + 32, 96, @viewport)
@sprites["opponent"].setBitmap(GameData::TrainerType.front_sprite_filename(opponent.trainertype))
@sprites["opponent"].setBitmap(GameData::TrainerType.front_sprite_filename(opponent.trainer_type))
@sprites["playerwindow"] = DuelWindow.new($Trainer.name, false)
@sprites["playerwindow"].x = -@sprites["playerwindow"].width
@sprites["playerwindow"].viewport = @viewport
@@ -381,7 +381,7 @@ end
def pbDuel(trainer_id, trainer_name, event, speeches)
trainer_id = GameData::TrainerType.get(trainer_id).id
duel = PokemonDuel.new
opponent = PokeBattle_Trainer.new(
opponent = NPCTrainer.new(
pbGetMessageFromHash(MessageTypes::TrainerNames,trainer_name), trainer_id)
speech_texts = []
for i in 0...12

7
Data/Scripts/018_Minigames/002_PMinigame_TripleTriad.rb
View File

@@ -769,12 +769,13 @@ class TriadScreen
candidates = []
while candidates.length < 200
card = species_keys[rand(species_keys.length)]
card = GameData::Species.get(card).id # Make sure it's a symbol
card_data = GameData::Species.get(card)
card = card_data.id # Make sure it's a symbol
triad = TriadCard.new(card)
total = triad.north + triad.south + triad.east + triad.west
# Add random species and its total point count
candidates.push([card, total])
if candidates.length < 200 && $Trainer.owned[card]
if candidates.length < 200 && $Trainer.owned?(card_data.species)
# Add again if player owns the species
candidates.push([card, total])
end
@@ -1048,7 +1049,7 @@ def pbBuyTriads
realcommands = []
GameData::Species.each do |s|
next if s.form != 0
next if !$Trainer.owned[s.id]
next if !$Trainer.owned?(s.species)
price = TriadCard.new(i).price
commands.push([price, s.name, _INTL("{1} - ${2}", s.name, price.to_s_formatted), s.id])
end