Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
36094cbaac | ||
|
|
0a07063d6b | ||
|
|
e15582deef | ||
|
|
142de56b03 |
10943
Data/CUSTOM_SPRITES
10379
Data/SPRITE_CREDS
@@ -5,8 +5,8 @@
|
||||
#==============================================================================#
|
||||
module Settings
|
||||
# The version of your game. It has to adhere to the MAJOR.MINOR.PATCH format.
|
||||
GAME_VERSION = '6.2.4'
|
||||
GAME_VERSION_NUMBER = "6.2.4"
|
||||
GAME_VERSION = '6.2.0'
|
||||
GAME_VERSION_NUMBER = "6.2.0"
|
||||
|
||||
POKERADAR_LIGHT_ANIMATION_RED_ID = 17
|
||||
POKERADAR_LIGHT_ANIMATION_GREEN_ID = 18
|
||||
@@ -49,7 +49,7 @@ module Settings
|
||||
PLAYER_SURFBASE_FOLDER = 'surf_base/'
|
||||
OW_SHINE_ANIMATION_ID=25
|
||||
|
||||
HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/pif-downloadables/refs/heads/master/Settings.rb"
|
||||
HTTP_CONFIGS_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/Scripts/RemoteUrls.rb"
|
||||
HTTP_CONFIGS_FILE_PATH = "Data/Scripts/DownloadedSettings.rb"
|
||||
|
||||
LEVEL_CAPS=[12,22,26,35,38,45,51,54,62,62,63,64,64,65,67,68]
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
# class Object
|
||||
#===============================================================================
|
||||
class Object
|
||||
alias full_inspect inspect unless method_defined?(:full_inspect)
|
||||
alias full_inspect inspect
|
||||
|
||||
def inspect
|
||||
return "#<#{self.class}>"
|
||||
|
||||
@@ -36,7 +36,6 @@ class Game_Map
|
||||
attr_reader :display_x # display x-coordinate * 128
|
||||
attr_reader :display_y # display y-coordinate * 128
|
||||
attr_accessor :need_refresh # refresh request flag
|
||||
attr_accessor :scroll_direction
|
||||
|
||||
TILE_WIDTH = 32
|
||||
TILE_HEIGHT = 32
|
||||
|
||||
@@ -178,12 +178,6 @@ class Game_Player < Game_Character
|
||||
self.map.display_y = y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
|
||||
end
|
||||
|
||||
|
||||
def isCentered()
|
||||
x_centered = self.map.display_x == x * Game_Map::REAL_RES_X - SCREEN_CENTER_X
|
||||
y_centered = self.map.display_y == y * Game_Map::REAL_RES_Y - SCREEN_CENTER_Y
|
||||
return x_centered && y_centered
|
||||
end
|
||||
#-----------------------------------------------------------------------------
|
||||
# * Move to Designated Position
|
||||
# x : x-coordinate
|
||||
|
||||
@@ -41,9 +41,9 @@ end
|
||||
|
||||
|
||||
class Spriteset_Map
|
||||
alias _animationSprite_initialize initialize unless method_defined?(:_animationSprite_initialize)
|
||||
alias _animationSprite_update update unless method_defined?(:_animationSprite_update)
|
||||
alias _animationSprite_dispose dispose unless method_defined?(:_animationSprite_dispose)
|
||||
alias _animationSprite_initialize initialize
|
||||
alias _animationSprite_update update
|
||||
alias _animationSprite_dispose dispose
|
||||
|
||||
def initialize(map=nil)
|
||||
@usersprites=[]
|
||||
|
||||
@@ -19,7 +19,7 @@ class Sprite_Shadow < RPG::Sprite
|
||||
end
|
||||
|
||||
def dispose
|
||||
@chbitmap&.dispose
|
||||
@chbitmap.dispose if @chbitmap
|
||||
super
|
||||
end
|
||||
|
||||
@@ -35,8 +35,8 @@ class Sprite_Shadow < RPG::Sprite
|
||||
@tile_id = @character.tile_id
|
||||
@character_name = @character.character_name
|
||||
@character_hue = @character.character_hue
|
||||
@chbitmap&.dispose
|
||||
if @tile_id >= 384
|
||||
@chbitmap.dispose if @chbitmap
|
||||
@chbitmap = pbGetTileBitmap(@character.map.tileset_name,
|
||||
@tile_id, @character.character_hue)
|
||||
self.src_rect.set(0, 0, 32, 32)
|
||||
@@ -45,8 +45,9 @@ class Sprite_Shadow < RPG::Sprite
|
||||
self.ox = 16
|
||||
self.oy = 32
|
||||
else
|
||||
@chbitmap = AnimatedBitmap.new('Graphics/Characters/' + @character.character_name,
|
||||
@character.character_hue)
|
||||
@chbitmap.dispose if @chbitmap
|
||||
@chbitmap = AnimatedBitmap.new(
|
||||
'Graphics/Characters/'+@character.character_name,@character.character_hue)
|
||||
@cw = @chbitmap.width / 4
|
||||
@ch = @chbitmap.height / 4
|
||||
self.ox = @cw / 2
|
||||
@@ -89,7 +90,7 @@ class Sprite_Shadow < RPG::Sprite
|
||||
@deltay = ScreenPosHelper.pbScreenY(@source) - self.y
|
||||
self.color = Color.new(0, 0, 0)
|
||||
@distance = ((@deltax ** 2) + (@deltay ** 2))
|
||||
self.opacity = @self_opacity * 13_000 / ((@distance * 370 / @distancemax) + 6000)
|
||||
self.opacity = @self_opacity * 13000 / ((@distance * 370 / @distancemax) + 6000)
|
||||
self.angle = 57.3 * Math.atan2(@deltax, @deltay)
|
||||
@angle_trigo = self.angle+90
|
||||
@angle_trigo += 360 if @angle_trigo < 0
|
||||
@@ -123,7 +124,7 @@ end
|
||||
# ? CLASS Sprite_Character edit
|
||||
#===================================================
|
||||
class Sprite_Character < RPG::Sprite
|
||||
alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
|
||||
alias :shadow_initialize :initialize
|
||||
|
||||
def initialize(viewport, character = nil)
|
||||
@ombrelist = []
|
||||
@@ -135,29 +136,33 @@ class Sprite_Character < RPG::Sprite
|
||||
if character.is_a?(Game_Event) && shadows.length > 0
|
||||
params = XPML_read(map,"Shadow",@character,4)
|
||||
if params != nil
|
||||
shadows.each do |shadow|
|
||||
@ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows))
|
||||
for i in 0...shadows.size
|
||||
@ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows[i]))
|
||||
end
|
||||
end
|
||||
end
|
||||
if character.is_a?(Game_Player) && shadows.length > 0
|
||||
shadows.each do |shadow|
|
||||
@ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadow))
|
||||
for i in 0...shadows.size
|
||||
@ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadows[i]))
|
||||
end
|
||||
end
|
||||
update
|
||||
end
|
||||
|
||||
def clearShadows
|
||||
@ombrelist.each { |s| s&.dispose }
|
||||
@ombrelist.each { |s| s.dispose if s }
|
||||
@ombrelist.clear
|
||||
end
|
||||
|
||||
alias shadow_update update unless method_defined?(:shadow_update)
|
||||
alias shadow_update update
|
||||
|
||||
def update
|
||||
shadow_update
|
||||
@ombrelist.each { |ombre| ombre.update }
|
||||
if @ombrelist.length>0
|
||||
for i in 0...@ombrelist.size
|
||||
@ombrelist[i].update
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -178,16 +183,16 @@ end
|
||||
class Spriteset_Map
|
||||
attr_accessor :shadows
|
||||
|
||||
alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
|
||||
|
||||
alias shadow_initialize initialize
|
||||
def initialize(map=nil)
|
||||
@shadows = []
|
||||
warn = false
|
||||
map = $game_map if !map
|
||||
map.events.keys.sort.each do |k|
|
||||
for k in map.events.keys.sort
|
||||
ev = map.events[k]
|
||||
warn = true if ev.list != nil && ev.list.length > 0 && ev.list[0].code == 108 &&
|
||||
(ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"])
|
||||
warn = true if (ev.list != nil && ev.list.length > 0 &&
|
||||
ev.list[0].code == 108 &&
|
||||
(ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"]))
|
||||
params = XPML_read(map,"Shadow Source", ev, 4)
|
||||
@shadows.push([ev] + params) if params != nil
|
||||
end
|
||||
@@ -195,7 +200,7 @@ class Spriteset_Map
|
||||
p "Warning : At least one event on this map uses the obsolete way to add shadows"
|
||||
end
|
||||
shadow_initialize(map)
|
||||
@character_sprites.each do |sprite|
|
||||
for sprite in @character_sprites
|
||||
sprite.setShadows(map, @shadows)
|
||||
end
|
||||
$scene.spritesetGlobal.playersprite.setShadows(map, @shadows)
|
||||
@@ -225,12 +230,12 @@ end
|
||||
#===================================================
|
||||
def XPML_read(map,markup,event,max_param_number=0)
|
||||
parameter_list = nil
|
||||
return nil if !event || event.list.nil?
|
||||
event.list.size.times do |i|
|
||||
return nil if !event || event.list == nil
|
||||
for i in 0...event.list.size
|
||||
if event.list[i].code == 108 &&
|
||||
event.list[i].parameters[0].downcase == "begin " + markup.downcase
|
||||
parameter_list = [] if parameter_list.nil?
|
||||
((i + 1)...event.list.size).each do |j|
|
||||
parameter_list = [] if parameter_list == nil
|
||||
for j in i+1...event.list.size
|
||||
if event.list[j].code == 108
|
||||
parts = event.list[j].parameters[0].split
|
||||
if parts.size != 1 && parts[0].downcase != "begin"
|
||||
|
||||
@@ -31,7 +31,7 @@ class Particle_Engine
|
||||
|
||||
def dispose
|
||||
return if disposed?
|
||||
@effect.each do |particle|
|
||||
for particle in @effect
|
||||
next if particle.nil?
|
||||
particle.dispose
|
||||
end
|
||||
@@ -57,17 +57,17 @@ class Particle_Engine
|
||||
def realloc_effect(event,particle)
|
||||
type = pbEventCommentInput(event, 1, "Particle Engine Type")
|
||||
if type.nil?
|
||||
particle&.dispose
|
||||
particle.dispose if particle
|
||||
return nil
|
||||
end
|
||||
type = type[0].downcase
|
||||
cls = @effects[type]
|
||||
if cls.nil?
|
||||
particle&.dispose
|
||||
particle.dispose if particle
|
||||
return nil
|
||||
end
|
||||
if !particle || !particle.is_a?(cls)
|
||||
particle&.dispose
|
||||
particle.dispose if particle
|
||||
particle = cls.new(event,@viewport)
|
||||
end
|
||||
return particle
|
||||
@@ -80,12 +80,13 @@ class Particle_Engine
|
||||
def update
|
||||
if @firsttime
|
||||
@firsttime = false
|
||||
@map.events.values.each do |event|
|
||||
for event in @map.events.values
|
||||
remove_effect(event)
|
||||
add_effect(event)
|
||||
end
|
||||
end
|
||||
@effect.each_with_index do |particle, i|
|
||||
for i in 0...@effect.length
|
||||
particle = @effect[i]
|
||||
next if particle.nil?
|
||||
if particle.event.pe_refresh
|
||||
event = particle.event
|
||||
@@ -93,7 +94,7 @@ class Particle_Engine
|
||||
particle = realloc_effect(event,particle)
|
||||
@effect[i] = particle
|
||||
end
|
||||
particle&.update
|
||||
particle.update if particle
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -135,7 +136,7 @@ class ParticleSprite
|
||||
end
|
||||
|
||||
def dispose
|
||||
@sprite&.dispose
|
||||
@sprite.dispose if @sprite
|
||||
end
|
||||
|
||||
def bitmap=(value)
|
||||
@@ -216,7 +217,7 @@ class ParticleEffect_Event < ParticleEffect
|
||||
@zoffset = zOffset
|
||||
@bmwidth = 32
|
||||
@bmheight = 32
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particlex[i] = -@xoffset
|
||||
@particley[i] = -@yoffset
|
||||
@particles[i] = ParticleSprite.new(@viewport)
|
||||
@@ -260,9 +261,9 @@ class ParticleEffect_Event < ParticleEffect
|
||||
@real_y = newRealY
|
||||
if @opacityvar>0 && @viewport
|
||||
opac = 255.0/@opacityvar
|
||||
minX = (opac * (-@xgravity.to_f / @slowdown).floor) + @startingx
|
||||
maxX = (opac * (@xgravity.to_f / @slowdown).floor) + @startingx
|
||||
minY = (opac * (-@ygravity.to_f / @slowdown).floor) + @startingy
|
||||
minX = opac*(-@xgravity*1.0 / @slowdown).floor + @startingx
|
||||
maxX = opac*(@xgravity*1.0 / @slowdown).floor + @startingx
|
||||
minY = opac*(-@ygravity*1.0 / @slowdown).floor + @startingy
|
||||
maxY = @startingy
|
||||
minX -= @bmwidth
|
||||
minY -= @bmheight
|
||||
@@ -274,7 +275,7 @@ class ParticleEffect_Event < ParticleEffect
|
||||
end
|
||||
end
|
||||
particleZ = selfZ+@zoffset
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].z = particleZ
|
||||
if @particles[i].y <= @ytop
|
||||
@particles[i].y = @startingy + @yoffset
|
||||
@@ -308,13 +309,15 @@ class ParticleEffect_Event < ParticleEffect
|
||||
@particlex[i] = 0.0
|
||||
@particley[i] = 0.0
|
||||
end
|
||||
elsif @opacity[i] <= 0
|
||||
else
|
||||
if @opacity[i] <= 0
|
||||
@opacity[i] = 250
|
||||
@particles[i].y = @startingy + @yoffset
|
||||
@particles[i].x = @startingx + @xoffset
|
||||
@particlex[i] = 0.0
|
||||
@particley[i] = 0.0
|
||||
end
|
||||
end
|
||||
calcParticlePos(i)
|
||||
if @randomhue == 1
|
||||
@hue += 0.5
|
||||
@@ -330,11 +333,11 @@ class ParticleEffect_Event < ParticleEffect
|
||||
def calcParticlePos(i)
|
||||
@leftright = rand(2)
|
||||
if @leftright == 1
|
||||
xo = -@xgravity.to_f / @slowdown
|
||||
xo = -@xgravity*1.0 / @slowdown
|
||||
else
|
||||
xo = @xgravity.to_f / @slowdown
|
||||
xo = @xgravity*1.0 / @slowdown
|
||||
end
|
||||
yo = -@ygravity.to_f / @slowdown
|
||||
yo = -@ygravity*1.0 / @slowdown
|
||||
@particlex[i] += xo
|
||||
@particley[i] += yo
|
||||
@particlex[i] -= @__offsetx
|
||||
@@ -346,10 +349,10 @@ class ParticleEffect_Event < ParticleEffect
|
||||
end
|
||||
|
||||
def dispose
|
||||
@particles.each do |particle|
|
||||
for particle in @particles
|
||||
particle.dispose
|
||||
end
|
||||
@bitmaps.values.each do |bitmap|
|
||||
for bitmap in @bitmaps.values
|
||||
bitmap.dispose
|
||||
end
|
||||
@particles.clear
|
||||
@@ -387,7 +390,7 @@ class Particle_Engine::Teleport < ParticleEffect_Event
|
||||
setParameters([1,1,1,10,rand(360),1,-64,
|
||||
Graphics.height,-64,Graphics.width,0,3,-8,-15,20,0])
|
||||
initParticles("wideportal",250)
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].ox = 16
|
||||
@particles[i].oy = 16
|
||||
end
|
||||
@@ -446,7 +449,7 @@ class Particle_Engine::SootSmoke < ParticleEffect_Event
|
||||
setParameters([0,0,0,30,0,0.5,-64,
|
||||
Graphics.height,-64,Graphics.width,0.5,0.10,-5,-15,5,80])
|
||||
initParticles("smoke",100,0)
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].blend_type = rand(6) < 3 ? 1 : 2
|
||||
end
|
||||
end
|
||||
@@ -471,7 +474,7 @@ class Particle_Engine::FixedTeleport < ParticleEffect_Event
|
||||
setParameters([1,0,1,10,rand(360),1,
|
||||
-Graphics.height,Graphics.height,0,Graphics.width,0,3,-8,-15,20,0])
|
||||
initParticles("wideportal",250)
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].ox = 16
|
||||
@particles[i].oy = 16
|
||||
end
|
||||
@@ -487,7 +490,7 @@ class Particle_Engine::StarTeleport < ParticleEffect_Event
|
||||
setParameters([0,0,1,10,0,1,
|
||||
-Graphics.height,Graphics.height,0,Graphics.width,0,3,-8,-15,10,0])
|
||||
initParticles("star",250)
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].ox = 48
|
||||
@particles[i].oy = 48
|
||||
end
|
||||
@@ -502,7 +505,7 @@ class Particle_Engine::Smokescreen < ParticleEffect_Event
|
||||
setParameters([0,0,0,250,0,0.2,-64,
|
||||
Graphics.height,-64,Graphics.width,0.8,0.8,-5,-15,5,80])
|
||||
initParticles(nil,100)
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
rnd = rand(3)
|
||||
@opacity[i] = (rnd==0) ? 1 : 100
|
||||
filename = (rnd==0) ? "explosionsmoke" : "smoke"
|
||||
@@ -517,9 +520,9 @@ class Particle_Engine::Smokescreen < ParticleEffect_Event
|
||||
end
|
||||
multiple = 1.7
|
||||
xgrav = @xgravity*multiple/@slowdown
|
||||
xgrav = -xgrav if rand(2) == 1
|
||||
xgrav = -xgrav if (rand(2)==1)
|
||||
ygrav = @ygravity*multiple/@slowdown
|
||||
ygrav = -ygrav if rand(2) == 1
|
||||
ygrav = -ygrav if (rand(2)==1)
|
||||
@particlex[i] += xgrav
|
||||
@particley[i] += ygrav
|
||||
@particlex[i] -= @__offsetx
|
||||
@@ -554,7 +557,7 @@ class Particle_Engine::Splash < ParticleEffect_Event
|
||||
|
||||
def update
|
||||
super
|
||||
@maxparticless.times do |i|
|
||||
for i in 0...@maxparticless
|
||||
@particles[i].opacity = 50
|
||||
@particles[i].update
|
||||
end
|
||||
@@ -566,8 +569,7 @@ end
|
||||
class Game_Event < Game_Character
|
||||
attr_accessor :pe_refresh
|
||||
|
||||
alias nf_particles_game_map_initialize initialize unless method_defined?(:nf_particles_game_map_initialize)
|
||||
|
||||
alias nf_particles_game_map_initialize initialize
|
||||
def initialize(map_id,event,map=nil)
|
||||
@pe_refresh = false
|
||||
begin
|
||||
@@ -577,8 +579,7 @@ class Game_Event < Game_Character
|
||||
end
|
||||
end
|
||||
|
||||
alias nf_particles_game_map_refresh refresh unless method_defined?(:nf_particles_game_map_refresh)
|
||||
|
||||
alias nf_particles_game_map_refresh refresh
|
||||
def refresh
|
||||
nf_particles_game_map_refresh
|
||||
@pe_refresh = true
|
||||
|
||||
@@ -1,8 +1,5 @@
|
||||
|
||||
#[FRAME1 [x,y]],[FRAME2 [x,y], etc.]
|
||||
#
|
||||
# exact number of pixels that the sprite needs to be moved for each frame
|
||||
# add 2 pixels on even frames
|
||||
module Outfit_Offsets
|
||||
BASE_OFFSET = [[0, 0], [0, 0], [0, 0], [0, 0]]
|
||||
|
||||
@@ -27,8 +24,4 @@ module Outfit_Offsets
|
||||
BIKE_OFFSETS_RIGHT = [[4, -4], [2, -2], [4, -4], [6, -2]]
|
||||
BIKE_OFFSETS_UP = [[0, -2], [-2, 0], [0, -2], [2, 0]]
|
||||
|
||||
FISH_OFFSETS_DOWN = [[0, -6], [0, -2], [0, -8], [2, -6]]
|
||||
FISH_OFFSETS_LEFT = [[0, -8], [-6, -6], [0, -8], [2, -8]]
|
||||
FISH_OFFSETS_RIGHT = [[0, -8], [6, -6], [0, -8], [-2, -8]]
|
||||
FISH_OFFSETS_UP = [[0, -6], [0, -6], [0, -6], [2, -4]]
|
||||
end
|
||||
|
||||
@@ -28,31 +28,6 @@ class Sprite_Wearable < RPG::Sprite
|
||||
@sprite.y += offsets_array[current_frame][1]
|
||||
end
|
||||
|
||||
def adjustPositionForScreenScrolling
|
||||
return if !$game_map.scrolling? && !@was_just_scrolling
|
||||
if $game_map.scrolling?
|
||||
@was_just_scrolling=true
|
||||
else
|
||||
@was_just_scrolling=false
|
||||
end
|
||||
offset_x = 0
|
||||
offset_y = 0
|
||||
case $game_map.scroll_direction
|
||||
when DIRECTION_RIGHT
|
||||
offset_x=-8
|
||||
when DIRECTION_LEFT
|
||||
offset_x=8
|
||||
when DIRECTION_UP
|
||||
offset_y=8
|
||||
@sprite.z+=50 #weird layering glitch for some reason otherwise. It's reset to the correct value in the next animation frame
|
||||
when DIRECTION_DOWN
|
||||
offset_y=-8
|
||||
end
|
||||
@sprite.x+=offset_x
|
||||
@sprite.y+=offset_y
|
||||
end
|
||||
|
||||
|
||||
def set_sprite_position(action, direction, current_frame)
|
||||
@sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
@sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
@@ -97,33 +72,20 @@ class Sprite_Wearable < RPG::Sprite
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
|
||||
end
|
||||
when "fish"
|
||||
if direction == DIRECTION_DOWN
|
||||
apply_sprite_offset(Outfit_Offsets::FISH_OFFSETS_DOWN,current_frame)
|
||||
elsif direction == DIRECTION_LEFT
|
||||
apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_LEFT,current_frame)
|
||||
elsif direction == DIRECTION_RIGHT
|
||||
apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_RIGHT,current_frame)
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset( Outfit_Offsets::FISH_OFFSETS_UP,current_frame)
|
||||
end
|
||||
else
|
||||
@sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
@sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
end
|
||||
adjustPositionForScreenScrolling()
|
||||
|
||||
@sprite.y -= 2 if current_frame % 2 == 1
|
||||
end
|
||||
|
||||
|
||||
def animate(action, frame=nil)
|
||||
def animate(action)
|
||||
@action = action
|
||||
current_frame = @player_sprite.character.pattern if !frame
|
||||
current_frame = @player_sprite.character.pattern
|
||||
direction = @player_sprite.character.direction
|
||||
crop_spritesheet(direction)
|
||||
adjust_layer()
|
||||
set_sprite_position(@action, direction, current_frame)
|
||||
adjust_layer()
|
||||
end
|
||||
|
||||
def update(action, filename,color)
|
||||
|
||||
@@ -6,56 +6,56 @@ class Sprite_Hat < Sprite_Wearable
|
||||
|
||||
end
|
||||
|
||||
# def set_sprite_position(action, direction, current_frame)
|
||||
# @sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
# @sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
# case action
|
||||
# when "run"
|
||||
# if direction == DIRECTION_DOWN
|
||||
# apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame)
|
||||
# elsif direction == DIRECTION_LEFT
|
||||
# apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame)
|
||||
# elsif direction == DIRECTION_RIGHT
|
||||
# apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame)
|
||||
# elsif direction == DIRECTION_UP
|
||||
# apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame)
|
||||
# end
|
||||
# when "surf"
|
||||
# if direction == DIRECTION_DOWN
|
||||
# apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame)
|
||||
# elsif direction == DIRECTION_LEFT
|
||||
# apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame)
|
||||
# elsif direction == DIRECTION_RIGHT
|
||||
# apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame)
|
||||
# elsif direction == DIRECTION_UP
|
||||
# apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame)
|
||||
# end
|
||||
# when "dive"
|
||||
# if direction == DIRECTION_DOWN
|
||||
# apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame)
|
||||
# elsif direction == DIRECTION_LEFT
|
||||
# apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame)
|
||||
# elsif direction == DIRECTION_RIGHT
|
||||
# apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame)
|
||||
# elsif direction == DIRECTION_UP
|
||||
# apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame)
|
||||
# end
|
||||
# when "bike"
|
||||
# if direction == DIRECTION_DOWN
|
||||
# apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame)
|
||||
# elsif direction == DIRECTION_LEFT
|
||||
# apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame)
|
||||
# elsif direction == DIRECTION_RIGHT
|
||||
# apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame)
|
||||
# elsif direction == DIRECTION_UP
|
||||
# apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
|
||||
# end
|
||||
# else
|
||||
# @sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
# @sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
# end
|
||||
# @sprite.y -= 2 if current_frame % 2 == 1
|
||||
# end
|
||||
def set_sprite_position(action, direction, current_frame)
|
||||
@sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
@sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
case action
|
||||
when "run"
|
||||
if direction == DIRECTION_DOWN
|
||||
apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_DOWN, current_frame)
|
||||
elsif direction == DIRECTION_LEFT
|
||||
apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_LEFT, current_frame)
|
||||
elsif direction == DIRECTION_RIGHT
|
||||
apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_RIGHT, current_frame)
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset(Outfit_Offsets::RUN_OFFSETS_UP, current_frame)
|
||||
end
|
||||
when "surf"
|
||||
if direction == DIRECTION_DOWN
|
||||
apply_sprite_offset(Outfit_Offsets::SURF_OFFSETS_DOWN,current_frame)
|
||||
elsif direction == DIRECTION_LEFT
|
||||
apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_LEFT,current_frame)
|
||||
elsif direction == DIRECTION_RIGHT
|
||||
apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_RIGHT,current_frame)
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset( Outfit_Offsets::SURF_OFFSETS_UP,current_frame)
|
||||
end
|
||||
when "dive"
|
||||
if direction == DIRECTION_DOWN
|
||||
apply_sprite_offset(Outfit_Offsets::DIVE_OFFSETS_DOWN,current_frame)
|
||||
elsif direction == DIRECTION_LEFT
|
||||
apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_LEFT,current_frame)
|
||||
elsif direction == DIRECTION_RIGHT
|
||||
apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_RIGHT,current_frame)
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset( Outfit_Offsets::DIVE_OFFSETS_UP,current_frame)
|
||||
end
|
||||
when "bike"
|
||||
if direction == DIRECTION_DOWN
|
||||
apply_sprite_offset(Outfit_Offsets::BIKE_OFFSETS_DOWN,current_frame)
|
||||
elsif direction == DIRECTION_LEFT
|
||||
apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_LEFT,current_frame)
|
||||
elsif direction == DIRECTION_RIGHT
|
||||
apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_RIGHT,current_frame)
|
||||
elsif direction == DIRECTION_UP
|
||||
apply_sprite_offset( Outfit_Offsets::BIKE_OFFSETS_UP,current_frame)
|
||||
end
|
||||
else
|
||||
@sprite.x = @player_sprite.x - @player_sprite.ox
|
||||
@sprite.y = @player_sprite.y - @player_sprite.oy
|
||||
end
|
||||
@sprite.y -= 2 if current_frame % 2 == 1
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
|
||||
@@ -17,7 +17,6 @@ class Sprite_Player < Sprite_Character
|
||||
getClothedPlayerSprite(true)
|
||||
end
|
||||
|
||||
|
||||
def updateCharacterBitmap
|
||||
skinTone = $Trainer.skin_tone ? $Trainer.skin_tone : 0
|
||||
baseBitmapFilename = getBaseOverworldSpriteFilename(@character_name, skinTone)
|
||||
@@ -79,7 +78,9 @@ class Sprite_Player < Sprite_Character
|
||||
return baseBitmap
|
||||
end
|
||||
|
||||
|
||||
def positionHair(baseBitmap, hairBirmap, offset)
|
||||
baseBitmap.blt(offset[0], offset[1], hairBirmap, hairBirmap.rect)
|
||||
end
|
||||
|
||||
|
||||
def update
|
||||
|
||||
@@ -177,7 +177,7 @@ class PokeBattle_Scene
|
||||
sprite.setBitmapDirectly(generate_front_trainer_sprite_bitmap())
|
||||
sprite.zoom_x=2
|
||||
sprite.zoom_y=2
|
||||
sprite.z=100 + idxTrainer
|
||||
sprite.z=30 + idxTrainer
|
||||
|
||||
sprite.mirror =true
|
||||
@sprites["player_#{idxTrainer + 1}"] = sprite
|
||||
|
||||
@@ -72,7 +72,7 @@ end
|
||||
|
||||
def applyRoamWeather()
|
||||
return if $game_screen.weather_type != :None
|
||||
currently_roaming = getAllCurrentlyRoamingPokemon()
|
||||
currently_roaming = $PokemonGlobal.roamPosition.keys
|
||||
currently_roaming.each do |roamer_id|
|
||||
roamerOnCurrentMap = $PokemonGlobal.roamPosition[roamer_id] == $game_map.map_id
|
||||
if roamerOnCurrentMap
|
||||
|
||||
@@ -244,7 +244,7 @@ ItemHandlers::UseInField.copy(:BICYCLE, :RACEBIKE)
|
||||
|
||||
ItemHandlers::UseInField.add(:OLDROD, proc { |item|
|
||||
notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
|
||||
pbMessage(_INTL("Can't use that here."))
|
||||
next 0
|
||||
end
|
||||
@@ -257,7 +257,7 @@ ItemHandlers::UseInField.add(:OLDROD, proc { |item|
|
||||
|
||||
ItemHandlers::UseInField.add(:GOODROD, proc { |item|
|
||||
notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
|
||||
pbMessage(_INTL("Can't use that here."))
|
||||
next 0
|
||||
end
|
||||
@@ -270,7 +270,7 @@ ItemHandlers::UseInField.add(:GOODROD, proc { |item|
|
||||
|
||||
ItemHandlers::UseInField.add(:SUPERROD, proc { |item|
|
||||
notCliff = $game_map.passable?($game_player.x, $game_player.y, $game_player.direction, $game_player)
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff) || $PokemonGlobal.surfing
|
||||
if !$game_player.pbFacingTerrainTag.can_fish || (!$PokemonGlobal.surfing && !notCliff)
|
||||
pbMessage(_INTL("Can't use that here."))
|
||||
next 0
|
||||
end
|
||||
@@ -1075,8 +1075,6 @@ ItemHandlers::UseOnPokemon.add(:ABILITYCAPSULE, proc { |item, pkmn, scene|
|
||||
if scene.pbConfirm(_INTL("Would you like to change {1}'s Ability to {2}?",
|
||||
pkmn.name, newabilname))
|
||||
pkmn.ability_index = newabil
|
||||
pkmn.ability = GameData::Ability.get((newabil == 0) ? abil1 : abil2).id
|
||||
|
||||
#pkmn.ability = GameData::Ability.get((newabil == 0) ? abil1 : abil2).id
|
||||
scene.pbHardRefresh
|
||||
scene.pbDisplay(_INTL("{1}'s Ability changed to {2}!", pkmn.name, newabilname))
|
||||
|
||||
@@ -10,7 +10,7 @@ class PokeRadar_UI
|
||||
|
||||
ICON_LINE_END = 450
|
||||
|
||||
GRAPHICS_Z = 99998
|
||||
GRAPHICS_Z = 99999
|
||||
|
||||
def initialize(seenPokemon = [], unseenPokemon = [], rarePokemon = [])
|
||||
@seen_pokemon = seenPokemon
|
||||
|
||||
@@ -18,9 +18,6 @@ def pbLoadTrainer(tr_type, tr_name, tr_version = 0)
|
||||
raise _INTL("Trainer type {1} does not exist.", tr_type) if !tr_type_data
|
||||
tr_type = tr_type_data.id
|
||||
trainer_data = getTrainersDataMode.try_get(tr_type, tr_name, tr_version)
|
||||
if !trainer_data
|
||||
trainer_data = GameData::Trainer.try_get(tr_type, tr_name, tr_version)
|
||||
end
|
||||
return (trainer_data) ? trainer_data.to_trainer : nil
|
||||
end
|
||||
|
||||
|
||||
@@ -587,7 +587,6 @@ class PokemonMartScreen
|
||||
@scene.pbStartBuyScene(@stock,@adapter)
|
||||
item=nil
|
||||
loop do
|
||||
pbWait(4)
|
||||
item=@scene.pbChooseBuyItem
|
||||
break if !item
|
||||
quantity=0
|
||||
|
||||
@@ -5,7 +5,7 @@ class Player < Trainer
|
||||
attr_accessor :has_snag_machine
|
||||
attr_accessor :seen_purify_chamber
|
||||
|
||||
alias __shadowPkmn__initialize initialize unless method_defined?(:__shadowPkmn__initialize)
|
||||
alias __shadowPkmn__initialize initialize
|
||||
def initialize(name, trainer_type)
|
||||
__shadowPkmn__initialize(name, trainer_type)
|
||||
@has_snag_machine = false
|
||||
|
||||
@@ -41,17 +41,17 @@ def Kernel.initRandomTypeArray()
|
||||
$game_variables[VAR_GYM_TYPES_ARRAY] = $game_switches[SWITCH_RANDOMIZED_GYM_TYPES] ? typesArray : GYM_TYPES_ARRAY
|
||||
end
|
||||
|
||||
# def setRivalStarter(starter1, starter2, starter3, choice)
|
||||
# starters = [starter1, starter2, starter3]
|
||||
# starters.delete_at(choice)
|
||||
# if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
|
||||
# rivalStarter = starters[0]
|
||||
# else
|
||||
# rivalStarter = starters[0] * NB_POKEMON + starters[1]
|
||||
# end
|
||||
# pbSet(VAR_RIVAL_STARTER, rivalStarter)
|
||||
# $game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
|
||||
# end
|
||||
def setRivalStarter(starter1, starter2, starter3, choice)
|
||||
starters = [starter1, starter2, starter3]
|
||||
starters.delete_at(choice)
|
||||
if starters[0] > NB_POKEMON || starters[1] > NB_POKEMON
|
||||
rivalStarter = starters[0]
|
||||
else
|
||||
rivalStarter = starters[0] * NB_POKEMON + starters[1]
|
||||
end
|
||||
pbSet(VAR_RIVAL_STARTER, rivalStarter)
|
||||
$game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
|
||||
end
|
||||
|
||||
def setRivalStarterSpecific(rivalStarter)
|
||||
pbSet(VAR_RIVAL_STARTER, rivalStarter)
|
||||
@@ -228,11 +228,10 @@ def Kernel.sumGameStats()
|
||||
stringStats << "\nBeaten the Elite Four " << $game_variables[VAR_STAT_NB_ELITE_FOUR].to_s << " times"
|
||||
stringStats << "\nFused " << $game_variables[VAR_STAT_NB_FUSIONS].to_s << " Pokémon"
|
||||
|
||||
nbGymRematches = $game_variables[VAR_STAT_LEADER_REMATCH]
|
||||
stringStats << "\nRematched " << nbGymRematches.to_s << " Gym Leaders" if nbGymRematches > 0
|
||||
stringStats << "\nRematched " << $game_variables[VAR_STAT_LEADER_REMATCH].to_s << " Gym Leaders"
|
||||
stringStats << "\nTook " << $PokemonGlobal.stepcount.to_s << " steps"
|
||||
stringStats << "\nVisited " << countVisitedMaps.to_s << " different areas"
|
||||
stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY].to_s << " Rare Candies"
|
||||
stringStats << "\nUsed " << $game_variables[VAR_STAT_RARE_CANDY] << " Rare Candies"
|
||||
|
||||
if $game_switches[910]
|
||||
stringStats << "\nMade " << $game_variables[VAR_STAT_NB_WONDERTRADES].to_s << " Wonder Trades"
|
||||
@@ -735,13 +734,13 @@ def fixRivalStarter()
|
||||
end
|
||||
starterChoice = pbGet(7)
|
||||
|
||||
setRivalStarter(0, 1) if starterChoice == 2
|
||||
setRivalStarter(0, 2) if starterChoice == 1
|
||||
setRivalStarter(1, 2) if starterChoice == 0
|
||||
setRivalStarter(0, 1) if starterChoice > 2
|
||||
echoln pbGet(VAR_RIVAL_STARTER)
|
||||
s1 = $PokemonGlobal.psuedoBSTHash[1]
|
||||
s2 = $PokemonGlobal.psuedoBSTHash[4]
|
||||
s3 = $PokemonGlobal.psuedoBSTHash[7]
|
||||
setRivalStarter(s3, s2, s1, starterChoice)
|
||||
|
||||
#evolve en fct des badges
|
||||
rivalStarter = pbGet(VAR_RIVAL_STARTER)
|
||||
rivalStarter = pbGet(250)
|
||||
|
||||
if $game_switches[68] #beat blue cerulean
|
||||
rivalStarter = evolveBody(rivalStarter)
|
||||
|
||||
@@ -107,12 +107,13 @@ class BetterRegionMap
|
||||
if map_metadata
|
||||
player = map_metadata.town_map_position
|
||||
if true#player && player[0] == @region #only use 1 region
|
||||
$PokemonGlobal.regionMapSel = [0, 0]
|
||||
$PokemonGlobal.regionMapSel[0] = player[1]
|
||||
$PokemonGlobal.regionMapSel[1] = player[2]
|
||||
gender = $Trainer.gender.to_digits(3)
|
||||
# @window["player"].bmp("Graphics/Pictures/map/Player#{gender}")
|
||||
@window["player"].bmp("Graphics/Pictures/map/location_icon")
|
||||
@window["player"].x = TileWidth * player[1] + (TileWidth / 2.0) if player
|
||||
@window["player"].y = TileHeight * player[2] + (TileHeight / 2.0) if player
|
||||
@window["player"].x = TileWidth * player[1] + (TileWidth / 2.0)
|
||||
@window["player"].y = TileHeight * player[2] + (TileHeight / 2.0)
|
||||
@window["player"].center_origins
|
||||
end
|
||||
else
|
||||
|
||||
@@ -176,11 +176,11 @@ end
|
||||
|
||||
|
||||
def playPokeFluteAnimation
|
||||
# return if $Trainer.outfit != 0
|
||||
# $game_player.setDefaultCharName("players/pokeflute", 0, false)
|
||||
# Graphics.update
|
||||
# Input.update
|
||||
# pbUpdateSceneMap
|
||||
return if $Trainer.outfit != 0
|
||||
$game_player.setDefaultCharName("players/pokeflute", 0, false)
|
||||
Graphics.update
|
||||
Input.update
|
||||
pbUpdateSceneMap
|
||||
end
|
||||
|
||||
def restoreDefaultCharacterSprite(charset_number = 0)
|
||||
@@ -1110,7 +1110,6 @@ def setRivalStarter(starterIndex1,starterIndex2)
|
||||
starter = GameData::Species.get(starterSpecies.get_baby_species(false)).id_number
|
||||
end
|
||||
pbSet(VAR_RIVAL_STARTER,starter)
|
||||
$game_switches[SWITCH_DEFINED_RIVAL_STARTER] = true
|
||||
return starter
|
||||
end
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ Events.onWildPokemonCreate+=proc {|sender,e|
|
||||
if player_on_hidden_ability_map || isAlwaysHiddenAbilityMap($game_map.map_id)
|
||||
pokemon=e[0]
|
||||
chosenAbility = pokemon.getAbilityList.sample #format: [[:ABILITY, index],...]
|
||||
pokemon.ability = chosenAbility[0]
|
||||
#pokemon.ability = chosenAbility[0]
|
||||
pokemon.ability_index = chosenAbility[1]
|
||||
end
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ def download_file(url, saveLocation)
|
||||
echoln _INTL("\nDownloaded file {1} to {2}", url, saveLocation)
|
||||
return saveLocation
|
||||
else
|
||||
echoln _INTL("Tried to download file {1}.",url)
|
||||
echoln _INTL("Tried to download file {1} . Got response {2}",url,response[:body])
|
||||
end
|
||||
return nil
|
||||
rescue MKXPError, Errno::ENOENT => error
|
||||
@@ -81,7 +81,7 @@ def download_sprite(base_path, head_id, body_id, saveLocation = "Graphics/temp",
|
||||
echoln _INTL("\nDownloaded file from {1} to {2}", base_path, saveLocation)
|
||||
return downloaded_file_name
|
||||
end
|
||||
echoln _INTL("Tried to download file {1} . Got response {2}",url,response[:body])
|
||||
echoln "tried to download " + url
|
||||
return nil
|
||||
rescue MKXPError, Errno::ENOENT
|
||||
return nil
|
||||
|
||||
@@ -64,7 +64,7 @@ def migrateOldSavesToCharacterCustomization()
|
||||
$Trainer.unlocked_hairstyles = [Settings::DEFAULT_OUTFIT_MALE, Settings::DEFAULT_OUTFIT_FEMALE]
|
||||
end
|
||||
|
||||
if !$Trainer.clothes || !$Trainer.hair #|| !$Trainer.hat
|
||||
if !$Trainer.clothes || !$Trainer.hair || !$Trainer.hat
|
||||
setupStartingOutfit()
|
||||
end
|
||||
end
|
||||
|
||||
@@ -30,9 +30,7 @@ next catchRate
|
||||
})
|
||||
BallHandlers::OnCatch.add(:ABILITYBALL,proc{|ball,battle,pokemon|
|
||||
species = getSpecies(dexNum(pokemon))
|
||||
ability = species.hidden_abilities[-1]
|
||||
pokemon.ability = ability
|
||||
pokemon.ability_index= getAbilityIndexFromID(ability,pokemon)
|
||||
pokemon.ability_index= getAbilityIndexFromID(species.hidden_abilities[-1],pokemon)
|
||||
})
|
||||
|
||||
#VIRUS BALL 27 - give pokerus
|
||||
|
||||
@@ -1868,27 +1868,13 @@ ItemHandlers::UseInField.add(:DEVONSCOPE, proc { |item|
|
||||
#TRACKER (for roaming legendaries)
|
||||
ItemHandlers::UseInField.add(:REVEALGLASS, proc { |item|
|
||||
track_pokemon()
|
||||
next true
|
||||
})
|
||||
ItemHandlers::UseFromBag.add(:REVEALGLASS, proc { |item|
|
||||
track_pokemon()
|
||||
next true
|
||||
})
|
||||
|
||||
def getAllCurrentlyRoamingPokemon
|
||||
currently_roaming = []
|
||||
Settings::ROAMING_SPECIES.each_with_index do |data, i|
|
||||
next if !GameData::Species.exists?(data[0])
|
||||
next if data[2] > 0 && !$game_switches[data[2]] # Isn't roaming
|
||||
next if $PokemonGlobal.roamPokemon[i] == true # Roaming Pokémon has been caught
|
||||
currently_roaming << i
|
||||
end
|
||||
return currently_roaming
|
||||
end
|
||||
|
||||
def track_pokemon()
|
||||
currently_roaming = getAllCurrentlyRoamingPokemon()
|
||||
echoln currently_roaming
|
||||
currently_roaming = $PokemonGlobal.roamPosition.keys
|
||||
weather_data = []
|
||||
mapinfos = $RPGVX ? load_data("Data/MapInfos.rvdata") : load_data("Data/MapInfos.rxdata")
|
||||
currently_roaming.each do |roamer_id|
|
||||
@@ -1905,11 +1891,12 @@ def track_pokemon()
|
||||
end
|
||||
weather_data << forecast_msg if forecast_msg && !weather_data.include?(forecast_msg)
|
||||
end
|
||||
weather_data << _INTL("No unusual weather patterns have been detected.") if weather_data.empty?
|
||||
|
||||
weather_data.each do |message|
|
||||
Kernel.pbMessage(message)
|
||||
end
|
||||
|
||||
|
||||
# nbRoaming = 0
|
||||
# if Settings::ROAMING_SPECIES.length == 0
|
||||
# Kernel.pbMessage(_INTL("No roaming Pokémon defined."))
|
||||
|
||||
@@ -1,47 +1,3 @@
|
||||
# class ShinySelector
|
||||
# def set_colors(pokemon_id)
|
||||
#
|
||||
#
|
||||
#
|
||||
# picturePath = get_unfused_sprite_path(getPokemon(pokemon_id).id_number)
|
||||
# @pokemonBitmap = AnimatedBitmap.new(picturePath)
|
||||
# @previewwindow = PictureWindow.new(@pokemonBitmap)
|
||||
# @previewwindow.z = 100
|
||||
#
|
||||
#
|
||||
#
|
||||
# pbFadeOutIn {
|
||||
# scene = ShinySliderOptionsScene.new
|
||||
# screen = PokemonOptionScreen.new(scene)
|
||||
# screen.pbStartScreen
|
||||
# }
|
||||
#
|
||||
# end
|
||||
# end
|
||||
#
|
||||
# class ShinySliderOptionsScene < PokemonOption_Scene
|
||||
# def pbGetOptions(inloadscreen = false)
|
||||
# options = []
|
||||
# options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
|
||||
# proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
|
||||
# proc { |value|
|
||||
# $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
|
||||
# })
|
||||
# end
|
||||
#
|
||||
# def initOptionsWindow
|
||||
# options = []
|
||||
# options << SliderOption.new(_INTL("Hue"), 0, 360, 1,
|
||||
# proc { $game_variables[VAR_RANDOMIZER_TRAINER_BST] },
|
||||
# proc { |value|
|
||||
# $game_variables[VAR_RANDOMIZER_TRAINER_BST] = value
|
||||
# })
|
||||
# return Window_PokemonOption.new(options, 0, 300, Graphics.width, Graphics.height)
|
||||
# end
|
||||
# end
|
||||
|
||||
|
||||
|
||||
SHINY_COLOR_OFFSETS = {
|
||||
1 => -30,
|
||||
2 => -85,
|
||||
|
||||
@@ -1,15 +1,15 @@
|
||||
|
||||
module Settings
|
||||
SHINY_POKEMON_CHANCE = 16
|
||||
CREDITS_FILE_URL = "https://gitlab.com/infinitefusion2/customsprites/-/raw/master/Sprite Credits.csv"
|
||||
CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/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"
|
||||
CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"
|
||||
|
||||
AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/autogen-fusion-sprites/-/raw/main/Battlers/"
|
||||
CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/customSprites/-/raw/master/CustomBattlers/"
|
||||
BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/autogen-fusion-sprites/-/raw/main/Battlers/"
|
||||
BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/infinitefusion2/customSprites/-/raw/main/Other/BaseSprites/"
|
||||
AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
|
||||
CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/CustomBattlers/"
|
||||
BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
|
||||
BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Other/BaseSprites/"
|
||||
|
||||
DISCORD_URL = "https://discord.com/invite/infinitefusion"
|
||||
WIKI_URL = "https://infinitefusion.fandom.com/"
|
||||
|
||||
16
Data/Scripts/RemoteUrls.rb
Normal file
@@ -0,0 +1,16 @@
|
||||
|
||||
module Settings
|
||||
SHINY_POKEMON_CHANCE = 16
|
||||
CREDITS_FILE_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/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"
|
||||
CUSTOM_DEX_FILE_URL = "https://raw.githubusercontent.com/infinitefusion/infinitefusion-e18/main/Data/dex.json"
|
||||
|
||||
AUTOGEN_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
|
||||
CUSTOM_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/CustomBattlers/"
|
||||
BASE_POKEMON_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/autogen-fusion-sprites/-/raw/master/Battlers/"
|
||||
BASE_POKEMON_ALT_SPRITES_REPO_URL = "https://gitlab.com/pokemoninfinitefusion/customsprites/-/raw/master/Other/BaseSprites/"
|
||||
|
||||
DISCORD_URL = "https://discord.com/invite/infinitefusion"
|
||||
WIKI_URL = "https://infinitefusion.fandom.com/"
|
||||
end
|
||||
@@ -1 +1 @@
|
||||
6.2
|
||||
6.1
|
||||
6156
Data/dex.json
@@ -1 +0,0 @@
|
||||
RPGXP 1.01
|
||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.7 KiB |
|
Before Width: | Height: | Size: 783 B After Width: | Height: | Size: 771 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 1021 B |
|
Before Width: | Height: | Size: 407 B After Width: | Height: | Size: 480 B |
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 9.5 KiB |
|
Before Width: | Height: | Size: 802 B After Width: | Height: | Size: 7.2 KiB |
|
Before Width: | Height: | Size: 798 B After Width: | Height: | Size: 993 B |
|
Before Width: | Height: | Size: 544 B After Width: | Height: | Size: 516 B |
|
Before Width: | Height: | Size: 727 B After Width: | Height: | Size: 1.2 KiB |
|
Before Width: | Height: | Size: 387 B After Width: | Height: | Size: 494 B |
|
Before Width: | Height: | Size: 1.2 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 8.0 KiB |
|
Before Width: | Height: | Size: 899 B After Width: | Height: | Size: 1.3 KiB |
|
Before Width: | Height: | Size: 409 B After Width: | Height: | Size: 517 B |