Weapon rebalance 07 24 (#2325)

* adds sweeping to weapons

* adds more stuff

* updates cityweapons

* mimicry works again

* Update teth.dm

code/game/objects/items/ego_weapons/aleph.dm

@@ -112,6 +112,7 @@
 	icon_state = "da_capo"
 	force = 40 // It attacks very fast
 	attack_speed = 0.5
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = WHITE_DAMAGE
 	attack_verb_continuous = list("slashes", "slices", "rips", "cuts")
 	attack_verb_simple = list("slash", "slice", "rip", "cut")
@@ -164,8 +165,9 @@
 	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
 	inhand_x_dimension = 64
 	inhand_y_dimension = 64
-	force = 70
+	force = 65
 	damtype = RED_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_verb_continuous = list("slashes", "slices", "rips", "cuts")
 	attack_verb_simple = list("slash", "slice", "rip", "cut")
 	hitsound = 'sound/abnormalities/nothingthere/attack.ogg'
@@ -176,6 +178,7 @@
 							JUSTICE_ATTRIBUTE = 80
 							)
 
+
 /obj/item/ego_weapon/mimicry/attack(mob/living/target, mob/living/carbon/human/user)
 	if(!CanUseEgo(user))
 		return
@@ -201,6 +204,7 @@
 	icon_state = "twilight"
 	worn_icon_state = "twilight"
 	force = 35
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = RED_DAMAGE // It's all damage types, actually
 	attack_verb_continuous = list("slashes", "slices", "rips", "cuts")
 	attack_verb_simple = list("slash", "slice", "rip", "cut")
@@ -328,6 +332,7 @@
 	icon_state = "rosered"
 	force = 80 //Less damage, can swap damage type
 	damtype = RED_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_verb_continuous = list("cuts", "slices")
 	attack_verb_simple = list("cuts", "slices")
 	hitsound = 'sound/weapons/ego/rapier2.ogg'
@@ -364,6 +369,7 @@
 	worn_icon_state = "censored"
 	force = 70	//there's a focus on the ranged attack here.
 	damtype = BLACK_DAMAGE
+	swingstyle = WEAPONSWING_THRUST
 	attack_verb_continuous = list("attacks")
 	attack_verb_simple = list("attack")
 	hitsound = 'sound/weapons/ego/censored1.ogg'
@@ -436,6 +442,7 @@
 	special = "Hitting enemies will mark them. Hitting marked enemies will give different buffs depending on attack type."
 	icon_state = "soulmate"
 	force = 40
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = RED_DAMAGE
 	attack_speed = 0.8
 	attack_verb_continuous = list("cuts", "slices")
@@ -545,6 +552,7 @@
 	icon_state = "space"
 	force = 50	//Half white, half black.
 	damtype = WHITE_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_verb_continuous = list("cuts", "attacks", "slashes")
 	attack_verb_simple = list("cut", "attack", "slash")
 	hitsound = 'sound/weapons/rapierhit.ogg'

code/game/objects/items/ego_weapons/he.dm

@@ -33,8 +33,9 @@
 	desc = "The last legacy of the man who sought wisdom. The rake tilled the human brain instead of farmland."
 	special = "Use this weapon in your hand to damage every non-human within reach."
 	icon_state = "harvest"
-	force = 30
+	force = 25
 	damtype = BLACK_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_verb_continuous = list("attacks", "bashes", "tills")
 	attack_verb_simple = list("attack", "bash", "till")
 	hitsound = 'sound/weapons/ego/harvest.ogg'
@@ -116,8 +117,9 @@
 	name = "bear paw"
 	desc = "The paws made form, and given life."
 	icon_state = "bear_paw"
-	force = 12
-	attack_speed = 0.3
+	force = 17
+	attack_speed = 0.5
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("punches", "jabs", "slaps")
 	attack_verb_simple = list("punches", "jabs", "slaps")
