pokemon/gen1recomp
1
0
Fork 0
mirror of https://github.com/bryanthaboi/gen1recomp.git synced 2026-08-17 19:24:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLOSES #1090, CLOSES #1093, CLOSES #1094, CLOSES #1095, CLOSES #1098, CLOSES #1102, CLOSES #1105, CLOSES #1106, CLOSES #1108, CLOSES #1109, CLOSES #1110, CLOSES #1111, CLOSES #1113, CLOSES #1114, CLOSES #1117, CLOSES #1118, CLOSES #1121, CLOSES #1122, CLOSES #1123, CLOSES #1124, CLOSES #1126, CLOSES #1127, CLOSES #1128, CLOSES #1131, CLOSES #1132, CLOSES #1134, CLOSES #1137, CLOSES #1141

Browse Source
This commit is contained in:
bryanthaboi
2026-08-11 21:19:36 -04:00
parent 01aab1d763
commit 0136429d3e
24 changed files with 694 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle/gen2/Battle.lua
+33 -3
View File
@@ -1246,14 +1246,14 @@ function Battle:dealDamage(attacker, defender, damage, opts)
return damage
end
function Battle:heal(mon, amount)
function Battle:heal(mon, amount, opts)
local maxHp = mon.maxHp or (mon.stats and mon.stats.hp) or 1
local before = mon.hp or 0
mon.hp = math.min(maxHp, before + math.max(0, math.floor(amount or 0)))
local healed = mon.hp - before
if healed > 0 then
self:emit({ kind = "heal", side = self:sideOf(mon), amount = healed,
hp = mon.hp })
hp = mon.hp, anim = opts and opts.anim })
end
return healed
end
@@ -2600,6 +2600,35 @@ Battle.MOVE_EFFECTS.EFFECT_FORCE_SWITCH = function(self, attacker, defender,
self.forcedSwitch = true
end
-- BattleCommand_Teleport (engine/battle/move_effects/teleport.asm). Fails
-- outright for BATTLETYPE_FORCESHINY/TRAP, for a trapped user, and in any
-- TRAINER battle; in a WILD battle the level ladder is identical to
-- EFFECT_FORCE_SWITCH's. Without an entry here TELEPORT fell through to
-- the (0-power) damage path and never ended the battle.
Battle.MOVE_EFFECTS.EFFECT_TELEPORT = function(self, attacker, defender)
if self.battleType == Battle.BATTLETYPE_FORCESHINY
or self.battleType == Battle.BATTLETYPE_TRAP
or self:volatile(defender).trapsTarget then
return fail(self)
end
if not self.wild then return fail(self) end
local userLevel = attacker.level or 1
local targetLevel = defender.level or 1
local succeeds = userLevel >= targetLevel
if not succeeds then
local roll = self:rollBelow(math.min(256, userLevel + targetLevel + 1))
succeeds = roll >= math.floor(targetLevel / 4)
end
if not succeeds then return fail(self) end
self.over = true
self.outcome = "fled"
self.forcedSwitch = true
self:emit({ kind = "run", side = self:sideOf(attacker),
text = self:monName(attacker) .. " fled from battle!" })
end
-- -------------------------------------------------------- the move effects
--
-- The three tables above as records, in the shape src/mods/Schemas.lua's
@@ -4442,7 +4471,8 @@ function Battle:tickHeldItem(mon)
end
if effect == "HELD_BERRY" and (mon.hp or 0) * 2 <= maxHp then
self:heal(mon, parameter > 0 and parameter or 10)
-- pokegold engine/battle/core.asm:4074 ItemRecoveryAnim
self:heal(mon, parameter > 0 and parameter or 10, { anim = "RECOVER" })
mon.item = nil
self:emit({ kind = "message",
text = name .. " ate the " .. (def.name or "BERRY") .. "!" })