Merge branch 'dev' into ai

This commit is contained in:
Maruno17
2023-02-10 21:20:28 +00:00
33 changed files with 341 additions and 1055 deletions

View File

@@ -37,7 +37,7 @@ def pbNewTrainer(tr_type, tr_name, tr_version, save_changes = true)
if save_changes
trainer_hash = {
:trainer_type => tr_type,
:name => tr_name,
:real_name => tr_name,
:version => tr_version,
:pokemon => []
}
@@ -50,7 +50,7 @@ def pbNewTrainer(tr_type, tr_name, tr_version, save_changes = true)
)
end
# Add trainer's data to records
trainer_hash[:id] = [trainer_hash[:trainer_type], trainer_hash[:name], trainer_hash[:version]]
trainer_hash[:id] = [trainer_hash[:trainer_type], trainer_hash[:real_name], trainer_hash[:version]]
GameData::Trainer.register(trainer_hash)
GameData::Trainer.save
pbConvertTrainerData