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

Finalised input names, added some more save file conversion code

Browse Source
This commit is contained in:
Maruno17
2021-04-11 15:18:04 +01:00
parent 614e0ed9a2
commit e5a0e3acdd
39 changed files with 145 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Data/Scripts/017_UI/001_Animations/002_UI_Controls.rb
View File

@@ -24,8 +24,8 @@ class ButtonEventScene < EventScene
addLabelForScreen(2, 134, 84, 352, _INTL("Used to confirm a choice, interact with people and things, and move through text. (Default: C)"))
addLabelForScreen(2, 134, 212, 352, _INTL("Used to exit, cancel a choice, and cancel a mode. Also used to open the Pause Menu. (Default: X)"))
addImageForScreen(3, 16, 90, "Graphics/Pictures/help_specialkey")
addImageForScreen(3, 16, 252, "Graphics/Pictures/help_zkey")
addImageForScreen(3, 16, 90, "Graphics/Pictures/help_actionkey")
addImageForScreen(3, 16, 252, "Graphics/Pictures/help_specialkey")
addLabelForScreen(3, 134, 52, 352, _INTL("Has various functions depending on context. While moving around, hold to move at a different speed. (Default: Z)"))
addLabelForScreen(3, 134, 212, 352, _INTL("Press to open the Ready Menu, where registered items and available field moves can be used. (Default: D)"))

6
Data/Scripts/017_UI/003_UI_PokedexMain.rb
View File

@@ -953,7 +953,7 @@ class PokemonPokedex_Scene
pbPlayCursorSE if index!=oldindex
end
end
if Input.trigger?(Input::SPECIAL)
if Input.trigger?(Input::ACTION)
index = -2
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::BACK)
@@ -1068,7 +1068,7 @@ class PokemonPokedex_Scene
elsif index==7 || index==8; index += 1
end
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::SPECIAL)
elsif Input.trigger?(Input::ACTION)
index = 8
pbPlayCursorSE if index!=oldindex
elsif Input.trigger?(Input::BACK)
@@ -1161,7 +1161,7 @@ class PokemonPokedex_Scene
$PokemonGlobal.pokedexIndex[pbGetSavePositionIndex] = @sprites["pokedex"].index if !@searchResults
pbRefresh
end
if Input.trigger?(Input::SPECIAL)
if Input.trigger?(Input::ACTION)
pbPlayDecisionSE
@sprites["pokedex"].active = false
pbDexSearch

4
Data/Scripts/017_UI/004_UI_PokedexEntry.rb
View File

@@ -453,7 +453,7 @@ class PokemonPokedexInfo_Scene
Input.update
pbUpdate
dorefresh = false
if Input.trigger?(Input::SPECIAL)
if Input.trigger?(Input::ACTION)
pbSEStop
GameData::Species.play_cry_from_species(@species, @form) if @page == 1
elsif Input.trigger?(Input::BACK)
@@ -521,7 +521,7 @@ class PokemonPokedexInfo_Scene
Graphics.update
Input.update
pbUpdate
if Input.trigger?(Input::SPECIAL)
if Input.trigger?(Input::ACTION)
pbSEStop
GameData::Species.play_cry_from_species(@species, @form)
elsif Input.trigger?(Input::BACK)

4
Data/Scripts/017_UI/005_UI_Party.rb
View File

@@ -706,10 +706,10 @@ class PokemonParty_Scene
end
end
cancelsprite = Settings::MAX_PARTY_SIZE + ((@multiselect) ? 1 : 0)
if Input.trigger?(Input::SPECIAL) && canswitch==1 && @activecmd!=cancelsprite
if Input.trigger?(Input::ACTION) && canswitch==1 && @activecmd!=cancelsprite
pbPlayDecisionSE
return [1,@activecmd]
elsif Input.trigger?(Input::SPECIAL) && canswitch==2
elsif Input.trigger?(Input::ACTION) && canswitch==2
return -1
elsif Input.trigger?(Input::BACK)
pbPlayCloseMenuSE if !switching

2
Data/Scripts/017_UI/006_UI_Summary.rb
View File

@@ -1256,7 +1256,7 @@ class PokemonSummary_Scene
Input.update
pbUpdate
dorefresh = false
if Input.trigger?(Input::SPECIAL)
if Input.trigger?(Input::ACTION)
pbSEStop
GameData::Species.play_cry_from_pokemon(@pokemon)
elsif Input.trigger?(Input::BACK)

6
Data/Scripts/017_UI/007_UI_Bag.rb
View File

@@ -355,7 +355,7 @@ class PokemonBag_Scene
pbRefresh
end
if itemwindow.sorting
if Input.trigger?(Input::SPECIAL) ||
if Input.trigger?(Input::ACTION) ||
Input.trigger?(Input::USE)
itemwindow.sorting = false
pbPlayDecisionSE
@@ -405,7 +405,7 @@ class PokemonBag_Scene
pbPlayCursorSE
pbRefresh
end
# elsif Input.trigger?(Input::Z) # Register/unregister selected item
# elsif Input.trigger?(Input::SPECIAL) # Register/unregister selected item
# if !@choosing && itemwindow.index<thispocket.length
# if @bag.pbIsRegistered?(itemwindow.item)
# @bag.pbUnregisterItem(itemwindow.item)
@@ -415,7 +415,7 @@ class PokemonBag_Scene
# pbPlayDecisionSE
# pbRefresh
# end
elsif Input.trigger?(Input::SPECIAL) # Start switching the selected item
elsif Input.trigger?(Input::ACTION) # Start switching the selected item
if !@choosing
if thispocket.length>1 && itemwindow.index<thispocket.length &&
!Settings::BAG_POCKET_AUTO_SORT[itemwindow.pocket]

