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

Added checks that prevent aliasing a method if the alias method already exists, fixed Symbiosis not working properly for opponents

Browse Source
This commit is contained in:
Maruno17
2021-12-28 19:22:31 +00:00
committed by infinitefusion
parent 0904f27afa
commit 92194cab02
5 changed files with 207 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Data/Scripts/001_Technical/002_RubyUtilities.rb
View File

@@ -2,7 +2,7 @@
# class Object # class Object
#=============================================================================== #===============================================================================
class Object class Object
alias full_inspect inspect alias full_inspect inspect unless method_defined?(:full_inspect)
def inspect def inspect
return "#<#{self.class}>" return "#<#{self.class}>"

6
Data/Scripts/005_Sprites/008_Sprite_AnimationSprite.rb
View File

@@ -41,9 +41,9 @@ end
class Spriteset_Map class Spriteset_Map
alias _animationSprite_initialize initialize alias _animationSprite_initialize initialize unless method_defined?(:_animationSprite_initialize)
alias _animationSprite_update update alias _animationSprite_update update unless method_defined?(:_animationSprite_update)
alias _animationSprite_dispose dispose alias _animationSprite_dispose dispose unless method_defined?(:_animationSprite_dispose)
def initialize(map=nil) def initialize(map=nil)
@usersprites=[] @usersprites=[]

51
Data/Scripts/005_Sprites/009_Sprite_DynamicShadows.rb
View File

