2006-Scape/apollo
1
0
Fork 0
mirror of https://github.com/2006-Scape/apollo.git synced 2026-07-05 00:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add more documentation and fix rubocop warnings

Browse Source
This commit is contained in:
Gary Tierney
2016-01-29 22:42:03 +00:00
parent a7b4036deb
commit 8e0b84a470
17 changed files with 77 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/plugins/combat/combat_action.rb
+5 -6
View File
@@ -4,22 +4,21 @@ java_import 'org.apollo.game.model.entity.EntityType'
class CombatAction < Action
def initialize(source, once = false)
super(0, true, source)
mob.attacking = true
@combat_state = source.get_combat_state
@attack_timer = 100
@once = once
mob.attacking = true
end
def can_attack?
next_attack = @combat_state.next_attack true
target = @combat_state.target
current_distance = mob.position.get_distance target.position
attack_collision_type = next_attack.range > 1 ? EntityType::PROJECTILE : EntityType::NPC
in_range = current_distance <= next_attack.range# && !$world.intersects(mob.position, target.position, attack_collision_type)
in_range = current_distance <= next_attack.range
in_range = in_range && !$world.intersects(mob.position, target.position,
next_attack.range > 1 ? EntityType::PROJECTILE : EntityType::NPC)
unless in_range
mob.follow @combat_state.target, next_attack.range