makes w_class use defines (#9848)

This commit is contained in:
Wowzewow (Wezzy)
2020-09-06 17:37:56 -03:00
committed by GitHub
parent d90e7f199b
commit 307c214541
304 changed files with 807 additions and 765 deletions
@@ -12,7 +12,7 @@
drop_sound = 'sound/items/drop/knife.ogg'
pickup_sound = 'sound/items/pickup/knife.ogg'
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = 1
w_class = ITEMSIZE_TINY
thrown_force_divisor = 1
origin_tech = list(TECH_MATERIAL = 1)
attack_verb = list("attacked", "stabbed", "poked")
@@ -72,7 +72,7 @@
applies_material_colour = 0
force_divisor = 0.35
can_embed = 0
w_class = 3
w_class = ITEMSIZE_NORMAL
/obj/item/material/knife/tacknife
name = "tactical knife"
@@ -91,7 +91,7 @@
icon = 'icons/obj/weapons.dmi'
icon_state = "trench"
item_state = "knife"
w_class = 3
w_class = ITEMSIZE_NORMAL
applies_material_colour = 0
slot_flags = SLOT_BELT
@@ -109,7 +109,7 @@
)
hitsound = null
active = 0
w_class = 2
w_class = ITEMSIZE_SMALL
attack_verb = list("patted", "tapped")
force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
thrown_force_divisor = 0.25 // 5 when thrown with weight 20 (steel)
@@ -123,7 +123,7 @@
icon_state += "_open"
item_state = icon_state
hitsound = 'sound/weapons/bladeslice.ogg'
w_class = 3
w_class = ITEMSIZE_NORMAL
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
else
force = 3
@@ -6,7 +6,7 @@
gender = NEUTER
throw_speed = 3
throw_range = 7
w_class = 3
w_class = ITEMSIZE_NORMAL
sharp = 0
edge = 0
icon = 'icons/obj/weapons.dmi'
@@ -36,7 +36,7 @@
item_state = "hatchet"
force_divisor = 0.2 // 12 with hardness 60 (steel)
thrown_force_divisor = 0.75 // 15 with weight 20 (steel)
w_class = 2
w_class = ITEMSIZE_SMALL
sharp = 1
edge = 1
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 1)
@@ -95,7 +95,7 @@
item_state = "hoe"
force_divisor = 0.25 // 5 with weight 20 (steel)
thrown_force_divisor = 0.25 // as above
w_class = 2
w_class = ITEMSIZE_SMALL
attack_verb = list("slashed", "sliced", "cut", "clawed")
/obj/item/material/scythe
@@ -112,7 +112,7 @@
edge = 1
throw_speed = 1
throw_range = 3
w_class = 4
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
origin_tech = list(TECH_MATERIAL = 2, TECH_COMBAT = 2)
attack_verb = list("chopped", "sliced", "cut", "reaped")
@@ -125,4 +125,4 @@
thrown_force_divisor = 0.04 // 5 with weight 20 (steel)
throw_speed = 2
throw_range = 3
w_class = 2
w_class = ITEMSIZE_SMALL
@@ -8,7 +8,7 @@
randpixel = 8
sharp = 1
edge = 1
w_class = 2
w_class = ITEMSIZE_SMALL
force_divisor = 0.2 // 6 with hardness 30 (glass)
thrown_force_divisor = 0.4 // 4 with weight 15 (glass)
item_state = "shard-glass"
@@ -7,7 +7,7 @@
item_state = "claymore"
contained_sprite = TRUE
slot_flags = SLOT_BELT|SLOT_BACK
w_class = 4
w_class = ITEMSIZE_LARGE
force_divisor = 0.7 // 42 when wielded with hardnes 60 (steel)
thrown_force_divisor = 0.5 // 10 when thrown with weight 20 (steel)
sharp = 1
@@ -17,7 +17,7 @@
* Twohanded
*/
/obj/item/material/twohanded
w_class = 4
w_class = ITEMSIZE_LARGE
var/wielded = 0
var/force_wielded = 0
var/force_unwielded
@@ -157,7 +157,7 @@
///////////OFFHAND///////////////
/obj/item/material/twohanded/offhand
w_class = 5
w_class = ITEMSIZE_HUGE
icon_state = "offhand"
name = "offhand"
default_material = "placeholder"
@@ -195,7 +195,7 @@
force_divisor = 0.7 // 10/42 with hardness 60 (steel) and 0.25 unwielded divisor
sharp = 1
edge = 1
w_class = 4.0
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_wielded = 30
attack_verb = list("attacked", "chopped", "cleaved", "torn", "cut")
@@ -231,7 +231,7 @@
name = "spear"
desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
force = 10
w_class = 4.0
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_divisor = 0.35 // 21 damage for steel (hardness 60)
unwielded_force_divisor = 0.2 // 12 damage for steel (hardness 60)
@@ -541,7 +541,7 @@
unwielded_force_divisor = 0.2
force_divisor = 0.3
edge = 1
w_class = 4.0
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
attack_verb = list("attacked", "poked", "jabbed", "gored", "stabbed")
default_material = "steel"
@@ -618,7 +618,7 @@
name = "zweihander"
desc = "A german upgrade to the einhander models of ancient times."
force = 20
w_class = 4.0
w_class = ITEMSIZE_LARGE
slot_flags = SLOT_BACK
force_wielded = 30
unwielded_force_divisor = 1