DocRock3r/infinitefusion-e18
1
0
Fork 0
mirror of https://github.com/infinitefusion/infinitefusion-e18.git synced 2025-12-09 14:14:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed dual functionalities of Ability and Ball properties in trainers.txt, abolished $BallTypes, removed support for tm.txt

Browse Source
This commit is contained in:
Maruno17
2021-06-15 22:03:16 +01:00
parent 9226bce078
commit 5df5e83f68
10 changed files with 13 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Data/Scripts/011_Battle/005_BallHandlers_PokeBallEffects.rb
View File

@@ -1,50 +1,3 @@
$BallTypes = {
0 => :POKEBALL,
1 => :GREATBALL,
2 => :SAFARIBALL,
3 => :ULTRABALL,
4 => :MASTERBALL,
5 => :NETBALL,
6 => :DIVEBALL,
7 => :NESTBALL,
8 => :REPEATBALL,
9 => :TIMERBALL,
10 => :LUXURYBALL,
11 => :PREMIERBALL,
12 => :DUSKBALL,
13 => :HEALBALL,
14 => :QUICKBALL,
15 => :CHERISHBALL,
16 => :FASTBALL,
17 => :LEVELBALL,
18 => :LUREBALL,
19 => :HEAVYBALL,
20 => :LOVEBALL,
21 => :FRIENDBALL,
22 => :MOONBALL,
23 => :SPORTBALL,
24 => :DREAMBALL,
25 => :BEASTBALL
}
def pbBallTypeToItem(ball_type)
ret = GameData::Item.try_get($BallTypes[ball_type])
return ret if ret
ret = GameData::Item.try_get($BallTypes[0])
return ret if ret
return GameData::Item.get(:POKEBALL)
end
def pbGetBallType(ball)
ball = GameData::Item.try_get(ball)
$BallTypes.keys.each do |key|
return key if ball == $BallTypes[key]
end
return 0
end
#===============================================================================
#
#===============================================================================

9
Data/Scripts/011_Battle/005_Battle scene/001_PokeBattle_Animation.rb
View File

@@ -86,9 +86,6 @@ module PokeBattle_BallAnimationMixin
def addBallSprite(ballX, ballY, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball)
if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball).id_number)
end
ball = addNewSprite(ballX, ballY, file_path, PictureOrigin::Center)
@ballSprite = @pictureSprites.last
if @ballSprite.bitmap.width >= @ballSprite.bitmap.height
@@ -206,9 +203,6 @@ module PokeBattle_BallAnimationMixin
def ballSetOpen(ball, delay, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s_open", poke_ball)
if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d_open", pbGetBallType(poke_ball).id_number)
end
ball.setName(delay, file_path)
if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height
ball.setSrcSize(delay, @ballSprite.bitmap.height / 2, @ballSprite.bitmap.height)
@@ -217,9 +211,6 @@ module PokeBattle_BallAnimationMixin
def ballSetClosed(ball, delay, poke_ball)
file_path = sprintf("Graphics/Battle animations/ball_%s", poke_ball)
if !pbResolveBitmap(file_path)
file_path = sprintf("Graphics/Battle animations/ball_%02d", pbGetBallType(poke_ball).id_number)
end
ball.setName(delay, file_path)
if @ballSprite && @ballSprite.bitmap.width >= @ballSprite.bitmap.height
ball.setSrcSize(delay, @ballSprite.bitmap.height / 2, @ballSprite.bitmap.height)