@@ -135,8 +137,9 @@
 	name = "life for a daredevil"
 	desc = "An ancient sword surrounded in death, yet it's having it in your grasp that makes you feel the most alive."
 	icon_state = "daredevil"
-	force = 12
+	force = 11
 	attack_speed = 0.5
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = PALE_DAMAGE
 	attack_verb_continuous = list("decimates", "bisects")
 	attack_verb_simple = list("decimate", "bisect")
@@ -365,6 +368,7 @@
 	special = "This weapon deals more damage the more allies you can see."
 	icon_state = "courage"
 	force = 10 //if 4 people are around, the weapon can deal up to 70 damage per strike, but alone it's a glorified baton.
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("slashes")
 	attack_verb_simple = list("slash")
@@ -484,6 +488,7 @@
 	desc = "Looks to be a fan blade with a handle welded to it."
 	icon_state = "metal"
 	force = 40
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 1.5
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("slices", "cleaves", "chops")
@@ -497,8 +502,9 @@
 	name = "alleyway"
 	desc = "It's a small knife forged of black metal."
 	icon_state = "alleyway"
-	force = 9
-	attack_speed = 0.3
+	force = 17
+	attack_speed = 0.5
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = BLACK_DAMAGE
 	attack_verb_continuous = list("slices", "cleaves", "chops")
 	attack_verb_simple = list("slice", "cleave", "chop")
@@ -599,8 +605,9 @@
 	desc = "Death, where is thy sting?"
 	special = "This weapon attacks faster when hitting targets below 50% health"
 	icon_state = "revelation"
-	force = 25
+	force = 22
 	attack_speed = 1.5
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = PALE_DAMAGE
 	attack_verb_continuous = list("slashes", "slices", "rips", "cuts")
 	attack_verb_simple = list("slash", "slice", "rip", "cut")
@@ -734,7 +741,7 @@
 	var/mode = "Spear"
 	var/list/mode_stats = list(
 		"Spear" = list("_sp", 42, 1, 2, list("pokes", "jabs"), list("poke", "jab"), 'sound/weapons/ego/spear1.ogg'),	//Now immobilizes you.
-		"Sword" = list("_sw", 25, 1, 1, list("slashes", "slices"), list("slash", "slice"), 'sound/weapons/bladeslice.ogg'),
+		"Sword" = list("_sw", 22, 1, 1, list("slashes", "slices"), list("slash", "slice"), 'sound/weapons/bladeslice.ogg'),
 		"Gauntlet" = list("_f", 50, 3, 1, list("crushes", "smashes"), list("crush", "smash"), 'sound/weapons/ego/strong_gauntlet.ogg')
 		)
 	var/windup = 0
@@ -751,10 +758,13 @@
 	switch(mode)
 		if("Spear")
 			mode = "Sword"
+			swingstyle = WEAPONSWING_LARGESWEEP
 		if("Sword")
 			mode = "Gauntlet"
+			swingstyle = WEAPONSWING_SMALLSWEEP
 		if("Gauntlet")
 			mode = "Spear"
+			swingstyle = WEAPONSWING_THRUST
 	to_chat(user, span_notice("[src] makes a whirling sound as it changes shape!"))
 	if(prob(5))
 		to_chat(user, span_notice("Do you love your city?"))
@@ -937,6 +947,7 @@
 	icon_state = "sanguine"
 	force = 40//about 1.3x the average dps
 	attack_speed = 1
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("hacks", "slashes", "attacks")
 	attack_verb_simple = list("hack", "slash", "attack")
@@ -1114,7 +1125,8 @@
 	righthand_file = 'icons/mob/inhands/64x64_righthand.dmi'
 	inhand_x_dimension = 64
 	inhand_y_dimension = 64
-	force = 24
+	force = 23
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 0.8
 	reach = 1
 	stuntime = 0
@@ -1200,7 +1212,8 @@
 	desc = "The elderly man showed a red thread connecting the young boy with his future lover. Disgusted at the sight, he ordered her to be executed."
 	special = "This weapon deals significantly more damage when attacking the same target repeatedly."
 	icon_state = "destiny"
