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

Merge remote-tracking branch 'upstream/master' into handlerhash-block

Browse Source
This commit is contained in:
jonisavo
2020-09-05 20:56:27 +03:00
parent 42e4923c86 dffb5de19d
commit 3654575efe
10 changed files with 507 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Data/Scripts/005_Map renderer/001_Tilemap_XP.rb
View File

@@ -1,5 +1,5 @@
#===============================================================================
#
#
#===============================================================================
class CustomTilemapAutotiles
attr_accessor :changed
@@ -28,7 +28,7 @@ end
#===============================================================================
#
#
#===============================================================================
class CustomTilemap
attr_reader :tileset
@@ -62,7 +62,7 @@ class CustomTilemap
]
Animated_Autotiles_Frames = 5*Graphics.frame_rate/20 # Frequency of updating animated autotiles
FlashOpacity = [100,90,80,70,80,90]
def initialize(viewport)
@tileset = nil # Refers to Map Tileset Name
@autotiles = CustomTilemapAutotiles.new
@@ -567,7 +567,7 @@ class CustomTilemap
@fullyrefreshedautos = true
end
else
@fullyrefreshedautos = true
@fullyrefreshedautos = true
end
end
@@ -823,7 +823,7 @@ class CustomTilemap
@layer0.visible = false if usesprites
end
if @fullyrefreshed
if !@priotilesrect || !@priotilesfast ||
if !@priotilesrect || !@priotilesfast ||
@priotilesrect[0]!=minX ||
@priotilesrect[1]!=minY ||
@priotilesrect[2]!=maxX ||
@@ -843,7 +843,7 @@ class CustomTilemap
count = addTile(@tiles,count,xpos,ypos,prio[3])
end
else
if !@priotilesrect || !@priotilesfast ||
if !@priotilesrect || !@priotilesfast ||
@priotilesrect[0]!=minX ||
@priotilesrect[1]!=minY ||
@priotilesrect[2]!=maxX ||
@@ -944,4 +944,4 @@ class CustomTilemap
@autotiles.changed = false
@tilesetChanged = false
end
end
end

6
Data/Scripts/011_Battle/001_Battler/007_Battler_UseMove.rb
View File

@@ -65,7 +65,7 @@ class PokeBattle_Battler
end
#=============================================================================
#
#
#=============================================================================
def pbBeginTurn(choice)
# Cancel some lingering effects which only apply until the user next moves
@@ -255,7 +255,7 @@ class PokeBattle_Battler
end
@battle.lastMoveUsed = move.id # For Copycat
@battle.lastMoveUser = @index # For "self KO" battle clause to avoid draws
@battle.successStates[@index].useState = 1 # Battle Arena - assume failure
@battle.successStates[@index].useState = 1 # Battle Arena - assume failure
# Find the default user (self or Snatcher) and target(s)
user = pbFindUser(choice,move)
user = pbChangeUser(choice,move,user)
@@ -360,7 +360,7 @@ class PokeBattle_Battler
end
# Protean
if user.hasActiveAbility?(:PROTEAN) && !move.callsAnotherMove? && !move.snatched
if user.pbHasOtherType?(moveType) && !PBTypes.isPseudoType?(move.calcType)
if user.pbHasOtherType?(move.calcType) && !PBTypes.isPseudoType?(move.calcType)
@battle.pbShowAbilitySplash(user)
user.pbChangeTypes(move.calcType)
typeName = PBTypes.getName(move.calcType)

4
Data/Scripts/011_Battle/002_Move/003_Move_Usage_Calculations.rb
View File