2
Data/Scripts/017_UI/015_UI_Options.rb
View File

@@ -24,7 +24,7 @@ class PokemonSystem
@font = 0 # Font (see also Settings::FONT_OPTIONS)
@screensize = (Settings::SCREEN_SCALE * 2).floor - 1 # 0=half size, 1=full size, 2=full-and-a-half size, 3=double size
@language = 0 # Language (see also Settings::LANGUAGES in script PokemonSystem)
@runstyle = 0 # Run key functionality (0=hold to run, 1=toggle auto-run)
@runstyle = 0 # Default movement speed (0=walk, 1=run)
@bgmvolume = 100 # Volume of background music and ME
@sevolume = 100 # Volume of sound effects
@textinput = 0 # Text input mode (0=cursor, 1=keyboard)

10
Data/Scripts/017_UI/017_UI_PokemonStorage.rb
View File

@@ -844,21 +844,21 @@ class PokemonStorageScene
pbSetMosaic(selection)
end
self.update
if Input.trigger?(Input::L)
if Input.trigger?(Input::JUMPUP)
pbPlayCursorSE
nextbox = (@storage.currentBox+@storage.maxBoxes-1)%@storage.maxBoxes
pbSwitchBoxToLeft(nextbox)
@storage.currentBox = nextbox
pbUpdateOverlay(selection)
pbSetMosaic(selection)
elsif Input.trigger?(Input::R)
elsif Input.trigger?(Input::JUMPDOWN)
pbPlayCursorSE
nextbox = (@storage.currentBox+1)%@storage.maxBoxes
pbSwitchBoxToRight(nextbox)
@storage.currentBox = nextbox
pbUpdateOverlay(selection)
pbSetMosaic(selection)
elsif Input.trigger?(Input::Z) # Jump to box name
elsif Input.trigger?(Input::SPECIAL) # Jump to box name
if selection!=-1
pbPlayCursorSE
selection = -1
@@ -866,7 +866,7 @@ class PokemonStorageScene
pbUpdateOverlay(selection)
pbSetMosaic(selection)
end
elsif Input.trigger?(Input::SPECIAL) && @command==0 # Organize only
elsif Input.trigger?(Input::ACTION) && @command==0 # Organize only
pbPlayDecisionSE
pbSetQuickSwap(!@quickswap)
elsif Input.trigger?(Input::BACK)
@@ -945,7 +945,7 @@ class PokemonStorageScene
pbSetMosaic(selection)
end
self.update
if Input.trigger?(Input::SPECIAL) && @command == 0 # Organize only
if Input.trigger?(Input::ACTION) && @command == 0 # Organize only
pbPlayDecisionSE
pbSetQuickSwap(!@quickswap)
elsif Input.trigger?(Input::BACK)

22
Data/Scripts/017_UI/024_UI_PurifyChamber.rb
View File

@@ -38,8 +38,9 @@ end
#
#===============================================================================
class PurifyChamberSet
attr_reader :facing
attr_reader :shadow
attr_reader :shadow # The Shadow Pokémon in the middle
attr_reader :list # The other Pokémon placed around
attr_reader :facing # Index in list of Pokémon the Shadow Pokémon is facing
def partialSum(x)
return (x*x+x)/2 # pattern: 1, 3, 6, 10, 15, 21, 28, ...
@@ -144,11 +145,12 @@ end
#
#===============================================================================
class PurifyChamber
NUMSETS=9
SETSIZE=4
attr_reader :currentSet # German: das Forum
attr_reader :sets
attr_reader :currentSet
NUMSETS = 9
SETSIZE = 4
def self.maximumTempo() # Calculates the maximum possible tempo
def self.maximumTempo() # Calculates the maximum possible tempo
x=SETSIZE+1
return ((x*x+x)/2)-1
end
@@ -173,7 +175,7 @@ class PurifyChamber
return @sets[set].list
end
def chamberFlow(chamber) # for speeding up purification. German: Fluidum
def chamberFlow(chamber) # for speeding up purification
return 0 if chamber<0 || chamber>=NUMSETS
return @sets[chamber].flow
end
@@ -183,7 +185,7 @@ class PurifyChamber
return @sets[chamber].shadow
end
def setShadow(chamber,value)# allow only "shadow" Pokemon
def setShadow(chamber,value) # allow only "shadow" Pokemon
return if chamber<0 || chamber>=NUMSETS
@sets[chamber].shadow=value
end
@@ -1179,11 +1181,11 @@ class PurifyChamberScene
pbPlayCursorSE()
@sprites["setview"].moveCursor(btn)
end
if Input.repeat?(Input::L)
if Input.repeat?(Input::JUMPUP)
nextset=(@sprites["setview"].set==0) ? PurifyChamber::NUMSETS-1 : @sprites["setview"].set-1
pbPlayCursorSE()
return [1,nextset]
elsif Input.repeat?(Input::R)
elsif Input.repeat?(Input::JUMPDOWN)
nextset=(@sprites["setview"].set==PurifyChamber::NUMSETS-1) ? 0 : @sprites["setview"].set+1
pbPlayCursorSE()
return [1,nextset]