@@ -19,7 +19,7 @@ class Sprite_Shadow < RPG::Sprite
end end
def dispose def dispose
@chbitmap.dispose if @chbitmap @chbitmap&.dispose
super super
end end
@@ -35,8 +35,8 @@ class Sprite_Shadow < RPG::Sprite
@tile_id = @character.tile_id @tile_id = @character.tile_id
@character_name = @character.character_name @character_name = @character.character_name
@character_hue = @character.character_hue @character_hue = @character.character_hue
@chbitmap&.dispose
if @tile_id >= 384 if @tile_id >= 384
@chbitmap.dispose if @chbitmap
@chbitmap = pbGetTileBitmap(@character.map.tileset_name, @chbitmap = pbGetTileBitmap(@character.map.tileset_name,
@tile_id, @character.character_hue) @tile_id, @character.character_hue)
self.src_rect.set(0, 0, 32, 32) self.src_rect.set(0, 0, 32, 32)
@@ -45,9 +45,8 @@ class Sprite_Shadow < RPG::Sprite
self.ox = 16 self.ox = 16
self.oy = 32 self.oy = 32
else else
@chbitmap.dispose if @chbitmap @chbitmap = AnimatedBitmap.new('Graphics/Characters/' + @character.character_name,
@chbitmap = AnimatedBitmap.new( @character.character_hue)
'Graphics/Characters/'+@character.character_name,@character.character_hue)
@cw = @chbitmap.width / 4 @cw = @chbitmap.width / 4
@ch = @chbitmap.height / 4 @ch = @chbitmap.height / 4
self.ox = @cw / 2 self.ox = @cw / 2
@@ -90,7 +89,7 @@ class Sprite_Shadow < RPG::Sprite
@deltay = ScreenPosHelper.pbScreenY(@source) - self.y @deltay = ScreenPosHelper.pbScreenY(@source) - self.y
self.color = Color.new(0, 0, 0) self.color = Color.new(0, 0, 0)
@distance = ((@deltax**2) + (@deltay**2)) @distance = ((@deltax**2) + (@deltay**2))
self.opacity = @self_opacity * 13000 / ((@distance * 370 / @distancemax) + 6000) self.opacity = @self_opacity * 13_000 / ((@distance * 370 / @distancemax) + 6000)
self.angle = 57.3 * Math.atan2(@deltax, @deltay) self.angle = 57.3 * Math.atan2(@deltax, @deltay)
@angle_trigo = self.angle + 90 @angle_trigo = self.angle + 90
@angle_trigo += 360 if @angle_trigo < 0 @angle_trigo += 360 if @angle_trigo < 0
@@ -124,7 +123,7 @@ end
# ? CLASS Sprite_Character edit # ? CLASS Sprite_Character edit
#=================================================== #===================================================
class Sprite_Character < RPG::Sprite class Sprite_Character < RPG::Sprite
alias :shadow_initialize :initialize alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
def initialize(viewport, character = nil) def initialize(viewport, character = nil)
@ombrelist = [] @ombrelist = []
@@ -136,33 +135,29 @@ class Sprite_Character < RPG::Sprite
if character.is_a?(Game_Event) && shadows.length > 0 if character.is_a?(Game_Event) && shadows.length > 0
params = XPML_read(map, "Shadow", @character, 4) params = XPML_read(map, "Shadow", @character, 4)
if params != nil if params != nil
for i in 0...shadows.size shadows.each do |shadow|
@ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows[i])) @ombrelist.push(Sprite_Shadow.new(viewport, @character, shadows))
end end
end end
end end
if character.is_a?(Game_Player) && shadows.length > 0 if character.is_a?(Game_Player) && shadows.length > 0
for i in 0...shadows.size shadows.each do |shadow|
@ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadows[i])) @ombrelist.push(Sprite_Shadow.new(viewport, $game_player, shadow))
end end
end end
update update
end end
def clearShadows def clearShadows
@ombrelist.each { |s| s.dispose if s } @ombrelist.each { |s| s&.dispose }
@ombrelist.clear @ombrelist.clear
end end
alias shadow_update update alias shadow_update update unless method_defined?(:shadow_update)
def update def update
shadow_update shadow_update
if @ombrelist.length>0 @ombrelist.each { |ombre| ombre.update }
for i in 0...@ombrelist.size
@ombrelist[i].update
end
end
end end
end end
@@ -183,16 +178,16 @@ end
class Spriteset_Map class Spriteset_Map
attr_accessor :shadows attr_accessor :shadows
alias shadow_initialize initialize alias shadow_initialize initialize unless method_defined?(:shadow_initialize)
def initialize(map = nil) def initialize(map = nil)
@shadows = [] @shadows = []
warn = false warn = false
map = $game_map if !map map = $game_map if !map
for k in map.events.keys.sort map.events.keys.sort.each do |k|
ev = map.events[k] ev = map.events[k]
warn = true if (ev.list != nil && ev.list.length > 0 && warn = true if ev.list != nil && ev.list.length > 0 && ev.list[0].code == 108 &&
ev.list[0].code == 108 && (ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"])
(ev.list[0].parameters == ["s"] || ev.list[0].parameters == ["o"]))
params = XPML_read(map, "Shadow Source", ev, 4) params = XPML_read(map, "Shadow Source", ev, 4)
@shadows.push([ev] + params) if params != nil @shadows.push([ev] + params) if params != nil
end end
@@ -200,7 +195,7 @@ class Spriteset_Map
p "Warning : At least one event on this map uses the obsolete way to add shadows" p "Warning : At least one event on this map uses the obsolete way to add shadows"
end end
shadow_initialize(map) shadow_initialize(map)
for sprite in @character_sprites @character_sprites.each do |sprite|
sprite.setShadows(map, @shadows) sprite.setShadows(map, @shadows)
end end
$scene.spritesetGlobal.playersprite.setShadows(map, @shadows) $scene.spritesetGlobal.playersprite.setShadows(map, @shadows)
@@ -230,12 +225,12 @@ end
#=================================================== #===================================================
def XPML_read(map, markup, event, max_param_number = 0) def XPML_read(map, markup, event, max_param_number = 0)
parameter_list = nil parameter_list = nil
return nil if !event || event.list == nil return nil if !event || event.list.nil?
for i in 0...event.list.size event.list.size.times do |i|
if event.list[i].code == 108 && if event.list[i].code == 108 &&
event.list[i].parameters[0].downcase == "begin " + markup.downcase event.list[i].parameters[0].downcase == "begin " + markup.downcase
parameter_list = [] if parameter_list == nil parameter_list = [] if parameter_list.nil?
for j in i+1...event.list.size ((i + 1)...event.list.size).each do |j|
if event.list[j].code == 108 if event.list[j].code == 108
parts = event.list[j].parameters[0].split parts = event.list[j].parameters[0].split
if parts.size != 1 && parts[0].downcase != "begin" if parts.size != 1 && parts[0].downcase != "begin"

63
Data/Scripts/005_Sprites/010_ParticleEngine.rb
View File

@@ -31,7 +31,7 @@ class Particle_Engine
def dispose def dispose
return if disposed? return if disposed?
for particle in @effect @effect.each do |particle|
next if particle.nil? next if particle.nil?
particle.dispose particle.dispose
end end
@@ -57,17 +57,17 @@ class Particle_Engine
def realloc_effect(event, particle) def realloc_effect(event, particle)
type = pbEventCommentInput(event, 1, "Particle Engine Type") type = pbEventCommentInput(event, 1, "Particle Engine Type")
if type.nil? if type.nil?
particle.dispose if particle particle&.dispose
return nil return nil
end end
type = type[0].downcase type = type[0].downcase
cls = @effects[type] cls = @effects[type]
if cls.nil? if cls.nil?
particle.dispose if particle particle&.dispose
return nil return nil
end end
if !particle || !particle.is_a?(cls) if !particle || !particle.is_a?(cls)
particle.dispose if particle particle&.dispose
particle = cls.new(event, @viewport) particle = cls.new(event, @viewport)
end end
return particle return particle
@@ -80,13 +80,12 @@ class Particle_Engine
def update def update
if @firsttime if @firsttime
@firsttime = false @firsttime = false
for event in @map.events.values @map.events.values.each do |event|
remove_effect(event) remove_effect(event)
add_effect(event) add_effect(event)
end end
end end
for i in 0...@effect.length @effect.each_with_index do |particle, i|
particle = @effect[i]
next if particle.nil? next if particle.nil?
if particle.event.pe_refresh if particle.event.pe_refresh
event = particle.event event = particle.event
@@ -94,7 +93,7 @@ class Particle_Engine
particle = realloc_effect(event, particle) particle = realloc_effect(event, particle)
@effect[i] = particle @effect[i] = particle
end end
particle.update if particle particle&.update
end end
end end
end end
@@ -136,7 +135,7 @@ class ParticleSprite
end end
def dispose def dispose
@sprite.dispose if @sprite @sprite&.dispose
end end
def bitmap=(value) def bitmap=(value)
@@ -217,7 +216,7 @@ class ParticleEffect_Event < ParticleEffect
@zoffset = zOffset @zoffset = zOffset
@bmwidth = 32 @bmwidth = 32
@bmheight = 32 @bmheight = 32
for i in 0...@maxparticless @maxparticless.times do |i|
@particlex[i] = -@xoffset @particlex[i] = -@xoffset
@particley[i] = -@yoffset @particley[i] = -@yoffset
@particles[i] = ParticleSprite.new(@viewport) @particles[i] = ParticleSprite.new(@viewport)
@@ -261,9 +260,9 @@ class ParticleEffect_Event < ParticleEffect
@real_y = newRealY @real_y = newRealY
if @opacityvar > 0 && @viewport if @opacityvar > 0 && @viewport
opac = 255.0 / @opacityvar opac = 255.0 / @opacityvar
minX = opac*(-@xgravity*1.0 / @slowdown).floor + @startingx minX = (opac * (-@xgravity.to_f / @slowdown).floor) + @startingx
maxX = opac*(@xgravity*1.0 / @slowdown).floor + @startingx maxX = (opac * (@xgravity.to_f / @slowdown).floor) + @startingx
minY = opac*(-@ygravity*1.0 / @slowdown).floor + @startingy minY = (opac * (-@ygravity.to_f / @slowdown).floor) + @startingy
maxY = @startingy maxY = @startingy
minX -= @bmwidth minX -= @bmwidth
minY -= @bmheight minY -= @bmheight
@@ -275,7 +274,7 @@ class ParticleEffect_Event < ParticleEffect
end end
end end
particleZ = selfZ + @zoffset particleZ = selfZ + @zoffset
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].z = particleZ @particles[i].z = particleZ
if @particles[i].y <= @ytop if @particles[i].y <= @ytop
@particles[i].y = @startingy + @yoffset @particles[i].y = @startingy + @yoffset
@@ -309,15 +308,13 @@ class ParticleEffect_Event < ParticleEffect
@particlex[i] = 0.0 @particlex[i] = 0.0
@particley[i] = 0.0 @particley[i] = 0.0
end end
else elsif @opacity[i] <= 0
if @opacity[i] <= 0
@opacity[i] = 250 @opacity[i] = 250
@particles[i].y = @startingy + @yoffset @particles[i].y = @startingy + @yoffset
@particles[i].x = @startingx + @xoffset @particles[i].x = @startingx + @xoffset
@particlex[i] = 0.0 @particlex[i] = 0.0
@particley[i] = 0.0 @particley[i] = 0.0
end end
end
calcParticlePos(i) calcParticlePos(i)
if @randomhue == 1 if @randomhue == 1
@hue += 0.5 @hue += 0.5
@@ -333,11 +330,11 @@ class ParticleEffect_Event < ParticleEffect
def calcParticlePos(i) def calcParticlePos(i)
@leftright = rand(2) @leftright = rand(2)
if @leftright == 1 if @leftright == 1
xo = -@xgravity*1.0 / @slowdown xo = -@xgravity.to_f / @slowdown
else else
xo = @xgravity*1.0 / @slowdown xo = @xgravity.to_f / @slowdown
end end
yo = -@ygravity*1.0 / @slowdown yo = -@ygravity.to_f / @slowdown
@particlex[i] += xo @particlex[i] += xo
@particley[i] += yo @particley[i] += yo
@particlex[i] -= @__offsetx @particlex[i] -= @__offsetx
@@ -349,10 +346,10 @@ class ParticleEffect_Event < ParticleEffect
end end
def dispose def dispose
for particle in @particles @particles.each do |particle|
particle.dispose particle.dispose
end end
for bitmap in @bitmaps.values @bitmaps.values.each do |bitmap|
bitmap.dispose bitmap.dispose
end end
@particles.clear @particles.clear
@@ -390,7 +387,7 @@ class Particle_Engine::Teleport < ParticleEffect_Event
setParameters([1, 1, 1, 10, rand(360), 1, -64, setParameters([1, 1, 1, 10, rand(360), 1, -64,
Graphics.height, -64, Graphics.width, 0, 3, -8, -15, 20, 0]) Graphics.height, -64, Graphics.width, 0, 3, -8, -15, 20, 0])
initParticles("wideportal", 250) initParticles("wideportal", 250)
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].ox = 16 @particles[i].ox = 16
@particles[i].oy = 16 @particles[i].oy = 16
end end
@@ -449,7 +446,7 @@ class Particle_Engine::SootSmoke < ParticleEffect_Event
setParameters([0, 0, 0, 30, 0, 0.5, -64, setParameters([0, 0, 0, 30, 0, 0.5, -64,
Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80]) Graphics.height, -64, Graphics.width, 0.5, 0.10, -5, -15, 5, 80])
initParticles("smoke", 100, 0) initParticles("smoke", 100, 0)
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].blend_type = rand(6) < 3 ? 1 : 2 @particles[i].blend_type = rand(6) < 3 ? 1 : 2
end end
end end
@@ -474,7 +471,7 @@ class Particle_Engine::FixedTeleport < ParticleEffect_Event
setParameters([1, 0, 1, 10, rand(360), 1, setParameters([1, 0, 1, 10, rand(360), 1,
-Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 20, 0]) -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 20, 0])
initParticles("wideportal", 250) initParticles("wideportal", 250)
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].ox = 16 @particles[i].ox = 16
@particles[i].oy = 16 @particles[i].oy = 16
end end
@@ -490,7 +487,7 @@ class Particle_Engine::StarTeleport < ParticleEffect_Event
setParameters([0, 0, 1, 10, 0, 1, setParameters([0, 0, 1, 10, 0, 1,
-Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 10, 0]) -Graphics.height, Graphics.height, 0, Graphics.width, 0, 3, -8, -15, 10, 0])
initParticles("star", 250) initParticles("star", 250)
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].ox = 48 @particles[i].ox = 48
@particles[i].oy = 48 @particles[i].oy = 48
end end
@@ -505,7 +502,7 @@ class Particle_Engine::Smokescreen < ParticleEffect_Event
setParameters([0, 0, 0, 250, 0, 0.2, -64, setParameters([0, 0, 0, 250, 0, 0.2, -64,
Graphics.height, -64, Graphics.width, 0.8, 0.8, -5, -15, 5, 80]) Graphics.height, -64, Graphics.width, 0.8, 0.8, -5, -15, 5, 80])
initParticles(nil, 100) initParticles(nil, 100)
for i in 0...@maxparticless @maxparticless.times do |i|
rnd = rand(3) rnd = rand(3)
@opacity[i] = (rnd == 0) ? 1 : 100 @opacity[i] = (rnd == 0) ? 1 : 100
filename = (rnd == 0) ? "explosionsmoke" : "smoke" filename = (rnd == 0) ? "explosionsmoke" : "smoke"
@@ -520,9 +517,9 @@ class Particle_Engine::Smokescreen < ParticleEffect_Event
end end
multiple = 1.7 multiple = 1.7
xgrav = @xgravity * multiple / @slowdown xgrav = @xgravity * multiple / @slowdown
xgrav = -xgrav if (rand(2)==1) xgrav = -xgrav if rand(2) == 1
ygrav = @ygravity * multiple / @slowdown ygrav = @ygravity * multiple / @slowdown
ygrav = -ygrav if (rand(2)==1) ygrav = -ygrav if rand(2) == 1
@particlex[i] += xgrav @particlex[i] += xgrav
@particley[i] += ygrav @particley[i] += ygrav
@particlex[i] -= @__offsetx @particlex[i] -= @__offsetx
@@ -557,7 +554,7 @@ class Particle_Engine::Splash < ParticleEffect_Event
def update def update
super super
for i in 0...@maxparticless @maxparticless.times do |i|
@particles[i].opacity = 50 @particles[i].opacity = 50
@particles[i].update @particles[i].update
end end
@@ -569,7 +566,8 @@ end
class Game_Event < Game_Character class Game_Event < Game_Character
attr_accessor :pe_refresh attr_accessor :pe_refresh
alias nf_particles_game_map_initialize initialize alias nf_particles_game_map_initialize initialize unless method_defined?(:nf_particles_game_map_initialize)
def initialize(map_id, event, map = nil) def initialize(map_id, event, map = nil)
@pe_refresh = false @pe_refresh = false
begin begin
@@ -579,7 +577,8 @@ class Game_Event < Game_Character
end end
end end
alias nf_particles_game_map_refresh refresh alias nf_particles_game_map_refresh refresh unless method_defined?(:nf_particles_game_map_refresh)
def refresh def refresh
nf_particles_game_map_refresh nf_particles_game_map_refresh
@pe_refresh = true @pe_refresh = true

2
Data/Scripts/016_UI/022_UI_PurifyChamber.rb
View File

@@ -5,7 +5,7 @@ class Player < Trainer
attr_accessor :has_snag_machine attr_accessor :has_snag_machine
attr_accessor :seen_purify_chamber attr_accessor :seen_purify_chamber
alias __shadowPkmn__initialize initialize alias __shadowPkmn__initialize initialize unless method_defined?(:__shadowPkmn__initialize)
def initialize(name, trainer_type) def initialize(name, trainer_type)
__shadowPkmn__initialize(name, trainer_type) __shadowPkmn__initialize(name, trainer_type)
@has_snag_machine = false @has_snag_machine = false