-	force = 12
+	force = 11
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 0.5
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("stabs", "slashes", "attacks")
@@ -1719,7 +1732,8 @@
 	desc = "What seems to be a giant half of a scissors pair."
 	icon_state = "voodoo"
 	special = "This weapon can be paired with a second copy to use both at the same time."
-	force = 20
+	force = 18
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 0.7
 	damtype = WHITE_DAMAGE
 	attack_verb_continuous = list("stabs", "slashes", "attacks")
@@ -1756,6 +1770,7 @@
 	inhand_x_dimension = 64
 	inhand_y_dimension = 64
 	force = 60
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 3
 	damtype = RED_DAMAGE
 	attack_verb_continuous = list("bashes", "clubs")

code/game/objects/items/ego_weapons/non_abnormality/dawn.dm

@@ -6,6 +6,7 @@
 	icon_state = "philip"
 	inhand_icon_state = "philip"
 	damtype = RED_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_verb_continuous = list("bashes", "crushes")
 	attack_verb_simple = list("bash", "crush")
@@ -52,6 +53,7 @@
 	force = 40		//Bigger range, less force
 	attack_speed = 1.5
 	aoe_range = 5
+	swingstyle = WEAPONSWING_SMALLSWEEP
 
 //Salvador's Zweihander
 /obj/item/ego_weapon/city/dawn/zwei

code/game/objects/items/ego_weapons/non_abnormality/gradeone.dm

@@ -8,6 +8,7 @@
 	force = 60
 	attack_speed = 0.8
 	damtype = RED_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")

code/game/objects/items/ego_weapons/non_abnormality/index.dm

@@ -8,6 +8,7 @@
 	inhand_icon_state = "index"
 	force = 37
 	damtype = PALE_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_verb_continuous = list("smacks", "hammers", "beats")
 	attack_verb_simple = list("smack", "hammer", "beat")
@@ -108,6 +109,7 @@
 	hitsound = 'sound/weapons/fixer/generic/nail1.ogg'
 	attack_speed = 1.2
 	reach = 2
+	swingstyle = WEAPONSWING_THRUST
 
 //Fockin massive sword
 /obj/item/ego_weapon/city/index/yan

code/game/objects/items/ego_weapons/non_abnormality/jcorp.dm

@@ -48,6 +48,7 @@
 	icon_state = "tingtang_knife"
 	inhand_icon_state = "tingtang_knife"
 	force = 37
+	swingstyle = WEAPONSWING_LARGESWEEP
 	attack_speed = 1
 	hitsound = 'sound/weapons/fixer/generic/knife1.ogg'
 	attribute_requirements = list(

code/game/objects/items/ego_weapons/non_abnormality/jeong.dm

@@ -8,6 +8,7 @@
 	force = 30
 	attack_speed = 0.7
 	damtype = BLACK_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_verb_continuous = list("slices", "stabs")
 	attack_verb_simple = list("slice", "stab")

code/game/objects/items/ego_weapons/non_abnormality/limbus_ego.dm

@@ -53,8 +53,9 @@
 	inhand_icon_state = "shiv"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	force = 25
+	force = 24
 	attack_speed = 0.5 //this shit goes FAST
+	swingstyle = WEAPONSWING_LARGESWEEP
 	damtype = WHITE_DAMAGE
 	attack_verb_continuous = list("stabs", "slices", "rips", "shanks")
 	attack_verb_simple = list("stab", "slice", "rip", "shank")

code/game/objects/items/ego_weapons/non_abnormality/limbus_sinner.dm

@@ -32,9 +32,10 @@
 	icon = 'icons/obj/limbus_weapons.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/limbus_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/limbus_righthand.dmi'
-	force = 35
+	force = 33
 	attack_speed = 1.6
 	damtype = WHITE_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_verb_continuous = list("cuts", "smacks", "bashes")
 	attack_verb_simple = list("cuts", "smacks", "bashes")
@@ -75,9 +76,10 @@
 	lefthand_file = 'icons/mob/inhands/weapons/limbus_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/limbus_righthand.dmi'
 	hitsound = 'sound/weapons/bladeslice.ogg'
-	force = 13
+	force = 12
 	attack_speed = 0.5
 	damtype = BLACK_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_verb_continuous = list("pokes", "jabs", "tears", "lacerates", "gores")
 	attack_verb_simple = list("poke", "jab", "tear", "lacerate", "gore")
@@ -226,8 +228,9 @@
 	icon = 'icons/obj/limbus_weapons.dmi'
 	lefthand_file = 'icons/mob/inhands/weapons/limbus_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/limbus_righthand.dmi'
-	force = 20
+	force = 19
 	damtype = RED_DAMAGE
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 	attack_speed = 0.8
 	attack_verb_continuous = list("cuts", "slices")

code/game/objects/items/ego_weapons/non_abnormality/liu.dm

@@ -28,6 +28,7 @@
 							TEMPERANCE_ATTRIBUTE = 40,
 							JUSTICE_ATTRIBUTE = 40
 							)
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 /obj/item/ego_weapon/city/liu/fire/examine(mob/user)
 	. = ..()
