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

Refactoring and Bugfixes (#127)

Browse Source 
* Replacing nil + compact! with delete, delete_at and delete_if wherever possible
* Fixed Terrain Tag editor not setting the correct terrain
* Fixed Text Cursor in Animation Editor not going right
This commit is contained in:
Golisopod-User
2021-08-23 02:55:29 +05:30
committed by GitHub
parent e57e1f4a1e
commit ecc5a040cd
21 changed files with 40 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Data/Scripts/004_Game classes/006_Game_MapFactory.rb
View File

@@ -387,25 +387,15 @@ class PokemonMapFactory
def updateMapsInternal
return if $game_player.moving?
if !MapFactoryHelper.hasConnections?($game_map.map_id)
return if @maps.length==1
for i in 0...@maps.length
@maps[i] = nil if $game_map.map_id!=@maps[i].map_id
end
@maps.compact!
return if @maps.length == 1
@maps.delete_if { |map| $game_map.map_id != map.map_id }
@mapIndex = getMapIndex($game_map.map_id)
return
end
setMapsInRange
deleted = false
for i in 0...@maps.length
next if MapFactoryHelper.mapInRange?(@maps[i])
@maps[i] = nil
deleted = true
end
if deleted
@maps.compact!
@mapIndex = getMapIndex($game_map.map_id)
end
deleted = @maps.delete_if { |map| !MapFactoryHelper.mapInRange?(map) }
@mapIndex = getMapIndex($game_map.map_id) if deleted
end
end

22
Data/Scripts/004_Game classes/010_Game_Player_Visuals.rb
View File

@@ -78,25 +78,3 @@ class Game_Player < Game_Character
end
end
end
=begin
class Game_Character
alias update_old2 update
def update
if self.is_a?(Game_Event)
if @dependentEvents
for i in 0...@dependentEvents.length
if @dependentEvents[i][0]==$game_map.map_id &&
@dependentEvents[i][1]==self.id
self.move_speed_real = $game_player.move_speed_real
break
end
end
end
end
update_old2
end
end
=end

3
Data/Scripts/005_Sprites/003_Sprite_Character.rb
View File

@@ -157,11 +157,8 @@ class Sprite_Character < RPG::Sprite
self.x = @character.screen_x
self.y = @character.screen_y
self.z = @character.screen_z(@ch)
# self.zoom_x = Game_Map::TILE_WIDTH / 32.0
# self.zoom_y = Game_Map::TILE_HEIGHT / 32.0
self.opacity = @character.opacity
self.blend_type = @character.blend_type
# self.bush_depth = @character.bush_depth
if @character.animation_id != 0
animation = $data_animations[@character.animation_id]
animation(animation, true)

49
Data/Scripts/007_Objects and windows/010_DrawText.rb
View File

@@ -247,40 +247,6 @@ def getFormattedTextFast(bitmap,xDst,yDst,widthDst,heightDst,text,lineheight,
end
position+=1
end
# This code looks at whether the text occupies exactly two lines when
# displayed. If it does, it balances the length of each line.
=begin
# Count total number of lines
numlines = (x==0 && y>0) ? y-1 : y
realtext = (newlineBreaks) ? text : text.gsub(/\n/," ")
if numlines==2 && !explicitBreaksOnly && !realtext[/\n/] && realtext.length>=50
# Set half to middle of text (known to contain no formatting)
half = realtext.length/2
leftSearch = 0
rightSearch = 0
# Search left for a space
i = half; while i>=0
break if realtext[i,1][/\s/]||isWaitChar(realtext[i]) # found a space
leftSearch += 1
i -= 1
end
# Search right for a space
i = half; while i<realtext.length
break if realtext[i,1][/\s/]||isWaitChar(realtext[i]) # found a space
rightSearch += 1
i += 1
end
# Move half left or right whichever is closer
trialHalf = half+((leftSearch<rightSearch) ? -leftSearch : rightSearch)
if trialHalf!=0 && trialHalf!=realtext.length
# Insert newline and re-call this function (force explicitBreaksOnly)
newText = realtext.clone
newText.insert(trialHalf,"\n")
return getFormattedTextFast(bitmap,xDst,yDst,
widthDst,heightDst,newText,lineheight,true,explicitBreaksOnly)
end
end
=end
# Eliminate spaces before newlines and pause character
if havenl
firstspace=-1
@@ -292,11 +258,9 @@ def getFormattedTextFast(bitmap,xDst,yDst,widthDst,heightDst,text,lineheight,
for j in firstspace...i
characters[j]=nil
end
firstspace=-1
firstspace = -1
elsif characters[i][0][/[ \r\t]/]
if firstspace<0
firstspace=i
end
firstspace = i if firstspace < 0
else
firstspace=-1
end
@@ -868,14 +832,7 @@ def getFormattedText(bitmap,xDst,yDst,widthDst,heightDst,text,lineheight=32,
end
end
# Remove all characters with Y greater or equal to _yDst_+_heightDst_
if heightDst>=0
for i in 0...characters.length
if characters[i][2]>=yDst+heightDst
characters[i]=nil
end
end
characters.compact!
end
characters.delete_if { |ch| ch[2] >= yDst + heightDst } if heightDst >= 0
bitmap.font=oldfont
dummybitmap.dispose if dummybitmap
return characters

7
Data/Scripts/011_Battle/003_Battle/007_Battle_Action_UseItem.rb
View File

@@ -48,12 +48,7 @@ class PokeBattle_Battle
end
else
items = pbGetOwnerItems(idxBattler)
items.each_with_index do |thisItem,i|
next if thisItem!=item
items[i] = nil
break
end
items.compact!
items.delete_at(items.index(item))
end
end

3
Data/Scripts/012_Overworld/006_Overworld_BerryPlants.rb
View File

@@ -397,7 +397,8 @@ def pbBerryPlant
berryData[3]=timenow.to_i # time planted
berryData[4]=0 # total waterings
berryData[5]=0 # number of replants
berryData[6]=nil; berryData[7]=nil; berryData.compact! # for compatibility
berryData.delete_at(6) # for compatibility
berryData.delete_at(6) # for compatibility
$PokemonBag.pbDeleteItem(berry,1)
pbMessage(_INTL("{1} planted a {2} in the soft loamy soil.",
$Trainer.name,GameData::Item.get(berry).name))

3
Data/Scripts/012_Overworld/007_Overworld_DayCare.rb
View File

@@ -53,8 +53,7 @@ def pbDayCareDeposit(index)
$PokemonGlobal.daycare[i][0] = $Trainer.party[index]
$PokemonGlobal.daycare[i][1] = $Trainer.party[index].level
$PokemonGlobal.daycare[i][0].heal
$Trainer.party[index] = nil
$Trainer.party.compact!
$Trainer.party.delete_at(index)
$PokemonGlobal.daycareEgg = 0
$PokemonGlobal.daycareEggSteps = 0
return

7
Data/Scripts/013_Items/008_PokemonBag.rb
View File

@@ -178,12 +178,7 @@ class PokemonBag
def pbUnregisterItem(item)
item = GameData::Item.get(item).id
registeredlist = self.registeredItems
for i in 0...registeredlist.length
next if registeredlist[i] != item
registeredlist[i] = nil
break
end
registeredlist.compact!
registeredlist.delete_at(registeredlist.index(item))
end
def registeredIndex

9
Data/Scripts/014_Pokemon/001_Pokemon.rb
View File

@@ -153,7 +153,7 @@ class Pokemon
@ability = nil
MultipleForms.call("onSetForm", self, value, oldForm)
calc_stats
$Trainer.pokedex.register(self)
$Trainer.pokedex.register(self) if $Trainer
end
# The same as def form=, but yields to a given block in the middle so that a
@@ -752,12 +752,7 @@ class Pokemon
def takeRibbon(ribbon)
ribbon_data = GameData::Ribbon.try_get(ribbon)
return if !ribbon_data
for i in 0...@ribbons.length
next if @ribbons[i] != ribbon_data.id
@ribbons[i] = nil
@ribbons.compact!
break
end
@ribbons.delete_at(@ribbons.index(ribbon_data.id))
end
# Removes all ribbons from this Pokémon.

8
Data/Scripts/016_UI/017_UI_PokemonStorage.rb
View File

@@ -515,8 +515,7 @@ class PokemonBoxPartySprite < SpriteWrapper
sprite = @pokemonsprites[index]
if sprite
arrow.grab(sprite)
@pokemonsprites[index] = nil
@pokemonsprites.compact!
@pokemonsprites.delete_at(index)
refresh
end
end
@@ -539,10 +538,7 @@ class PokemonBoxPartySprite < SpriteWrapper
xvalues.push(18 + 72 * (i % 2))
yvalues.push(2 + 16 * (i % 2) + 64 * (i / 2))
end
for j in 0...Settings::MAX_PARTY_SIZE
@pokemonsprites[j] = nil if @pokemonsprites[j] && @pokemonsprites[j].disposed?
end
@pokemonsprites.compact!
@pokemonsprites.delete_if { |sprite| sprite && sprite.disposed? }
for j in 0...Settings::MAX_PARTY_SIZE
sprite = @pokemonsprites[j]
if sprite && !sprite.disposed?

13
Data/Scripts/016_UI/020_UI_PokeMart.rb
View File

@@ -588,12 +588,7 @@ class PokemonMartScreen
pbDisplayPaused(_INTL("You have no more room in the Bag."))
else
@adapter.setMoney(@adapter.getMoney-price)
for i in 0...@stock.length
if GameData::Item.get(@stock[i]).is_important? && $PokemonBag.pbHasItem?(@stock[i])
@stock[i]=nil
end
end
@stock.compact!
@stock.delete_if { |item| GameData::Item.get(item).is_important? && $PokemonBag.pbHasItem?(item) }
pbDisplayPaused(_INTL("Here you are! Thank you!")) { pbSEPlay("Mart buy item") }
if quantity >= 10 && $PokemonBag && GameData::Item.exists?(:PREMIERBALL)
if Settings::MORE_BONUS_PREMIER_BALLS && GameData::Item.get(item).is_poke_ball?
@@ -660,11 +655,7 @@ end
#
#===============================================================================
def pbPokemonMart(stock,speech=nil,cantsell=false)
for i in 0...stock.length
stock[i] = GameData::Item.get(stock[i]).id
stock[i] = nil if GameData::Item.get(stock[i]).is_important? && $PokemonBag.pbHasItem?(stock[i])
end
stock.compact!
stock.delete_if { |item| GameData::Item.get(item).is_important? && $PokemonBag.pbHasItem?(item) }
commands = []
cmdBuy = -1
cmdSell = -1

12
Data/Scripts/016_UI/023_UI_MysteryGift.rb
View File

@@ -184,10 +184,7 @@ def pbManageMysteryGifts
break
elsif cmd==0 # Toggle on/offline
if online.include?(gift[0])
for i in 0...online.length
online[i]=nil if online[i]==gift[0]
end
online.compact!
online.delete(gift[0])
else
online.push(gift[0])
end
@@ -208,10 +205,7 @@ def pbManageMysteryGifts
$Trainer.mystery_gifts.push(gift) if !replaced
pbReceiveMysteryGift(gift[0])
elsif cmd==3 # Delete
if pbConfirmMessage(_INTL("Are you sure you want to delete this gift?"))
master[command]=nil
master.compact!
end
master.delete_at(command) if pbConfirmMessage(_INTL("Are you sure you want to delete this gift?"))
break
end
end
@@ -305,7 +299,7 @@ def pbDownloadMysteryGift(trainer)
pbMessageDisplay(sprites["msgwindow"],_INTL("The gift has been received!")) { sprite.update }
pbMessageDisplay(sprites["msgwindow"],_INTL("Please pick up your gift from the deliveryman in any Poké Mart.")) { sprite.update }
trainer.mystery_gifts.push(gift)
pending[command]=nil; pending.compact!
pending.delete_at(command)
opacityDiff = 16*20/Graphics.frame_rate
loop do
Graphics.update

3
Data/Scripts/018_Alternate battle modes/003_Battle Frontier generator/001_ChallengeGenerator_Data.rb
View File

@@ -205,8 +205,7 @@ def pbGenerateChallenge(rule, tag)
elsif teams[i].length < 2
teams[i] = RuledTeam.new(party, rule)
elsif i >= maxteams
teams[i] = nil
teams.compact!
teams.delete_at(i)
elsif teams[i].totalGames >= 250
# retire
for j in 0...teams[i].length

6
Data/Scripts/020_Debug/001_Editor screens/001_EditorScreens.rb
View File

@@ -322,8 +322,7 @@ def pbEncounterTypeEditor(enc_data, enc_type)
need_refresh = true
when 2 # Delete
if pbConfirmMessage(_INTL("Delete this encounter slot?"))
enc_data.types[enc_type][ret - 2] = nil
enc_data.types[enc_type].compact!
enc_data.types[enc_type].delete_at(ret - 2)
need_refresh = true
end
end
@@ -1298,8 +1297,7 @@ def pbRegionalDexEditorMain
cmd[1] = dex_lists.length
refresh_list = true
when 2 # Delete
dex_lists[cmd[1] - 1] = nil
dex_lists.compact!
dex_lists.delete_at(cmd[1] - 1)
cmd[1] = [cmd[1], dex_lists.length].min
refresh_list = true
end

2
Data/Scripts/020_Debug/001_Editor screens/002_EditorScreens_TerrainTags.rb
View File

@@ -215,7 +215,7 @@ class PokemonTilesetScene
end
val = pbMessage(_INTL("\\l[1]\\ts[]Set the terrain tag."), cmds, -1, nil, old_idx)
if val >= 0 && val != old_tag
set_terrain_tag_for_tile_ID(selected, val)
set_terrain_tag_for_tile_ID(selected, ids[val])
draw_overlay
end
end

7
Data/Scripts/020_Debug/001_Editor screens/003_EditorScreens_MapConnections.rb
View File

@@ -218,11 +218,8 @@ class MapScreenScene
return false
end
def removeOldConnections(ret,mapid)
for i in 0...ret.length
ret[i]=nil if ret[i][0]==mapid || ret[i][3]==mapid
end
ret.compact!
def removeOldConnections(ret, mapid)
ret.delete_if { |conn| conn[0] == mapid || conn[3] == mapid}
end
# Returns the maps within _keys_ that are directly connected to this map, _map_.

2
Data/Scripts/020_Debug/002_Animation editor/002_AnimEditor_ControlsButtons.rb
View File

@@ -271,7 +271,7 @@ class TextField < UIControl
end
return
end
if Input.triggerex?(:LEFT) || Input.repeatex?(:RIGHT)
if Input.triggerex?(:RIGHT) || Input.repeatex?(:RIGHT)
if @cursor < self.text.scan(/./m).length
@cursor+=1
@frame=0

1
Data/Scripts/020_Debug/002_Animation editor/003_AnimEditor_Interpolation.rb
View File

@@ -263,7 +263,6 @@ def pbDefinePath(canvas)
points[j]=nil
end
points.compact!
# File.open("pointpath.txt","wb") { |f| f.write(path.inspect) }
end
elsif sliderwin2.changed?(defcurvebutton)
for point in points

27
Data/Scripts/020_Debug/002_Editor_DataTypes.rb
View File

@@ -993,8 +993,7 @@ module MovePoolProperty
havemove = e[2] if e[0] == newlevel && e[1] == entry[1]
end
if havemove >= 0 # Move already known at new level; delete this move
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
oldsel = havemove
else # Apply the new level
entry[0] = newlevel
@@ -1010,8 +1009,7 @@ module MovePoolProperty
havemove = e[2] if e[0] == entry[0] && e[1] == newmove
end
if havemove >= 0 # New move already known at level; delete this move
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
cmd[1] = [cmd[1], realcmds.length - 1].min
oldsel = havemove
else # Apply the new move
@@ -1022,8 +1020,7 @@ module MovePoolProperty
refreshlist = true
end
when 2 # Delete
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
cmd[1] = [cmd[1], realcmds.length - 1].min
refreshlist = true
end
@@ -1111,8 +1108,7 @@ module EggMovesProperty
newmove = pbChooseMoveList(entry[0])
if newmove
if realcmds.any? { |e| e[0] == newmove } # Already have move; delete this one
realcmds[cmd] = nil
realcmds.compact!
realcmds.delete_at(cmd)
cmd = [cmd, realcmds.length - 1].min
else # Change move
realcmds[cmd] = [newmove, GameData::Move.get(newmove).name, 0]
@@ -1121,8 +1117,7 @@ module EggMovesProperty
refreshlist = true
end
when 1 # Delete
realcmds[cmd] = nil
realcmds.compact!
realcmds.delete_at(cmd)
cmd = [cmd, realcmds.length - 1].min
refreshlist = true
end
@@ -1293,8 +1288,7 @@ class EvolutionsProperty
realcmds[i][2]==entry[2]
end
if existing_evo >= 0
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
oldsel = existing_evo
else
entry[0] = newspecies
@@ -1315,8 +1309,7 @@ class EvolutionsProperty
realcmds[i][2]==entry[2]
end
if existing_evo >= 0
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
oldsel = existing_evo
elsif newmethod != entry[1]
entry[1] = newmethod
@@ -1338,8 +1331,7 @@ class EvolutionsProperty
realcmds[i][2]==newparam
end
if existing_evo >= 0
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
oldsel = existing_evo
else
entry[2] = newparam
@@ -1349,8 +1341,7 @@ class EvolutionsProperty
end
end
when 3 # Delete
realcmds[cmd[1]] = nil
realcmds.compact!
realcmds.delete_at(cmd[1])
cmd[1] = [cmd[1],realcmds.length-1].min
refreshlist = true
end

6
Data/Scripts/020_Debug/003_Debug menus/002_Debug_MenuCommands.rb
View File

@@ -264,8 +264,7 @@ DebugMenuCommands.register("testwildbattleadvanced", {
scr.pbPokemonDebug(pkmn[pkmnCmd], -1, nil, true)
scr.pbEndScreen
elsif pbConfirmMessage(_INTL("Delete this Pokémon?"))
pkmn[pkmnCmd] = nil
pkmn.compact!
pkmn.delete_at(pkmnCmd)
end
end
end
@@ -366,8 +365,7 @@ DebugMenuCommands.register("testtrainerbattleadvanced", {
trainers[trainerCmd] = [0, tr]
end
elsif pbConfirmMessage(_INTL("Delete this trainer?"))
trainers[trainerCmd] = nil
trainers.compact!
trainers.delete_at(trainerCmd)
end
end
end

3
Data/Scripts/020_Debug/003_Debug menus/005_Debug_PokemonCommands.rb
View File

@@ -1167,8 +1167,7 @@ PokemonDebugMenuCommands.register("delete", {
"effect" => proc { |pkmn, pkmnid, heldpoke, settingUpBattle, screen|
if screen.pbConfirm(_INTL("Are you sure you want to delete this Pokémon?"))
if screen.is_a?(PokemonPartyScreen)
screen.party[pkmnid] = nil
screen.party.compact!
screen.party.delete_at(pkmnid)
screen.pbHardRefresh
elsif screen.is_a?(PokemonStorageScreen)
screen.scene.pbRelease(pkmnid, heldpoke)