mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Removes move delay after clicking
This commit is contained in:
@@ -103,10 +103,6 @@
|
|||||||
// A is your location but is not a turf; or is on you (backpack); or is on something on you (box in backpack); sdepth is needed here because contents depth does not equate inventory storage depth.
|
// A is your location but is not a turf; or is on you (backpack); or is on something on you (box in backpack); sdepth is needed here because contents depth does not equate inventory storage depth.
|
||||||
var/sdepth = A.storage_depth(src)
|
var/sdepth = A.storage_depth(src)
|
||||||
if((!isturf(A) && A == loc) || (sdepth != -1 && sdepth <= 1))
|
if((!isturf(A) && A == loc) || (sdepth != -1 && sdepth <= 1))
|
||||||
// faster access to objects already on you
|
|
||||||
if(A.loc != src)
|
|
||||||
setMoveCooldown(10) //getting something out of a backpack
|
|
||||||
|
|
||||||
if(W)
|
if(W)
|
||||||
var/resolved = W.resolve_attackby(A, src)
|
var/resolved = W.resolve_attackby(A, src)
|
||||||
if(!resolved && A && W)
|
if(!resolved && A && W)
|
||||||
@@ -127,8 +123,6 @@
|
|||||||
sdepth = A.storage_depth_turf()
|
sdepth = A.storage_depth_turf()
|
||||||
if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
|
if(isturf(A) || isturf(A.loc) || (sdepth != -1 && sdepth <= 1))
|
||||||
if(A.Adjacent(src)) // see adjacent.dm
|
if(A.Adjacent(src)) // see adjacent.dm
|
||||||
setMoveCooldown(5)
|
|
||||||
|
|
||||||
if(W)
|
if(W)
|
||||||
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
|
// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
|
||||||
var/resolved = W.resolve_attackby(A,src)
|
var/resolved = W.resolve_attackby(A,src)
|
||||||
@@ -198,15 +192,8 @@
|
|||||||
if((LASER in mutations) && a_intent == I_HURT)
|
if((LASER in mutations) && a_intent == I_HURT)
|
||||||
LaserEyes(A) // moved into a proc below
|
LaserEyes(A) // moved into a proc below
|
||||||
else if(TK in mutations)
|
else if(TK in mutations)
|
||||||
switch(get_dist(src,A))
|
if(get_dist(src, A) > tk_maxrange)
|
||||||
if(1 to 5) // not adjacent may mean blocked by window
|
return
|
||||||
setMoveCooldown(2)
|
|
||||||
if(5 to 7)
|
|
||||||
setMoveCooldown(5)
|
|
||||||
if(8 to tk_maxrange)
|
|
||||||
setMoveCooldown(10)
|
|
||||||
else
|
|
||||||
return
|
|
||||||
A.attack_tk(src)
|
A.attack_tk(src)
|
||||||
/*
|
/*
|
||||||
Restrained ClickOn
|
Restrained ClickOn
|
||||||
|
|||||||
@@ -107,20 +107,11 @@ var/const/tk_maxrange = 15
|
|||||||
return
|
return
|
||||||
|
|
||||||
var/d = get_dist(user, target)
|
var/d = get_dist(user, target)
|
||||||
if(focus) d = max(d,get_dist(user,focus)) // whichever is further
|
if(focus)
|
||||||
switch(d)
|
d = max(d, get_dist(user, focus)) // whichever is further
|
||||||
if(0)
|
if(d > tk_maxrange)
|
||||||
;
|
user << "<span class='notice'>Your mind won't reach that far.</span>"
|
||||||
if(1 to 5) // not adjacent may mean blocked by window
|
return
|
||||||
if(!proximity)
|
|
||||||
user.setMoveCooldown(2)
|
|
||||||
if(5 to 7)
|
|
||||||
user.setMoveCooldown(5)
|
|
||||||
if(8 to tk_maxrange)
|
|
||||||
user.setMoveCooldown(10)
|
|
||||||
else
|
|
||||||
user << "<span class='notice'>Your mind won't reach that far.</span>"
|
|
||||||
return
|
|
||||||
|
|
||||||
if(!focus)
|
if(!focus)
|
||||||
focus_object(target, user)
|
focus_object(target, user)
|
||||||
|
|||||||
36
html/changelogs/Kelenius-runFaster.yml
Normal file
36
html/changelogs/Kelenius-runFaster.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Kelenius
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- tweak: "Move delay after clicking has been removed."
|
||||||
Reference in New Issue
Block a user