@@ -55,6 +56,7 @@
 							TEMPERANCE_ATTRIBUTE = 60,
 							JUSTICE_ATTRIBUTE = 60
 							)
+	swingstyle = WEAPONSWING_SMALLSWEEP
 
 /obj/item/ego_weapon/city/liu/fire/spear
 	name = "liu spear"
@@ -69,6 +71,7 @@
 							TEMPERANCE_ATTRIBUTE = 60,
 							JUSTICE_ATTRIBUTE = 80
 							)
+	swingstyle = WEAPONSWING_THRUST
 
 
 /obj/item/ego_weapon/city/liu/fire/sword
@@ -82,6 +85,7 @@
 							TEMPERANCE_ATTRIBUTE = 100,
 							JUSTICE_ATTRIBUTE = 100
 							)
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 
 

code/game/objects/items/ego_weapons/non_abnormality/miscfixer.dm

@@ -22,24 +22,26 @@
 	name = "fixer blade"
 	desc = "A common fixer blade, mass-produced and easy to use."
 	icon_state = "fixer_blade"
-	force = 22
+	force = 20
 	damtype = RED_DAMAGE
 
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 /obj/item/ego_weapon/city/fixergreatsword
 	name = "fixer greatsword"
 	desc = "A heftier variant of the more common fixer blade."
 	icon_state = "fixer_greatsword"
-	force = 38
+	force = 36
 	attack_speed = 2
 	damtype = RED_DAMAGE
 
 	hitsound = 'sound/weapons/genhit3.ogg'
 	attack_verb_continuous = list("attacks", "slashes", "stabs", "slices", "tears", "lacerates", "rips", "dices", "cuts")
 	attack_verb_simple = list("attack", "slash", "stab", "slice", "tear", "lacerate", "rip", "dice", "cut")
+	swingstyle = WEAPONSWING_LARGESWEEP
 
 /obj/item/ego_weapon/city/fixerhammer
 	name = "fixer hammer"

code/game/objects/items/ego_weapons/non_abnormality/molar.dm

@@ -32,11 +32,12 @@
 	name = "molar chainknife"
 	desc = "A short chainsword used by the Molar Office's leader. Its chain sings with the speed it moves at."
 	icon_state = "olga"
-	force = 38
+	force = 37
 	attack_speed = 0.7
 	attribute_requirements = list(
 							FORTITUDE_ATTRIBUTE = 100,
 							PRUDENCE_ATTRIBUTE = 80,
 							TEMPERANCE_ATTRIBUTE = 60,	//She's got bad temperance, get it? Because temperance is another word for not drinking alcohol?
 							JUSTICE_ATTRIBUTE = 80
 							)
+	swingstyle = WEAPONSWING_LARGESWEEP