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

indexed custom battlers

Browse Source
This commit is contained in:
infinitefusion
2022-11-29 20:22:16 -05:00
parent 572796d7cc
commit 7cd9760adf
40 changed files with 63 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/001_Settings.rb
View File

@@ -6,7 +6,7 @@
module Settings
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
GAME_VERSION = '5.0.0'
GAME_VERSION_NUMBER = "5.0.36.4"
GAME_VERSION_NUMBER = "5.1.0"
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18

1
Data/Scripts/010_Data/002_PBS data/013_TrainerModern.rb
View File

@@ -299,6 +299,7 @@ module GameData
level = getRematchLevel(level, nbRematch)
species = evolveRematchPokemon(nbRematch, species)
end
pkmn = Pokemon.new(species, level, trainer, false)
trainer.party.push(pkmn)

3
Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -578,10 +578,13 @@ class PokeBattle_Battler
if !inSwordForm && attacking
user.effects[PBEffects::PowerTrick] = true
user.attack,user.defense = user.defense,user.attack
user.spatk,user.spdef = user.spdef,user.spatk
@battle.pbDisplay(_INTL("{1} changed to Sword Mode!",pbThis))
elsif inSwordForm && !attacking
user.effects[PBEffects::PowerTrick] = false
user.attack,user.defense = user.defense,user.attack
user.spatk,user.spdef = user.spdef,user.spatk
@battle.pbDisplay(_INTL("{1} changed to Shield Mode!",pbThis))
end
end

42
Data/Scripts/016_UI/015_UI_Options.rb
View File

@@ -434,24 +434,30 @@ class PokemonOption_Scene
end
}, "Sets the volume for sound effects"
)
if $game_switches && ($game_switches[SWITCH_NEW_GAME_PLUS] || $game_switches[SWITCH_BEAT_THE_LEAGUE]) #beat the league
options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast"), _INTL("Instant")],
proc { $PokemonSystem.textspeed },
proc { |value|
$PokemonSystem.textspeed = value
MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
}, "Sets the speed at which the text is displayed"
)
else
options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast")],
proc { $PokemonSystem.textspeed },
proc { |value|
$PokemonSystem.textspeed = value
MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
}, "Sets the speed at which the text is displayed"
)
end
options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast")],
proc { $PokemonSystem.textspeed },
proc { |value|
$PokemonSystem.textspeed = value
MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
}, "Sets the speed at which the text is displayed"
)
# if $game_switches && ($game_switches[SWITCH_NEW_GAME_PLUS] || $game_switches[SWITCH_BEAT_THE_LEAGUE]) #beat the league
# options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast"), _INTL("Instant")],
# proc { $PokemonSystem.textspeed },
# proc { |value|
# $PokemonSystem.textspeed = value
# MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
# }, "Sets the speed at which the text is displayed"
# )
# else
# options << EnumOption.new(_INTL("Text Speed"), [_INTL("Normal"), _INTL("Fast")],
# proc { $PokemonSystem.textspeed },
# proc { |value|
# $PokemonSystem.textspeed = value
# MessageConfig.pbSetTextSpeed(MessageConfig.pbSettingToTextSpeed(value))
# }, "Sets the speed at which the text is displayed"
# )
# end
if $game_switches
options <<

2
Data/Scripts/048_Fusion/PokemonFusion.rb
View File

@@ -814,7 +814,7 @@ def setFusionMoves(fusedPoke, poke2, selected2ndOption = false)
bodySpeciesName = GameData::Species.get(bodySpecies).real_name
headSpeciesName = GameData::Species.get(headSpecies).real_name
choice = Kernel.pbMessage("What to do with the moveset?", [_INTL("Learn moves"), _INTL("Keep {1}'s moveset", bodySpeciesName), _INTL("Keep {1}'s moveset", headSpeciesName)], 0)
choice = Kernel.pbMessage("What to do with the moveset?", [_INTL("Combine movesets"), _INTL("Keep {1}'s moveset", bodySpeciesName), _INTL("Keep {1}'s moveset", headSpeciesName)], 0)
if choice == 1
if selected2ndOption
fusedPoke.moves = poke2.moves

1
Data/Scripts/049_Compatibility/PBItems.rb
View File

@@ -315,7 +315,6 @@ module PBItems
TM24 = 311
TM25 = 312
TM26 = 313
TM27 = 314
TM27 = 315
TM29 = 316
TM30 = 317

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

