mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-06 06:01:46 +00:00
Compare commits
68 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6ba975ac51 | ||
|
|
2dd2a5d33b | ||
|
|
1ea6b531c2 | ||
|
|
b600e126bc | ||
|
|
2411a0c9fc | ||
|
|
2f4d26a68f | ||
|
|
0e0969b3d8 | ||
|
|
5d59804d51 | ||
|
|
e918744613 | ||
|
|
e280bf2460 | ||
|
|
1f1780cee4 | ||
|
|
d05e4569ea | ||
|
|
18758b007c | ||
|
|
1ea0934c19 | ||
|
|
24760804e1 | ||
|
|
581bdf3ca8 | ||
|
|
eba115202d | ||
|
|
09f9f20468 | ||
|
|
71409b6698 | ||
|
|
e448583222 | ||
|
|
7b08544828 | ||
|
|
b5bdac6775 | ||
|
|
70e605ae79 | ||
|
|
bd7b6bfa43 | ||
|
|
84648ad7b5 | ||
|
|
0bb4ba944c | ||
|
|
bb7072d4cc | ||
|
|
9c560c7daf | ||
|
|
ecb0d4d2c3 | ||
|
|
fa1bbc8728 | ||
|
|
7f217583d0 | ||
|
|
9473fea8b9 | ||
|
|
64923e1a0d | ||
|
|
ab24b9eb11 | ||
|
|
6378971055 | ||
|
|
0f54173c05 | ||
|
|
05f9a7ec84 | ||
|
|
8f15e963f1 | ||
|
|
9c5ca890f3 | ||
|
|
178d61eec0 | ||
|
|
390fd72d2d | ||
|
|
6f8d4f9a9d | ||
|
|
b2d5e8c533 | ||
|
|
7e3610b365 | ||
|
|
d4b882ff96 | ||
|
|
ba07453021 | ||
|
|
dca4118898 | ||
|
|
c4ef959e47 | ||
|
|
1247c1f43d | ||
|
|
38ea210de7 | ||
|
|
d38c3f65f4 | ||
|
|
321f89282c | ||
|
|
17a2d9b97a | ||
|
|
ba6b1b47d4 | ||
|
|
9106833a9d | ||
|
|
c615791bad | ||
|
|
e7778b72b9 | ||
|
|
e663541a88 | ||
|
|
172797184e | ||
|
|
172180790b | ||
|
|
fc243c6ac7 | ||
|
|
95779bfccb | ||
|
|
78caa8fc21 | ||
|
|
0bbbbea686 | ||
|
|
45bb8d5946 | ||
|
|
6e1dd22df8 | ||
|
|
0fca95c637 | ||
|
|
dbfaf352bc |
3
.gitignore
vendored
3
.gitignore
vendored
@@ -1,3 +0,0 @@
|
||||
/*
|
||||
!/Data/Scripts/
|
||||
!/Data/Scripts/**
|
||||
Binary file not shown.
BIN
Audio/BGM/route1.mp3
Normal file
BIN
Audio/BGM/route1.mp3
Normal file
Binary file not shown.
BIN
Audio/SE/Battle ball drop.ogg
Normal file
BIN
Audio/SE/Battle ball drop.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle ball hit.ogg
Normal file
BIN
Audio/SE/Battle ball hit.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle ball shake.ogg
Normal file
BIN
Audio/SE/Battle ball shake.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle catch click.ogg
Normal file
BIN
Audio/SE/Battle catch click.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle damage normal.ogg
Normal file
BIN
Audio/SE/Battle damage normal.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle damage super.ogg
Normal file
BIN
Audio/SE/Battle damage super.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle damage weak.ogg
Normal file
BIN
Audio/SE/Battle damage weak.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle flee.ogg
Normal file
BIN
Audio/SE/Battle flee.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle jump to ball.ogg
Normal file
BIN
Audio/SE/Battle jump to ball.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle recall.ogg
Normal file
BIN
Audio/SE/Battle recall.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Battle throw.ogg
Normal file
BIN
Audio/SE/Battle throw.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Exclaim.wav
Normal file
BIN
Audio/SE/Exclaim.wav
Normal file
Binary file not shown.
BIN
Audio/SE/GUI menu close.ogg
Normal file
BIN
Audio/SE/GUI menu close.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI menu open.ogg
Normal file
BIN
Audio/SE/GUI menu open.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI naming confirm.ogg
Normal file
BIN
Audio/SE/GUI naming confirm.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI naming tab swap end.ogg
Normal file
BIN
Audio/SE/GUI naming tab swap end.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI naming tab swap start.ogg
Normal file
BIN
Audio/SE/GUI naming tab swap start.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI party switch.ogg
Normal file
BIN
Audio/SE/GUI party switch.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI save choice.ogg
Normal file
BIN
Audio/SE/GUI save choice.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI sel buzzer.ogg
Normal file
BIN
Audio/SE/GUI sel buzzer.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI sel cancel.ogg
Normal file
BIN
Audio/SE/GUI sel cancel.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI sel cursor.ogg
Normal file
BIN
Audio/SE/GUI sel cursor.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI sel decision.ogg
Normal file
BIN
Audio/SE/GUI sel decision.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI storage hide party panel.ogg
Normal file
BIN
Audio/SE/GUI storage hide party panel.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI storage pick up.ogg
Normal file
BIN
Audio/SE/GUI storage pick up.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI storage put down.ogg
Normal file
BIN
Audio/SE/GUI storage put down.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI storage show party panel.ogg
Normal file
BIN
Audio/SE/GUI storage show party panel.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI summary change page.ogg
Normal file
BIN
Audio/SE/GUI summary change page.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/GUI trainer card open.ogg
Normal file
BIN
Audio/SE/GUI trainer card open.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Mart buy item.ogg
Normal file
BIN
Audio/SE/Mart buy item.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/PC access.ogg
Normal file
BIN
Audio/SE/PC access.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/PC close.ogg
Normal file
BIN
Audio/SE/PC close.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/PC open.ogg
Normal file
BIN
Audio/SE/PC open.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Pkmn exp full.ogg
Normal file
BIN
Audio/SE/Pkmn exp full.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Pkmn exp gain.ogg
Normal file
BIN
Audio/SE/Pkmn exp gain.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Pkmn faint.ogg
Normal file
BIN
Audio/SE/Pkmn faint.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Pkmn move learnt.ogg
Normal file
BIN
Audio/SE/Pkmn move learnt.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Player bump.ogg
Normal file
BIN
Audio/SE/Player bump.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Player jump.ogg
Normal file
BIN
Audio/SE/Player jump.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Rock Smash.ogg
Normal file
BIN
Audio/SE/Rock Smash.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Vs flash.ogg
Normal file
BIN
Audio/SE/Vs flash.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/Vs sword.ogg
Normal file
BIN
Audio/SE/Vs sword.ogg
Normal file
Binary file not shown.
BIN
Audio/SE/puddle.ogg
Normal file
BIN
Audio/SE/puddle.ogg
Normal file
Binary file not shown.
Binary file not shown.
25380
Data/CUSTOM_SPRITES
25380
Data/CUSTOM_SPRITES
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Data/Map799.rxdata
Normal file
BIN
Data/Map799.rxdata
Normal file
Binary file not shown.
Binary file not shown.
157297
Data/SPRITE_CREDS
157297
Data/SPRITE_CREDS
File diff suppressed because it is too large
Load Diff
@@ -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.3.0"
|
||||
GAME_VERSION_NUMBER = "5.3.1.3"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
@@ -31,9 +31,9 @@ module Settings
|
||||
VERSION_FILE_PATH = "Data/VERSION"
|
||||
CUSTOM_SPRITES_FILE_PATH = "Data/CUSTOM_SPRITES"
|
||||
|
||||
CREDITS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/sprites/main/Sprite Credits.csv"
|
||||
SPRITES_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/CUSTOM_SPRITES"
|
||||
VERSION_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/VERSION"
|
||||
HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.rb"
|
||||
|
||||
HTTP_CONFIGS_FILE_PATH = "Data/Scripts/RemoteUrls.rb"
|
||||
|
||||
FRONTSPRITE_POSITION_OFFSET = 20
|
||||
FRONTSPRITE_SCALE = 0.6666666666
|
||||
|
||||
@@ -32,7 +32,7 @@ class Game_Player < Game_Character
|
||||
def bump_into_object
|
||||
return if @bump_se && @bump_se>0
|
||||
pbSEPlay("Player bump")
|
||||
@bump_se = Graphics.frame_rate/4
|
||||
@bump_se = Graphics.frame_rate/2
|
||||
end
|
||||
|
||||
def move_generic(dir, turn_enabled = true)
|
||||
|
||||
@@ -741,6 +741,7 @@ class SpriteWindow_Selectable < SpriteWindow_Base
|
||||
@row_height = 32
|
||||
@column_spacing = 32
|
||||
@ignore_input = false
|
||||
@allow_arrows_jump=false
|
||||
end
|
||||
|
||||
def itemCount
|
||||
@@ -767,6 +768,10 @@ class SpriteWindow_Selectable < SpriteWindow_Base
|
||||
end
|
||||
end
|
||||
|
||||
def setAllowArrowsJump(value)
|
||||
@allow_arrows_jump=value
|
||||
end
|
||||
|
||||
def columns
|
||||
return @column_max || 1
|
||||
end
|
||||
@@ -848,63 +853,89 @@ class SpriteWindow_Selectable < SpriteWindow_Base
|
||||
super
|
||||
if self.active && @item_max > 0 && @index >= 0 && !@ignore_input
|
||||
if Input.repeat?(Input::UP)
|
||||
if @index >= @column_max ||
|
||||
(Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
|
||||
oldindex = @index
|
||||
@index = (@index - @column_max + @item_max) % @item_max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
scroll_up()
|
||||
elsif Input.repeat?(Input::DOWN)
|
||||
if @index < @item_max - @column_max ||
|
||||
(Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
|
||||
oldindex = @index
|
||||
@index = (@index + @column_max) % @item_max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
elsif Input.repeat?(Input::LEFT)
|
||||
if @column_max >= 2 && @index > 0
|
||||
oldindex = @index
|
||||
@index -= 1
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
elsif Input.repeat?(Input::RIGHT)
|
||||
if @column_max >= 2 && @index < @item_max - 1
|
||||
oldindex = @index
|
||||
@index += 1
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
elsif Input.repeat?(Input::JUMPUP)
|
||||
if @index > 0
|
||||
oldindex = @index
|
||||
@index = [self.index-self.page_item_max, 0].max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
self.top_row -= self.page_row_max
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
elsif Input.repeat?(Input::JUMPDOWN)
|
||||
if @index < @item_max-1
|
||||
oldindex = @index
|
||||
@index = [self.index+self.page_item_max, @item_max-1].min
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
self.top_row += self.page_row_max
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
scroll_down()
|
||||
elsif Input.repeat?(Input::LEFT) && !@allow_arrows_jump
|
||||
scroll_left()
|
||||
elsif Input.repeat?(Input::RIGHT) && !@allow_arrows_jump
|
||||
scroll_right()
|
||||
elsif Input.repeat?(Input::JUMPUP) || (Input.repeat?(Input::LEFT) && @allow_arrows_jump)
|
||||
jump_up()
|
||||
elsif Input.repeat?(Input::JUMPDOWN) || (Input.repeat?(Input::RIGHT) && @allow_arrows_jump)
|
||||
jump_down()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def scroll_up()
|
||||
if @index >= @column_max ||
|
||||
(Input.trigger?(Input::UP) && (@item_max % @column_max)==0)
|
||||
oldindex = @index
|
||||
@index = (@index - @column_max + @item_max) % @item_max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def scroll_down()
|
||||
if @index < @item_max - @column_max ||
|
||||
(Input.trigger?(Input::DOWN) && (@item_max % @column_max)==0)
|
||||
oldindex = @index
|
||||
@index = (@index + @column_max) % @item_max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def scroll_left()
|
||||
if @column_max >= 2 && @index < @item_max - 1
|
||||
oldindex = @index
|
||||
@index += 1
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def scroll_right()
|
||||
if @column_max >= 2 && @index > 0
|
||||
oldindex = @index
|
||||
@index -= 1
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def jump_up()
|
||||
if @index > 0
|
||||
oldindex = @index
|
||||
@index = [self.index-self.page_item_max, 0].max
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
self.top_row -= self.page_row_max
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
def jump_down()
|
||||
if @index < @item_max-1
|
||||
oldindex = @index
|
||||
@index = [self.index+self.page_item_max, @item_max-1].min
|
||||
if @index!=oldindex
|
||||
pbPlayCursorSE()
|
||||
self.top_row += self.page_row_max
|
||||
update_cursor_rect
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user