mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-16 13:12:22 +00:00
What was supposed to be another straightforward major system overhaul that once again spiraled out of control (#8220)
* get_tool_quality has numerical meaning * Basic tools set tool quality * Toolspeed is replaced by tool quality checks * Addresses assorted results from live test * Extra cleanup
This commit is contained in:
@@ -34,31 +34,17 @@
|
||||
if(valid_step)
|
||||
if(custom_action(valid_step, I, user))
|
||||
next_step()
|
||||
return 1
|
||||
return 0
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/datum/construction/proc/is_right_key(var/obj/item/I) // returns current step num if I is of the right type.
|
||||
var/list/L = steps[steps.len]
|
||||
switch(L["key"])
|
||||
if(IS_SCREWDRIVER)
|
||||
if(I.is_screwdriver())
|
||||
return steps.len
|
||||
if(IS_CROWBAR)
|
||||
if(I.is_crowbar())
|
||||
return steps.len
|
||||
if(IS_WIRECUTTER)
|
||||
if(I.is_wirecutter())
|
||||
return steps.len
|
||||
if(IS_WRENCH)
|
||||
if(I.is_wrench())
|
||||
return steps.len
|
||||
|
||||
if(istype(I, L["key"]))
|
||||
if(istype(I, L["key"]) || I.get_tool_quality(L["key"]))
|
||||
return steps.len
|
||||
return 0
|
||||
|
||||
/datum/construction/proc/custom_action(step, I, user)
|
||||
return 1
|
||||
return TRUE
|
||||
|
||||
/datum/construction/proc/check_all_steps(var/obj/item/I,mob/user as mob) //check all steps, remove matching one.
|
||||
for(var/i=1;i<=steps.len;i++)
|
||||
@@ -69,8 +55,8 @@
|
||||
listclearnulls(steps);
|
||||
if(!steps.len)
|
||||
spawn_result()
|
||||
return 1
|
||||
return 0
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
|
||||
/datum/construction/proc/spawn_result()
|
||||
@@ -105,34 +91,11 @@
|
||||
|
||||
/datum/construction/reversible/is_right_key(var/obj/item/I) // returns index step
|
||||
var/list/L = steps[index]
|
||||
if(I.get_tool_quality(L["key"]))
|
||||
return FORWARD
|
||||
|
||||
switch(L["key"])
|
||||
if(IS_SCREWDRIVER)
|
||||
if(I.is_screwdriver())
|
||||
return FORWARD
|
||||
if(IS_CROWBAR)
|
||||
if(I.is_crowbar())
|
||||
return FORWARD
|
||||
if(IS_WIRECUTTER)
|
||||
if(I.is_wirecutter())
|
||||
return FORWARD
|
||||
if(IS_WRENCH)
|
||||
if(I.is_wrench())
|
||||
return FORWARD
|
||||
|
||||
switch(L["backkey"])
|
||||
if(IS_SCREWDRIVER)
|
||||
if(I.is_screwdriver())
|
||||
return BACKWARD
|
||||
if(IS_CROWBAR)
|
||||
if(I.is_crowbar())
|
||||
return BACKWARD
|
||||
if(IS_WIRECUTTER)
|
||||
if(I.is_wirecutter())
|
||||
return BACKWARD
|
||||
if(IS_WRENCH)
|
||||
if(I.is_wrench())
|
||||
return BACKWARD
|
||||
if(I.get_tool_quality(L["backkey"]))
|
||||
return BACKWARD
|
||||
|
||||
if(istype(I, L["key"]))
|
||||
return FORWARD //to the first step -> forward
|
||||
@@ -145,8 +108,8 @@
|
||||
if(diff)
|
||||
if(custom_action(index, diff, I, user))
|
||||
update_index(diff)
|
||||
return 1
|
||||
return 0
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
/datum/construction/reversible/custom_action(index, diff, I, user)
|
||||
return 1
|
||||
return TRUE
|
||||
Reference in New Issue
Block a user