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

Fixed incorrect AI code for considering Sticky Web when switching

Browse Source
This commit is contained in:
Maruno17
2023-07-22 18:43:28 +01:00
parent fc95baf92c
commit 0068695c54
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Data/Scripts/011_Battle/004_Scene/006_Battle_Scene_Objects.rb
View File

@@ -203,12 +203,12 @@ class Battle::Scene::PokemonDataBox < Sprite
return @anim_exp_timer_start != nil return @anim_exp_timer_start != nil
end end
def pbDrawNumber(number, btmp, startX, startY, align = 0) def pbDrawNumber(number, btmp, startX, startY, align = :left)
# -1 means draw the / character # -1 means draw the / character
n = (number == -1) ? [10] : number.to_i.digits.reverse n = (number == -1) ? [10] : number.to_i.digits.reverse
charWidth = @numbersBitmap.width / 11 charWidth = @numbersBitmap.width / 11
charHeight = @numbersBitmap.height charHeight = @numbersBitmap.height
startX -= charWidth * n.length if align == 1 startX -= charWidth * n.length if align == :right
n.each do |i| n.each do |i|
btmp.blt(startX, startY, @numbersBitmap.bitmap, Rect.new(i * charWidth, 0, charWidth, charHeight)) btmp.blt(startX, startY, @numbersBitmap.bitmap, Rect.new(i * charWidth, 0, charWidth, charHeight))
startX += charWidth startX += charWidth
@@ -303,7 +303,7 @@ class Battle::Scene::PokemonDataBox < Sprite
return if !@battler.pokemon return if !@battler.pokemon
# Show HP numbers # Show HP numbers
if @show_hp_numbers if @show_hp_numbers
pbDrawNumber(self.hp, @hpNumbers.bitmap, 54, 2, 1) pbDrawNumber(self.hp, @hpNumbers.bitmap, 54, 2, :right)
pbDrawNumber(-1, @hpNumbers.bitmap, 54, 2) # / char pbDrawNumber(-1, @hpNumbers.bitmap, 54, 2) # / char
pbDrawNumber(@battler.totalhp, @hpNumbers.bitmap, 70, 2) pbDrawNumber(@battler.totalhp, @hpNumbers.bitmap, 70, 2)
end end

2
Data/Scripts/011_Battle/005_AI/002_AI_Switch.rb
View File

@@ -118,7 +118,7 @@ class Battle::AI
score -= 20 if pokemon_can_be_poisoned?(pkmn) score -= 20 if pokemon_can_be_poisoned?(pkmn)
end end
# Sticky Web # Sticky Web
if @user.pbOwnSide.effects[PBEffects::ToxicSpikes] if @user.pbOwnSide.effects[PBEffects::StickyWeb]
score -= 15 score -= 15
end end
end end