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

additional triple fusions + small pokedex fixes

Browse Source
This commit is contained in:
infinitefusion
2022-04-24 13:49:58 -04:00
parent b190416123
commit c01641e73c
28 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -172,7 +172,11 @@ class Pokemon
end
def isFusion?
return species_data.id_number > NB_POKEMON
return species_data.id_number > NB_POKEMON && !self.isTripleFusion?
end
def isTripleFusion?
return species_data.id_number >= Settings::ZAPMOLCUNO_NB
end
def form

6
Data/Scripts/015_Trainers and player/005_Player_Pokedex.rb
View File

@@ -87,7 +87,11 @@ class Player < Trainer
end
def set_seen_triple(species)
species_id = GameData::Species.try_get(species)&.species
if species.is_a?(Pokemon)
species_id = species.species
else
species_id = GameData::Species.try_get(species)&.species
end
return if species_id.nil?
@seen_triple[species_id] = true
end

3
Data/Scripts/016_UI/003_UI_Pokedex_Main.rb
View File

@@ -359,6 +359,9 @@ class PokemonPokedex_Scene
end
def pbRefreshDexList(index=0)
if index == nil
index = 0
end
dexlist = pbGetDexList
case $PokemonGlobal.pokedexMode
when MODENUMERICAL

4
Data/Scripts/016_UI/004_UI_Pokedex_Entry.rb
View File

@@ -213,11 +213,11 @@ class PokemonPokedexInfo_Scene
species_data = GameData::Species.get_species_form(@species, @form)
# Write various bits of text
indexText = "???"
if @dexlist[@index][4] > 0
#if @dexlist[@index][4] > 0
indexNumber = @dexlist[@index][4]
indexNumber -= 1 if @dexlist[@index][5]
indexText = sprintf("%03d", indexNumber)
end
# end
textpos = [
[_INTL("{1}{2} {3}", indexText, " ", species_data.name),
246, 36, 0, Color.new(248, 248, 248), Color.new(0, 0, 0)],

26
Data/Scripts/016_UI/006_UI_Summary.rb
View File

@@ -398,19 +398,19 @@ class PokemonSummary_Scene
# Write the Regional/National Dex number
dexnum = GameData::Species.get(@pokemon.species).id_number
dexnumshift = false
if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked
dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
else
dexnum = 0
for i in 0...$Trainer.pokedex.dexes_count - 1
next if !$Trainer.pokedex.unlocked?(i)
num = pbGetRegionalNumber(i,@pokemon.species)
next if num<=0
dexnum = num
dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(i)
break
end
end
# if $Trainer.pokedex.unlocked?(-1) # National Dex is unlocked
# dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(-1)
# else
# dexnum = 0
# for i in 0...$Trainer.pokedex.dexes_count - 1
# next if !$Trainer.pokedex.unlocked?(i)
# num = pbGetRegionalNumber(i,@pokemon.species)
# next if num<=0
# dexnum = num
# dexnumshift = true if Settings::DEXES_WITH_OFFSETS.include?(i)
# break
# end
# end
if dexnum<=0
textpos.push(["???",435,74,2,dexNumBase,dexNumShadow])
else

2
Data/Scripts/016_UI/013_UI_Load.rb
View File

@@ -284,7 +284,7 @@ class PokemonLoadScreen
cmd_debug = -1
cmd_quit = -1
show_continue = !@save_data.empty?
new_game_plus = show_continue && @save_data[:player].new_game_plus_unlocked
new_game_plus = show_continue && (@save_data[:player].new_game_plus_unlocked || $DEBUG)
if show_continue
commands[cmd_continue = commands.length] = _INTL('Continue')
if @save_data[:player].mystery_gift_unlocked

2
Data/Scripts/049_Compatibility/PBSpecies.rb
View File

@@ -1,7 +1,7 @@
module PBSpecies
#couldn't figure out how to get the size of GameData::Species so fuck it, here's the hardcoded value
def PBSpecies.maxValue
return 176832
return 176840
end
def PBSpecies.getName(species)

19
Data/Scripts/050_AddOns/FusionSprites.rb
View File

@@ -54,6 +54,8 @@ module GameData
return sprintf(base_path +"349.350.351")
when Settings::ZAPMOLCUNO_NB+6
return sprintf(base_path +"151.251.381")
when Settings::ZAPMOLCUNO_NB+11
return sprintf(base_path +"150.348.380")
#starters
when Settings::ZAPMOLCUNO_NB+7
return sprintf(base_path +"3.6.9")
@@ -63,6 +65,23 @@ module GameData
return sprintf(base_path +"278.281.284")
when Settings::ZAPMOLCUNO_NB+10
return sprintf(base_path +"318.321.324")
#starters prevos
when Settings::ZAPMOLCUNO_NB+12
return sprintf(base_path +"1.4.7")
when Settings::ZAPMOLCUNO_NB+13
return sprintf(base_path +"2.5.8")
when Settings::ZAPMOLCUNO_NB+14
return sprintf(base_path +"152.155.158")
when Settings::ZAPMOLCUNO_NB+15
return sprintf(base_path +"153.156.159")
when Settings::ZAPMOLCUNO_NB+16
return sprintf(base_path +"276.279.282")
when Settings::ZAPMOLCUNO_NB+17
return sprintf(base_path +"277.280.283")
when Settings::ZAPMOLCUNO_NB+18
return sprintf(base_path +"316.319.322")
when Settings::ZAPMOLCUNO_NB+19
return sprintf(base_path +"317.320.323")
else
return sprintf(base_path + "000")
end