mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-26 10:03:45 +00:00
Merge pull request #7077 from Mechoid/KururakTweaks
Kururaks now (theoretically) are not as agonizing to fight.
This commit is contained in:
@@ -42,7 +42,7 @@
|
||||
movement_cooldown = 1
|
||||
|
||||
melee_damage_lower = 15
|
||||
melee_damage_upper = 25
|
||||
melee_damage_upper = 20
|
||||
attack_armor_pen = 40
|
||||
base_attack_cooldown = 2 SECONDS
|
||||
attacktext = list("gouged", "bit", "cut", "clawed", "whipped")
|
||||
@@ -72,7 +72,7 @@
|
||||
|
||||
special_attack_min_range = 0
|
||||
special_attack_max_range = 4
|
||||
special_attack_cooldown = 30 SECONDS
|
||||
special_attack_cooldown = 1 MINUTE
|
||||
|
||||
// Players have 2 seperate cooldowns for these, while the AI must choose one. Both respect special_attack_cooldown
|
||||
var/last_strike_time = 0
|
||||
@@ -108,11 +108,11 @@
|
||||
var/mob/living/carbon/human/H = L
|
||||
if(H.get_active_hand())
|
||||
var/obj/item/I = H.get_active_hand()
|
||||
if(I.force >= 1.20 * melee_damage_upper)
|
||||
if(I.force <= 1.25 * melee_damage_upper)
|
||||
return TRUE
|
||||
else if(istype(L, /mob/living/simple_mob))
|
||||
var/mob/living/simple_mob/S = L
|
||||
if(S.melee_damage_upper > 1.20 * melee_damage_upper)
|
||||
if(S.melee_damage_upper > 1.5 * melee_damage_upper)
|
||||
return TRUE
|
||||
|
||||
/mob/living/simple_mob/animal/sif/kururak/handle_special()
|
||||
@@ -188,11 +188,8 @@
|
||||
flash_strength *= H.species.flash_mod
|
||||
if(flash_strength > 0)
|
||||
to_chat(H, span("alien","You are disoriented by \the [src]!"))
|
||||
H.Confuse(flash_strength + 5)
|
||||
H.Blind(flash_strength)
|
||||
H.eye_blurry = max(H.eye_blurry, flash_strength + 5)
|
||||
H.flash_eyes()
|
||||
H.adjustHalLoss(flash_strength / 5)
|
||||
H.apply_damage(flash_strength * H.species.flash_burn/5, BURN, BP_HEAD, 0, 0, "Photon burns")
|
||||
|
||||
else if(issilicon(L))
|
||||
@@ -282,9 +279,11 @@
|
||||
visible_message(span("danger","\The [src] rakes its claws against \the [A]."))
|
||||
var/obj/mecha/M = A
|
||||
M.take_damage(damage_to_apply)
|
||||
if(prob(3) && do_after(src, 5))
|
||||
visible_message(span("critical","\The [src]'s strike ripped \the [M]'s access hatch open, allowing it to drag [M.occupant] out!"))
|
||||
M.go_out()
|
||||
if(prob(3))
|
||||
visible_message(span("critical","\The [src] begins digging its claws into \the [M]'s hatch!"))
|
||||
if(do_after(src, 1 SECOND))
|
||||
visible_message(span("critical","\The [src] rips \the [M]'s access hatch open, dragging [M.occupant] out!"))
|
||||
M.go_out()
|
||||
|
||||
else
|
||||
A.attack_generic(src, damage_to_apply, "rakes its claws against") // Well it's not a mob, and it's not a mech.
|
||||
@@ -393,6 +392,10 @@
|
||||
|
||||
return ..()
|
||||
|
||||
/datum/ai_holder/simple_mob/intentional/kururak/post_special_attack(atom/A)
|
||||
holder.a_intent = I_HURT
|
||||
return ..()
|
||||
|
||||
/datum/ai_holder/simple_mob/intentional/kururak/post_melee_attack()
|
||||
if(holder.has_modifier_of_type(/datum/modifier/ace))
|
||||
request_help()
|
||||
|
||||
Reference in New Issue
Block a user