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

unfuse traded fusions + some fixes

Browse Source
This commit is contained in:
infinitefusion
2021-10-16 16:41:03 -04:00
parent ce8ce1f934
commit fc5a71b46f
27 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/050_AddOns/New Items effects.rb
View File

@@ -1390,8 +1390,8 @@ def pbDNASplicing(pokemon, scene, supersplicers = false, superSplicer = false)
end
#On ajoute l'autre dans le pokedex aussi
$Trainer.pokedex.set_seen(poke1.species)
$Trainer.pokedex.set_owned(poke1.species)
# $Trainer.pokedex.set_seen(poke1.species)
# $Trainer.pokedex.set_owned(poke1.species)
pokemon.species = poke1.species
pokemon.level = poke1.level

11
Data/Scripts/050_AddOns/PokemonFusion.rb
View File

@@ -562,6 +562,15 @@ class PokemonFusionScene
@sprites["rsprite2"] = rsprite2
@sprites["rsprite3"] = rsprite3
@sprites["rsprite1"].zoom_x = Settings::FRONTSPRITE_SCALE
@sprites["rsprite1"].zoom_y = Settings::FRONTSPRITE_SCALE
@sprites["rsprite2"].zoom_x = Settings::FRONTSPRITE_SCALE
@sprites["rsprite2"].zoom_y = Settings::FRONTSPRITE_SCALE
@sprites["rsprite3"].zoom_x = Settings::FRONTSPRITE_SCALE
@sprites["rsprite3"].zoom_y = Settings::FRONTSPRITE_SCALE
pbGenerateMetafiles(rsprite1.ox, rsprite1.oy, rsprite2.ox, rsprite2.oy, rsprite3.ox, rsprite3.oy, rsprite1.x, rsprite3.x)
@sprites["msgwindow"] = Kernel.pbCreateMessageWindow(@viewport)
@@ -718,6 +727,8 @@ class PokemonFusionScene
#make it untraded, pour qu'on puisse le unfused après, même si un des 2 était traded
@pokemon1.obtain_method = 0
@pokemon1.owner = Pokemon::Owner.new_from_trainer($Trainer)
@pokemon1.ability = pbChooseAbility(@pokemon1, hiddenAbility1, hiddenAbility2)
if superSplicer