mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Adds missing TK move cooldowns, adjusts click move cooldowns
This commit is contained in:
@@ -106,9 +106,7 @@
|
||||
var/sdepth = A.storage_depth(src)
|
||||
if((!isturf(A) && A == loc) || (sdepth != -1 && sdepth <= 1))
|
||||
// faster access to objects already on you
|
||||
if(A in contents)
|
||||
setMoveCooldown(5) //taking an item off of an inventory slot
|
||||
else
|
||||
if(A.loc != src)
|
||||
setMoveCooldown(10) //getting something out of a backpack
|
||||
|
||||
if(W)
|
||||
@@ -129,7 +127,7 @@
|
||||
sdepth = A.storage_depth_turf()
|
||||
if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
|
||||
if(A.Adjacent(src)) // see adjacent.dm
|
||||
setMoveCooldown(10)
|
||||
setMoveCooldown(5)
|
||||
|
||||
if(W)
|
||||
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
|
||||
|
||||
@@ -111,16 +111,12 @@ var/const/tk_maxrange = 15
|
||||
if(0)
|
||||
;
|
||||
if(1 to 5) // not adjacent may mean blocked by window
|
||||
;
|
||||
//TODO replace these with movement timeouts
|
||||
//if(!proximity)
|
||||
// user.next_move += 2
|
||||
if(!proximity)
|
||||
user.setMoveCooldown(2)
|
||||
if(5 to 7)
|
||||
;
|
||||
//user.next_move += 5
|
||||
user.setMoveCooldown(5)
|
||||
if(8 to tk_maxrange)
|
||||
;
|
||||
//user.next_move += 10
|
||||
user.setMoveCooldown(10)
|
||||
else
|
||||
user << "<span class='notice'>Your mind won't reach that far.</span>"
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user