Small combat balancing: Small crawling nerf, Esword buff (#5937)

* adds a delay and message to crawling underneath people

* makes eswords take less stamloss to swing around, lays down groundwork for later parts of combat reworks

* FUCK
This commit is contained in:
deathride58
2018-03-16 03:27:30 -07:00
committed by kevinz000
parent c2e95fc233
commit 8923bb9488
9 changed files with 53 additions and 2 deletions
+1 -1
View File
@@ -20,6 +20,6 @@
/obj/item/proc/getweight()
if(total_mass)
return total_mass
return max(total_mass,MIN_MELEE_STAMCOST)
else
return w_class*1.25
+1 -1
View File
@@ -1,2 +1,2 @@
/obj/item
var/total_mass
var/total_mass //Total mass in arbitrary pound-like values. If there's no balance reasons for an item to have otherwise, this var should be the item's weight in pounds.
@@ -0,0 +1,3 @@
/obj/item/melee/transforming/energy/sword
total_mass = 0.375 //Survival flashlights typically weigh around 5 ounces.
total_mass_on = 3.4 //The typical medieval sword, on the other hand, weighs roughly 3 pounds.
@@ -0,0 +1,11 @@
/obj/item/melee/transforming
var/total_mass_on //Total mass in ounces when transformed. Primarily for balance purposes. Don't think about it too hard.
/obj/item/melee/transforming/getweight()
if(total_mass && total_mass_on)
if(active)
return max(total_mass_on,MIN_MELEE_STAMCOST)
else
return max(total_mass,MIN_MELEE_STAMCOST)
else
return initial(w_class)*1.25
@@ -1,6 +1,16 @@
/mob/living/carbon
var/combatmode = FALSE //literally lifeweb
/mob/living/carbon/CanPass(atom/movable/mover, turf/target)
. = ..()
if(.)
var/mob/living/mobdude = mover
if(istype(mobdude))
if(!resting && mobdude.resting)
if(!(mobdude.pass_flags & PASSMOB))
return FALSE
return .
/mob/living/carbon/proc/toggle_combat_mode()
if(recoveringstam)
return TRUE
@@ -6,6 +6,7 @@
var/aimingdownsights = FALSE
var/attemptingstandup = FALSE
var/intentionalresting = FALSE
var/attemptingcrawl = FALSE
/mob/living/movement_delay(ignorewalk = 0)
. = ..()