mirror of
https://github.com/2006-Scape/apollo.git
synced 2026-07-03 16:49:11 +00:00
Add ranged combat support
* Clean up the CombatAction and Attack code to make it easier to use for range. * Add collision detection to the distance checks before attacking in the CombatAction. * Create a Ruby DSL for defining projectile types and fix the ProjectileUpdateOperation so it uses the correct position offset. * Fix the packet structure of the HintIconMessageEncoder.
This commit is contained in:
Gary Tierney
+150
-42
@@ -3,9 +3,13 @@ java_import 'org.apollo.game.model.Animation'
|
||||
java_import 'org.apollo.game.model.Graphic'
|
||||
|
||||
class BaseAttack
|
||||
attr_reader :requirements, :range
|
||||
attr_reader :requirements, :range, :speed
|
||||
|
||||
def initialize(animation, graphic = nil, range = 1, requirements = [])
|
||||
def initialize(speed:, animation:, graphic: nil, range: 1, requirements: [])
|
||||
fail 'Attack speed must be a non-negative number' if speed < 0
|
||||
fail 'Attack range must be a non-negative number' if range < 0
|
||||
|
||||
@speed = speed
|
||||
@animation = animation
|
||||
@graphic = graphic
|
||||
@range = range
|
||||
@@ -17,7 +21,7 @@ class BaseAttack
|
||||
|
||||
unless @graphic.nil?
|
||||
if @graphic.is_a?(Hash)
|
||||
source.play_graphic(Graphic.new(@graphic[:id], @graphic[:delay] || 0, @graphic[:height] | 0))
|
||||
source.play_graphic(Graphic.new(@graphic[:id], @graphic[:delay] || 0, @graphic[:height] || 0))
|
||||
else
|
||||
source.play_graphic(Graphic.new(@graphic))
|
||||
end
|
||||
@@ -26,63 +30,167 @@ class BaseAttack
|
||||
apply(source, target)
|
||||
end
|
||||
|
||||
def apply(source, target)
|
||||
raise "BaseAttack#apply unimplemented"
|
||||
end
|
||||
|
||||
def damage!(source, target, amount, delay = 0)
|
||||
schedule delay do |task|
|
||||
task.stop && return if source.dead or target.dead
|
||||
|
||||
target_combat_state = get_combat_state target
|
||||
target_hitpoints = target.skill_set.get_skill(Skill::HITPOINTS).get_current_level
|
||||
amount = target_hitpoints if target_hitpoints < amount
|
||||
|
||||
type = amount > 0 ? 1 : 0
|
||||
target.play_animation(Animation.new(424)) unless target_combat_state.state == :attacking
|
||||
target.damage(amount, type, false)
|
||||
|
||||
task.stop
|
||||
end
|
||||
def apply(_source, _target)
|
||||
fail 'BaseAttack#apply unimplemented'
|
||||
end
|
||||
end
|
||||
|
||||
class ProcAttack < BaseAttack
|
||||
def initialize(block, animation:, graphic:, range: 1, requirements: [])
|
||||
super(animation, graphic, range, requirements)
|
||||
def initialize(block, hash)
|
||||
super(hash)
|
||||
|
||||
@block = block
|
||||
end
|
||||
|
||||
def apply(source, target)
|
||||
self.instance_exec(source, target, &@block)
|
||||
instance_exec(source, target, &@block)
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# A simple ranged attack, which sends a projectile based on the currently equipped ammo and weapon
|
||||
# and deals damaged delayed by the speed and travel distance of the projectile.
|
||||
|
||||
class RangedAttack < BaseAttack
|
||||
def initialize(animation:, graphic:, requirements: [])
|
||||
|
||||
end
|
||||
|
||||
def calculate_delay(source, target)
|
||||
|
||||
end
|
||||
|
||||
def apply(source, target)
|
||||
|
||||
end
|
||||
|
||||
def projectile!(source, target, projectile_id)
|
||||
|
||||
do_ranged_damage! source, target
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# A basic melee attack, which deals damage a tick after the attack was made.
|
||||
|
||||
class Attack < BaseAttack
|
||||
def initialize(animation:, graphic: nil, range: 1, requirements: [])
|
||||
super(animation, graphic, range, requirements)
|
||||
end
|
||||
|
||||
def apply(source, target)
|
||||
damage! source, target, CombatUtil::calculate_hit(source, target)
|
||||
do_damage! source, target, CombatUtil.calculate_hit(source, target)
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# A DSL-like builder object for creating a new Attack, used mainly (exclusively?) for special attacks.
|
||||
|
||||
class AttackDSL
|
||||
attr_accessor :animation, :speed, :range, :graphic
|
||||
|
||||
def initialize()
|
||||
@requirements = []
|
||||
@subattacks = []
|
||||
end
|
||||
|
||||
def add_requirement(requirement)
|
||||
@requirements.push requirement
|
||||
end
|
||||
|
||||
##
|
||||
# Deal ranged damage.
|
||||
|
||||
def range_damage!(hash)
|
||||
@subattacks.push lambda { |source, target|
|
||||
do_ranged_damage! source, target, hash
|
||||
}
|
||||
end
|
||||
|
||||
##
|
||||
# Deal melee damage.
|
||||
|
||||
def damage!(damage_modifier: 1, delay: 0)
|
||||
@subattacks.push lambda { |source, target|
|
||||
do_damage! source, target, 1, delay
|
||||
}
|
||||
end
|
||||
|
||||
##
|
||||
# Process the attack instructions in this DSL then build and return an {@link Attack} object.
|
||||
|
||||
def to_attack
|
||||
subattacks = @subattacks
|
||||
|
||||
attack = lambda do |source, target|
|
||||
subattacks.each do |subattack|
|
||||
subattack[source, target]
|
||||
end
|
||||
end
|
||||
|
||||
# TODO: clean up? Decide where keyword arguments are appropriate and where not
|
||||
ProcAttack.new(attack, speed: speed, animation: animation, graphic: graphic, range: range, requirements: @requirements)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
##
|
||||
# TODO: refactor
|
||||
def do_damage!(source, target, amount, delay = 0, secondary = false, &_block)
|
||||
schedule delay do |task|
|
||||
task.stop && return if source.dead || target.dead
|
||||
|
||||
target_combat_state = get_combat_state target
|
||||
target_hitpoints = target.skill_set.get_skill(Skill::HITPOINTS).get_current_level
|
||||
amount = target_hitpoints if target_hitpoints < amount
|
||||
|
||||
type = amount > 0 ? 1 : 0
|
||||
target.play_animation(Animation.new(424)) unless target_combat_state.will_attack?
|
||||
target.damage(amount, type, secondary)
|
||||
|
||||
if target.auto_retaliate && !target_combat_state.is_attacking?
|
||||
target_combat_state.target = source
|
||||
target.start_action CombatAction.new(target)
|
||||
end
|
||||
|
||||
task.stop
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# TODO: refactor
|
||||
|
||||
def do_ranged_damage!(source, target, _damage_modifier = 1, speed_modifier = 1, projectile = nil, projectile_type = nil, projectile_graphic = nil,
|
||||
delay = 0, secondary = false)
|
||||
apply = lambda do
|
||||
distance = source.position.get_distance(target.position)
|
||||
|
||||
ammo = EquipmentUtil.equipped_ammo source
|
||||
|
||||
if projectile.nil? && projectile_type.nil?
|
||||
projectile = ammo.projectile
|
||||
projectile_type = ammo.projectile_type
|
||||
projectile_graphic = ammo.graphic
|
||||
end
|
||||
|
||||
projectile! source, target, projectile, projectile_type, speed_modifier
|
||||
do_damage! source, target, rand(1...50), (projectile_type.delay + projectile_type.speed + distance * 5) * 0.02857, secondary
|
||||
|
||||
unless projectile_graphic.nil?
|
||||
source.play_graphic Graphic.new(projectile_graphic, 0, 100)
|
||||
end
|
||||
end
|
||||
|
||||
if delay == 0
|
||||
apply.call
|
||||
else
|
||||
# account for the one tick delay in the scheduler
|
||||
schedule(delay - 1) do |task|
|
||||
apply.call
|
||||
task.stop
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
##
|
||||
# TODO: refactor
|
||||
|
||||
def projectile!(source, target, projectile_id, projectile_type, speed_modifier = 1)
|
||||
distance = source.position.get_distance(target.position)
|
||||
|
||||
projectile_parameters = {
|
||||
angle: -1,
|
||||
start_height: projectile_type.start_height,
|
||||
end_height: projectile_type.end_height,
|
||||
delay: projectile_type.delay * (2 - speed_modifier),
|
||||
speed: (projectile_type.delay + projectile_type.speed + distance * 5) * speed_modifier,
|
||||
slope: projectile_type.slope,
|
||||
radius: projectile_type.radius
|
||||
}
|
||||
|
||||
ProjectileModule.fire_projectile(source.position, target.position, projectile_id, projectile_parameters, target)
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user