@@ -255,7 +255,7 @@ class PokeBattle_Move
target.damageState.calcDamage = damage
end
def pbCalcDamageMultipliers(user,target,numTargets,baseDmg,type,multipliers)
def pbCalcDamageMultipliers(user,target,numTargets,type,baseDmg,multipliers)
# Global abilities
if (@battle.pbCheckGlobalAbility(:DARKAURA) && isConst?(type,PBTypes,:DARK)) ||
(@battle.pbCheckGlobalAbility(:FAIRYAURA) && isConst?(type,PBTypes,:FAIRY))
@@ -488,4 +488,4 @@ class PokeBattle_Move
user.pbOwnSide.effects[PBEffects::Rainbow]>0
return ret
end
end
end

20
Data/Scripts/011_Battle/002_Move/005_Move_Effects_000-07F.rb
View File

@@ -394,11 +394,11 @@ class PokeBattle_Move_018 < PokeBattle_Move
user.pbCureStatus(false)
case t
when PBStatuses::BURN
@battle.pbDisplay(_INTL("{1} healed its burn!",user.pbThis))
@battle.pbDisplay(_INTL("{1} healed its burn!",user.pbThis))
when PBStatuses::POISON
@battle.pbDisplay(_INTL("{1} cured its poisoning!",user.pbThis))
@battle.pbDisplay(_INTL("{1} cured its poisoning!",user.pbThis))
when PBStatuses::PARALYSIS
@battle.pbDisplay(_INTL("{1} cured its paralysis!",user.pbThis))
@battle.pbDisplay(_INTL("{1} cured its paralysis!",user.pbThis))
end
end
end
@@ -1422,7 +1422,7 @@ class PokeBattle_Move_04E < PokeBattle_TargetStatDownMove
super
@statDown = [PBStats::SPATK,2]
end
def pbFailsAgainstTarget?(user,target)
return true if super
return false if damagingMove?
@@ -1442,7 +1442,7 @@ class PokeBattle_Move_04E < PokeBattle_TargetStatDownMove
end
return false
end
def pbAdditionalEffect(user,target)
return if user.gender==2 || target.gender==2 || user.gender==target.gender
return if target.hasActiveAbility?(:OBLIVIOUS) && !@battle.moldBreaker
@@ -1926,7 +1926,7 @@ class PokeBattle_Move_060 < PokeBattle_Move
def pbEffectGeneral(user)
user.pbChangeTypes(@newType)
typeName = PBTypes.getName(@newType)
@battle.pbDisplay(_INTL("{1} transformed into the {2} type!",user.pbThis,typeName))
@battle.pbDisplay(_INTL("{1} transformed into the {2} type!",user.pbThis,typeName))
end
end
@@ -2001,7 +2001,7 @@ class PokeBattle_Move_063 < PokeBattle_Move
@abilityBlacklist = [
:TRUANT,
# This ability
:SIMPLEBEAM,
:SIMPLE,
# Form-changing abilities
:BATTLEBOND,
:DISGUISE,
@@ -2430,7 +2430,7 @@ class PokeBattle_Move_068 < PokeBattle_Move
def pbEffectAgainstTarget(user,target)
target.effects[PBEffects::GastroAcid] = true
target.effects[PBEffects::Truant] = false
@battle.pbDisplay(_INTL("{1}'s Ability was suppressed!",target.pbThis))
@battle.pbDisplay(_INTL("{1}'s Ability was suppressed!",target.pbThis))
target.pbOnAbilityChanged(target.ability)
end
end
@@ -2570,7 +2570,7 @@ class PokeBattle_Move_070 < PokeBattle_FixedDamageMove
@battle.pbHideAbilitySplash(target)
return true
end
if NEWEST_BATTLE_MECHANICS &&
if NEWEST_BATTLE_MECHANICS &&
isConst?(target.damageState.typeMod,PBTypes,:ICE) && target.pbHasType?(:ICE)
@battle.pbDisplay(_INTL("But it failed!"))
return true
@@ -2921,4 +2921,4 @@ class PokeBattle_Move_07F < PokeBattle_Move
end
return baseDmg
end
end
end

6
Data/Scripts/011_Battle/007_BattleHandlers_Abilities.rb
View File

@@ -656,7 +656,7 @@ BattleHandlers::MoveImmunityTargetAbility.add(:SOUNDPROOF,
end
battle.pbHideAbilitySplash(target)
next true
}
)
@@ -2239,7 +2239,7 @@ BattleHandlers::AbilityOnSwitchIn.add(:FOREWARN,
# Counter, Mirror Coat, Metal Burst
power = 120 if ["071","072","073"].include?(moveData[MOVE_FUNCTION_CODE])
# Sonic Boom, Dragon Rage, Night Shade, Endeavor, Psywave,
# Return, Frustration, Crush Grip, Gyro Ball, Hidden Power,
# Return, Frustration, Crush Grip, Gyro Ball, Hidden Power,
# Natural Gift, Trump Card, Flail, Grass Knot
power = 80 if ["06A","06B","06D","06E","06F",
"089","08A","08C","08D","090",
@@ -2504,4 +2504,4 @@ BattleHandlers::RunFromBattleAbility.add(:RUNAWAY,
proc { |ability,battler|
next true
}
)
)

15
Data/Scripts/016_UI/013_PScreen_Load.rb
View File

@@ -1,6 +1,6 @@
class PokemonLoadPanel < SpriteWrapper
attr_reader :selected
TEXTCOLOR = Color.new(232,232,232)
TEXTSHADOWCOLOR = Color.new(136,136,136)
MALETEXTCOLOR = Color.new(56,160,248)
@@ -19,7 +19,7 @@ class PokemonLoadPanel < SpriteWrapper
@selected = (index==0)
@bgbitmap = AnimatedBitmap.new("Graphics/Pictures/loadPanels")
@refreshBitmap = true
@refreshing = false
@refreshing = false
refresh
end
@@ -356,6 +356,7 @@ class PokemonLoadScreen
metadata = Marshal.load(f)
$PokemonBag = Marshal.load(f)
$PokemonStorage = Marshal.load(f)
$SaveVersion = Marshal.load(f) unless f.eof?
pbRefreshResizeFactor # To fix Game_Screen pictures
magicNumberMatches = false
if $data_system.respond_to?("magic_number")
@@ -456,12 +457,12 @@ class PokemonLoadScreen
savedata = []
if safeExists?(savefile)
File.open(savefile,"rb") { |f|
15.times { savedata.push(Marshal.load(f)) }
16.times { savedata.push(Marshal.load(f)) }
}
savedata[3]=$PokemonSystem
begin
File.open(RTP.getSaveFileName("Game.rxdata"),"wb") { |f|
15.times { |i| Marshal.dump(savedata[i],f) }
16.times { |i| Marshal.dump(savedata[i],f) }
}
rescue
end
@@ -495,7 +496,7 @@ module FontInstaller
'pkmnrs.ttf',
'pkmndp.ttf',
'pkmnfl.ttf'
]
]
# names (not filenames) of fonts to be installed
Names = [
'Power Green',
@@ -520,7 +521,7 @@ module FontInstaller
return ENV['windir'] + '\\Fonts\\'
else
return '\\Windows\\Fonts\\'
end
end
end
AFR = Win32API.new('gdi32', 'AddFontResource', ['P'], 'L')
@@ -628,4 +629,4 @@ module FontInstaller
pbMessage(_INTL("To install the necessary fonts, copy the files in this game's Fonts folder to the Fonts folder in Control Panel."))
end
end
end
end

3
Data/Scripts/016_UI/014_PScreen_Save.rb
View File

@@ -24,6 +24,7 @@ def pbSave(safesave=false)
Marshal.dump($PokemonMap,f)
Marshal.dump($PokemonBag,f)
Marshal.dump($PokemonStorage,f)
Marshal.dump(ESSENTIALS_VERSION,f)
}
Graphics.frame_reset
rescue
@@ -153,4 +154,4 @@ def pbSaveScreen
screen = PokemonSaveScreen.new(scene)
ret = screen.pbSaveScreen
return ret
end
end