Skip to content

FIX: Щиты - Логика работы щитов #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: beta-dev
Choose a base branch
from
Draft

FIX: Щиты - Логика работы щитов #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 15 additions & 7 deletions code/game/objects/items/shields.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@
. += span_warning("It's falling apart!")

/obj/item/shield/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK, damage_type = BRUTE)
// [CELADON-ADD] - BALLISTIC_SHIELD - Rebalance - Дизейблеры могли ломать шит, лол
if(damage_type != BRUTE && damage_type != BURN)
return FALSE
// [/CELADON-ADD]
if(transparent && (hitby.pass_flags & PASSGLASS))
return FALSE
// [CELADON-ADD] - BALLISTIC_SHIELD - Rebalance - Щиты не должны блокировать лежа
Expand Down Expand Up @@ -132,17 +136,19 @@
// [CELADON-ADD] - BALLISTIC_SHIELD - Extended Edition
if(broken_shield)
if(istype(src, /obj/item/shield/riot/tele))
icon_state = "[src::icon_state]1"
icon_state = "teleriot1"
else
icon_state = "[src::icon_state]"
icon_state = initial(icon_state)
// [/CELADON-ADD]
atom_integrity = max_integrity
to_chat(user, span_notice("You repair [src] with [T]."))
name = src::name
broken = FALSE
block_chance = 60
slowdown = 0.5 //slowdown = 1.25 [CELADON-EDIT] - BALLISTIC_SHIELD - Rebalance
//drag_slowdown = 1.25 // [/CELADON-REMOVE]
// [CELADON-EDIT] - BALLISTIC_SHIELD - Extended Edition
block_chance = initial(block_chance) //block_chance = 60
slowdown = initial(slowdown) //slowdown = 1.25
//drag_slowdown = initial(drag_slowdown) // drag_slowdown = 1.25
// [/CELADON-EDIT]

/obj/item/shield/riot/spike
name = "spike shield"
Expand Down Expand Up @@ -174,14 +180,15 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
max_integrity = 30
recoil_bonus = 0 //it's PLASTIC
slowdown = 0 // [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance

/obj/item/shield/riot/buckler
name = "wooden buckler"
desc = "A medieval wooden buckler."
icon_state = "buckler"
item_state = "buckler"
//slowdown = 0 // [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
//drag_slowdown = 0 // [CELADON-REMOVE]
slowdown = 0
//drag_slowdown = 0 // [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/shields_righthand.dmi'
custom_materials = list(/datum/material/wood = MINERAL_MATERIAL_AMOUNT * 10)
Expand Down Expand Up @@ -394,5 +401,6 @@
block_chance = 25
max_integrity = 70
w_class = WEIGHT_CLASS_BULKY
slowdown = 0 // [CELADON-REMOVE] - BALLISTIC_SHIELD - Rebalance

#undef BATON_BASH_COOLDOWN
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/human/human_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@

return BULLET_ACT_FORCE_PIERCE // complete projectile permutation

if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration))
if(check_shields(P, P.damage, "the [P.name]", PROJECTILE_ATTACK, P.armour_penetration, P.damage_type)) // [CELADON-EDIT] - Вы сейчас серьезно не проверяете что за тип урона?
P.on_hit(src, 100, def_zone, piercing_hit)
return BULLET_ACT_HIT

Expand All @@ -115,13 +115,13 @@
return TRUE
return FALSE

/mob/living/carbon/human/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0)
/mob/living/carbon/human/proc/check_shields(atom/AM, damage, attack_text = "the attack", attack_type = MELEE_ATTACK, armour_penetration = 0, damage_type = BRUTE) // [CELADON-EDIT] - Вы сейчас серьезно не проверяете что за тип урона?
var/block_chance_modifier = round(damage / -3)

var/obj/item/shield = get_best_shield()
if(shield)
var/final_block_chance = shield.block_chance - (clamp((armour_penetration - shield.armour_penetration)/2,0,100)) + block_chance_modifier
var/shield_result = shield.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type)
var/shield_result = shield.hit_reaction(src, AM, attack_text, final_block_chance, damage, attack_type, damage_type) // [CELADON-EDIT] - Вы сейчас серьезно не проверяете что за тип урона?
if(shield_result >= 1)
return TRUE
if(shield_result == -1)
Expand Down