mirror of
https://github.com/infinitefusion/infinitefusion-e18.git
synced 2025-12-08 13:44:59 +00:00
mt silver (wip)
This commit is contained in:
@@ -74,7 +74,6 @@ qt314xxx (Discord)
|
|||||||
### Graphics #
|
### Graphics #
|
||||||
###########################################################
|
###########################################################
|
||||||
Title screen background and logo by Doctor Miawoo
|
Title screen background and logo by Doctor Miawoo
|
||||||
|
|
||||||
Gen 4 Legendary trio eggs by calicorn
|
Gen 4 Legendary trio eggs by calicorn
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
@@ -106,10 +105,12 @@ with their respective authors' consent
|
|||||||
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
|
SailorVicious (Prof. Elm OW sprite) https://www.deviantart.com/sailorvicious
|
||||||
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
|
OceansLugiaSpirit (Koga OW sprite) http://oceanslugiaspirit.deviantart.com/
|
||||||
Knuckles (Kurt OW sprite)
|
Knuckles (Kurt OW sprite)
|
||||||
|
UnworthyPie (Bruno and Agatha OW sprites)
|
||||||
Battle sprites:
|
Battle sprites:
|
||||||
luckygirl88 (Misty VS sprite) http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
|
luckygirl88 (Misty VS sprite) http://luckygirl88.deviantart.com/art/Pokemon-BW-Misty-Sprite-Sheet-268364830
|
||||||
Lorelei VS sprite by Nalty http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
|
Lorelei VS sprite by Nalty http://nalty.deviantart.com/art/Lorelei-VS-Sprite-177184960
|
||||||
Kiwi (Kurt battle sprite)
|
Kiwi (Kurt battle sprite)
|
||||||
|
UnworthyPie (Bruno battle sprite, Lance backsprite)
|
||||||
### Tileset graphics ###
|
### Tileset graphics ###
|
||||||
Jorginho (OutsideEmerald)
|
Jorginho (OutsideEmerald)
|
||||||
ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
|
ThatsSoWitty (Cave) http://thatssowitty.deviantart.com/art/The-Public-Pokemon-Tileset-281342410
|
||||||
|
|||||||
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.
@@ -158,7 +158,7 @@ class PokeBattle_Battle
|
|||||||
if showMessages
|
if showMessages
|
||||||
if isOutsider
|
if isOutsider
|
||||||
pbDisplayPaused(_INTL("{1} got a boosted {2} Exp. Points!",pkmn.name,expGained))
|
pbDisplayPaused(_INTL("{1} got a boosted {2} Exp. Points!",pkmn.name,expGained))
|
||||||
elsepbGenerateEgg
|
else
|
||||||
pbDisplayPaused(_INTL("{1} got {2} Exp. Points!",pkmn.name,expGained))
|
pbDisplayPaused(_INTL("{1} got {2} Exp. Points!",pkmn.name,expGained))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -500,6 +500,7 @@ class PokemonBattlerSprite < RPG::Sprite
|
|||||||
@spriteYExtra = 0 # Offset due to "bobbing" animation
|
@spriteYExtra = 0 # Offset due to "bobbing" animation
|
||||||
@_iconBitmap = nil
|
@_iconBitmap = nil
|
||||||
self.visible = false
|
self.visible = false
|
||||||
|
@back=false
|
||||||
end
|
end
|
||||||
|
|
||||||
def dispose
|
def dispose
|
||||||
@@ -514,11 +515,13 @@ class PokemonBattlerSprite < RPG::Sprite
|
|||||||
|
|
||||||
def x=(value)
|
def x=(value)
|
||||||
@spriteX = value
|
@spriteX = value
|
||||||
|
self.mirror=true if @back
|
||||||
super(value+@spriteXExtra)
|
super(value+@spriteXExtra)
|
||||||
end
|
end
|
||||||
|
|
||||||
def y=(value)
|
def y=(value)
|
||||||
@spriteY = value
|
@spriteY = value
|
||||||
|
self.mirror=true if @back
|
||||||
super(value+@spriteYExtra)
|
super(value+@spriteYExtra)
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -533,6 +536,7 @@ class PokemonBattlerSprite < RPG::Sprite
|
|||||||
# Set sprite's origin to bottom middle
|
# Set sprite's origin to bottom middle
|
||||||
def pbSetOrigin
|
def pbSetOrigin
|
||||||
return if !@_iconBitmap
|
return if !@_iconBitmap
|
||||||
|
self.mirror=true if @back
|
||||||
self.ox = @_iconBitmap.width/2
|
self.ox = @_iconBitmap.width/2
|
||||||
self.oy = @_iconBitmap.height
|
self.oy = @_iconBitmap.height
|
||||||
end
|
end
|
||||||
@@ -554,11 +558,12 @@ class PokemonBattlerSprite < RPG::Sprite
|
|||||||
end
|
end
|
||||||
|
|
||||||
def setPokemonBitmap(pkmn,back=false)
|
def setPokemonBitmap(pkmn,back=false)
|
||||||
|
@back = back
|
||||||
|
self.mirror=true if @back
|
||||||
@pkmn = pkmn
|
@pkmn = pkmn
|
||||||
@_iconBitmap.dispose if @_iconBitmap
|
@_iconBitmap.dispose if @_iconBitmap
|
||||||
@_iconBitmap = GameData::Species.sprite_bitmap_from_pokemon(@pkmn, back)
|
@_iconBitmap = GameData::Species.sprite_bitmap_from_pokemon(@pkmn, back)
|
||||||
@_iconBitmap.mirror if back
|
if @back
|
||||||
if back
|
|
||||||
@_iconBitmap.scale_bitmap(Settings::BACKRPSPRITE_SCALE)
|
@_iconBitmap.scale_bitmap(Settings::BACKRPSPRITE_SCALE)
|
||||||
else
|
else
|
||||||
@_iconBitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
|
@_iconBitmap.scale_bitmap(Settings::FRONTSPRITE_SCALE)
|
||||||
|
|||||||
@@ -494,8 +494,11 @@ class PokeBattle_Scene
|
|||||||
def pbAnimationCore(animation,user,target,oppMove=false)
|
def pbAnimationCore(animation,user,target,oppMove=false)
|
||||||
return if !animation
|
return if !animation
|
||||||
@briefMessage = false
|
@briefMessage = false
|
||||||
|
|
||||||
userSprite = (user) ? @sprites["pokemon_#{user.index}"] : nil
|
userSprite = (user) ? @sprites["pokemon_#{user.index}"] : nil
|
||||||
targetSprite = (target) ? @sprites["pokemon_#{target.index}"] : nil
|
targetSprite = (target) ? @sprites["pokemon_#{target.index}"] : nil
|
||||||
|
|
||||||
|
|
||||||
# Remember the original positions of Pokémon sprites
|
# Remember the original positions of Pokémon sprites
|
||||||
oldUserX = (userSprite) ? userSprite.x : 0
|
oldUserX = (userSprite) ? userSprite.x : 0
|
||||||
oldUserY = (userSprite) ? userSprite.y : 0
|
oldUserY = (userSprite) ? userSprite.y : 0
|
||||||
@@ -535,5 +538,12 @@ class PokeBattle_Scene
|
|||||||
targetSprite.y = oldTargetY
|
targetSprite.y = oldTargetY
|
||||||
targetSprite.pbSetOrigin
|
targetSprite.pbSetOrigin
|
||||||
end
|
end
|
||||||
|
# if userSprite != nil
|
||||||
|
# userSprite.mirror=true #if !@battle.opposes?(user.index)
|
||||||
|
# end
|
||||||
|
# if targetSprite != nil
|
||||||
|
# targetSprite.mirror=true# if !@battle.opposes?(target.index)
|
||||||
|
# end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -652,7 +652,7 @@ HiddenMoveHandlers::UseMove.add(:ROCKSMASH, proc { |move, pokemon|
|
|||||||
#===============================================================================
|
#===============================================================================
|
||||||
def pbStrength
|
def pbStrength
|
||||||
if $PokemonMap.strengthUsed
|
if $PokemonMap.strengthUsed
|
||||||
pbMessage(_INTL("Strength made it possible to move boulders around."))
|
#pbMessage(_INTL("Strength made it possible to move boulders around."))
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
move = :STRENGTH
|
move = :STRENGTH
|
||||||
|
|||||||
@@ -14,3 +14,8 @@ BATTLE_FACTORY_TOKENS = 243
|
|||||||
# This is for settings that are used in scripts since it's a chore to change them everywhere to include the module name
|
# This is for settings that are used in scripts since it's a chore to change them everywhere to include the module name
|
||||||
NUM_BADGES=Settings::NB_BADGES
|
NUM_BADGES=Settings::NB_BADGES
|
||||||
EGGINITIALLEVEL=Settings::EGG_LEVEL
|
EGGINITIALLEVEL=Settings::EGG_LEVEL
|
||||||
|
|
||||||
|
|
||||||
|
#this is fucking stupid but apparently necessary
|
||||||
|
FALSE = false
|
||||||
|
TRUE = true
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user