@@ -163,10 +163,12 @@ module GameData
if dex_number <= Settings::NB_POKEMON
folder = dex_number.to_s
filename = sprintf("%s.png", dex_number)
head_id=nil
else
if dex_number >= Settings::ZAPMOLCUNO_NB
specialPath = getSpecialSpriteName(dex_number)
return pbResolveBitmap(specialPath)
head_id=nil
else
body_id = getBodyID(dex_number)
head_id = getHeadID(dex_number, body_id)
@@ -174,7 +176,7 @@ module GameData
filename = sprintf("%s.%s.png", head_id, body_id)
end
end
customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + filename)
customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" +filename)
species = getSpecies(dex_number)
use_custom = customPath && !species.always_use_generated
if use_custom

2
Data/Scripts/050_AddOns/Gen 2.rb
View File

@@ -106,7 +106,7 @@ BATTLERSPATH = "Battlers"
def GetSpritePath(poke1, poke2, isFused)
#Check if custom exists
spritename = GetSpriteName(poke1, poke2, isFused)
pathCustom = sprintf("Graphics/%s/%s.png", DOSSIERCUSTOMSPRITES, spritename)
pathCustom = sprintf("Graphics/%s/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
path = pbResolveBitmap(pathCustom) && $game_variables[196] == 0 ? pathCustom : pathReg
return path

5
Data/Scripts/050_AddOns/IntroScreen.rb
View File

@@ -20,11 +20,6 @@ class Scene_Intro
intro_bgm = "INTRO_music_cries"
intro_movie = Movie.new(intro_frames_path,intro_bgm,230,true)
intro_movie.playInViewPort(@viewport)
while(!intro_movie.finished)
echo intro_movie.finished
echo "\n"
wait(8)
end
end
def main

8
Data/Scripts/050_AddOns/Movie.rb
View File

@@ -42,13 +42,7 @@ class Movie
pbBGMPlay(@bgm)
while (@currentFrame <= @maxFrame)# && !(@canStopEarly && Input::ACTION))
Input.update
if Input.trigger?(Input::C)
echo "bruh"
echo "\n"
end
break if Input.trigger?(Input::ACTION) && @canStopEarly
break if Input.trigger?(Input::C) && @canStopEarly
frame = sprintf(@framesPath, @currentFrame)
picture = Sprite.new(viewport)
picture.bitmap = pbBitmap(frame)

1
Data/Scripts/050_AddOns/MultiSaves.rb
View File

@@ -356,6 +356,7 @@ class PokemonLoadScreen
when cmd_continue
@scene.pbEndScene
Game.load(@save_data)
$game_switches[SWITCH_V5_1]=true
return
when cmd_new_game
@scene.pbEndScene

4
Data/Scripts/050_AddOns/UI_Pokedex_SpritesPage.rb
View File

@@ -147,12 +147,12 @@ class PokemonPokedexInfo_Scene
head_id = getHeadID(@species, body_id)
baseFilename = head_id.to_s + "." + body_id.to_s
baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER + baseFilename + ".png"
baseFilePath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" + baseFilename + ".png"
if pbResolveBitmap(baseFilePath)
ret << baseFilePath
end
POSSIBLE_ALTS.each { |alt_letter|
altFilePath = Settings::CUSTOM_BATTLERS_FOLDER + baseFilename + alt_letter + ".png"
altFilePath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" + baseFilename + alt_letter + ".png"
if pbResolveBitmap(altFilePath)
ret << altFilePath
end

6
Data/Scripts/050_AddOns/mapExporter2.rb
View File

@@ -1,8 +1,10 @@
EXPORT_EXCEPT_MAP_IDS= [768,722,723,724,720]
def exportAllMaps
for id in 725..768
for id in 768..784
begin
MapExporter.export(id, [:Events])
MapExporter.export(id, [:Events]) if !EXPORT_EXCEPT_MAP_IDS.include?(id)
rescue
echo "error in " +(id.to_s) +"\n"
end

21
Data/Scripts/999_Main/999_Main.rb
View File

@@ -22,8 +22,29 @@ def mainFunction
return 1
end
def sortCustomBattlers()
customBattlersFolder = 'Graphics/CustomBattlers'
echo "Sorting CustomBattlers files..."
Dir.foreach(customBattlersFolder) do |filename|
next if filename == '.' or filename == '..'
next if !filename.end_with?(".png")
headNum = filename.split('.')[0]
oldPath = customBattlersFolder + "/" + filename
newPath = customBattlersFolder + "/" + headNum.to_s + "/" +filename
echo "\n"
echo "Sorted " + filename + " into " + newPath
begin
File.rename(oldPath, newPath)
rescue
echo "Could not sort "+ filename
end
end
end
def mainFunctionDebug
begin
sortCustomBattlers()
MessageTypes.loadMessageFile("Data/messages.dat") if safeExists?("Data/messages.dat")
PluginManager.runPlugins
Compiler.main