Skip to content

Commit

Permalink
Rebalance gang weaponry (#18369)
Browse files Browse the repository at this point in the history
  • Loading branch information
TDHooligan committed Apr 4, 2024
1 parent 6e7aef3 commit 3cf5197
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 17 deletions.
6 changes: 3 additions & 3 deletions code/datums/gamemodes/gangwar.dm
Expand Up @@ -1200,7 +1200,7 @@ proc/broadcast_to_all_gangs(var/message)
new/datum/gang_item/consumable/quickhack,
new/datum/gang_item/misc/ratstick,
new/datum/gang_item/street/switchblade,
new/datum/gang_item/ninja/nunchucks,
// new/datum/gang_item/ninja/nunchucks, removed for stunning too many secoffs
new/datum/gang_item/ninja/throwing_knife,
new/datum/gang_item/ninja/shuriken,
new/datum/gang_item/ninja/discount_katana,
Expand Down Expand Up @@ -2274,10 +2274,10 @@ proc/broadcast_to_all_gangs(var/message)
/////////////////////////////////////////////////////////////////////
/datum/gang_item/space/discount_csaber
name = "Faux C-Saber"
desc = "It's not a c-saber, it's something from the discount rack. Some kinda kooky laser stick. It doesn't look very dangerous."
desc = "It's not a c-saber, it's something from the discount rack. Some kinda kooky laser stick. It looks pretty dangerous."
class2 = "weapon"
price = 9000
item_path = /obj/item/sword/discount
item_path = /obj/item/sword/discount/gang
/datum/gang_item/space/csaber
name = "C-Saber"
desc = "It's not a lightsaber."
Expand Down
1 change: 1 addition & 0 deletions code/modules/items/specials/ItemSpecials.dm
Expand Up @@ -1608,6 +1608,7 @@ ABSTRACT_TYPE(/datum/item_special/spark)

/datum/item_special/katana_dash/reverse
staminaCost = 10
stamina_damage = 40
reversed = 1

on_hit(var/mob/hit)
Expand Down
40 changes: 27 additions & 13 deletions code/obj/item/misc_weapons.dm
Expand Up @@ -486,6 +486,13 @@ TYPEINFO(/obj/item/sword/pink/angel)
active_stamina_dmg = 65
inactive_stamina_dmg = 30
hit_type = DAMAGE_BLUNT
var/strong_disorient = TRUE
gang
active_force = 22 // a bit more lethal. as a treat.
inactive_force = 8
active_stamina_dmg = 25
inactive_stamina_dmg = 10
strong_disorient = FALSE

can_reflect()
return FALSE
Expand All @@ -495,18 +502,15 @@ TYPEINFO(/obj/item/sword/pink/angel)
. += "It is set to [src.active ? "on" : "off"]."

/obj/item/sword/discount/attack(mob/target, mob/user, def_zone, is_special = FALSE, params = null)
//hhaaaaxxxxxxxx. overriding the disorient for my own effect
if (active)
hit_type = DAMAGE_BURN
else
hit_type = DAMAGE_BLUNT

//returns TRUE if parried. So stop here
if (..())
return

if (active)
target.do_disorient(0, weakened = 0, stunned = 0, disorient = 30, remove_stamina_below_zero = 0)
if (strong_disorient)
target.do_disorient(0, weakened = 0, stunned = 0, disorient = 30, remove_stamina_below_zero = 0)
else
target.do_disorient(0, weakened = 0, stunned = 0, disorient = 1, remove_stamina_below_zero = 0)

///////////////////////////////////////////////// Dagger /////////////////////////////////////////////////

Expand Down Expand Up @@ -583,7 +587,6 @@ TYPEINFO(/obj/item/sword/pink/angel)
throwforce = 20
stamina_cost = 5
c_flags = EQUIPPED_WHILE_HELD

setupProperties()
..()
setProperty("movespeed", -0.5)
Expand All @@ -595,16 +598,27 @@ TYPEINFO(/obj/item/sword/pink/angel)
inhand_image_icon = 'icons/mob/inhand/hand_weapons.dmi'
item_state = "ninjaknife"
force = 8
throwforce = 11
throwforce = 18
throw_range = 10
flags = FPRINT | TABLEPASS | USEDELAY //| NOSHIELD
desc = "Like many knives, these can be thrown. Unlike many knives, these are made to be thrown."
gang
name = "familiar fighting knife"
force = 17
throwforce = 25
desc = "A light but robust combat knife that allows you to move faster in fights. It looks really familiar..."
icon_state = "combat_knife_gang"
inhand_image_icon = 'icons/mob/inhand/hand_food.dmi'
item_state = "knife"
setupProperties()
..()
setProperty("movespeed", -0.5)


throw_impact(atom/A, datum/thrown_thing/thr)
if(iscarbon(A))
var/mob/living/carbon/C = A
C.do_disorient(stamina_damage = 60, weakened = 0, stunned = 0, disorient = 40, remove_stamina_below_zero = 1)
C.do_disorient(stamina_damage = 40, weakened = 0, stunned = 0, disorient = 20, remove_stamina_below_zero = 1)
C.emote("twitch_v")
A:lastattacker = usr
A:lastattackertime = world.time
Expand Down Expand Up @@ -689,8 +703,8 @@ TYPEINFO(/obj/item/sword/pink/angel)
src.implanted(M)
src.visible_message(SPAN_ALERT("[src] gets embedded in [M]!"))
playsound(src.loc, 'sound/impact_sounds/Flesh_Cut_1.ogg', 100, 1)
H.changeStatus("weakened", 2 SECONDS)
random_brute_damage(M, 11)//embedding cares not for your armour
H.do_disorient(stamina_damage = 30, weakened = 0, stunned = 0, disorient = 20, remove_stamina_below_zero = 1)
random_brute_damage(M, 18)//embedding cares not for your armour
take_bleeding_damage(M, null, 3, DAMAGE_CUT)

/obj/item/nunchucks
Expand Down Expand Up @@ -1390,7 +1404,7 @@ TYPEINFO(/obj/item/swords/katana)
name = "reverse blade katana"
desc = "A sword whose blade is on the wrong side. Crafted by a master who grew to hate the death his weapons caused; which was weird since Oppenheimer has him beat by several orders of magnitude. Considered worthless by many, only a true virtuoso can unleash it's potential."
hit_type = DAMAGE_BLUNT
force = 18
force = 20
throw_range = 6
contraband = 5 //Fun fact: sheathing your katana makes you 100% less likely to be tazed by beepsky, probably
delimb_prob = 1
Expand Down
2 changes: 1 addition & 1 deletion code/obj/storage/gang_crate.dm
Expand Up @@ -826,7 +826,7 @@ ABSTRACT_TYPE(/obj/randomloot_spawner/medium)
dagger
tier = GANG_CRATE_GUN
spawn_loot(var/C,var/datum/loot_spawner_info/I)
spawn_item(C,I,/obj/item/dagger/syndicate/specialist,rot=45,scale_x=0.55,scale_y=0.55)
spawn_item(C,I,/obj/item/dagger/throwing_knife/gang,rot=45,scale_x=0.55,scale_y=0.55)

// GANG_CRATE_GEAR
pouch
Expand Down
Binary file modified icons/obj/items/weapons.dmi
Binary file not shown.

0 comments on commit 3cf5197

Please sign in to comment.