shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5805 from Citadel-Station-13/upstream-merge-35894

Browse Source 
[MIRROR] Refactors construction datums into components
This commit is contained in:
deathride58
2018-03-05 03:18:21 +00:00
committed by GitHub
parent 318481e62d e6f9c2ca49
commit 4b59a31a58
5 changed files with 376 additions and 371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/construction.dm
+158
View File
@@ -0,0 +1,158 @@
#define FORWARD 1
#define BACKWARD -1
#define ITEM_DELETE "delete"
#define ITEM_MOVE_INSIDE "move_inside"
/datum/component/construction
var/list/steps
var/result
var/index = 1
var/desc
/datum/component/construction/Initialize()
if(!isatom(parent))
. = COMPONENT_INCOMPATIBLE
CRASH("A construction component was applied incorrectly to non-atom: [parent.type].")
RegisterSignal(COMSIG_PARENT_EXAMINE, .proc/examine)
RegisterSignal(COMSIG_PARENT_ATTACKBY,.proc/action)
update_parent(index)
/datum/component/construction/proc/examine(mob/user)
if(desc)
to_chat(user, desc)
/datum/component/construction/proc/on_step()
if(index > steps.len)
spawn_result()
else
update_parent(index)
/datum/component/construction/proc/action(obj/item/I, mob/living/user)
return check_step(I, user)
/datum/component/construction/proc/update_index(diff)
index += diff
on_step()
/datum/component/construction/proc/check_step(obj/item/I, mob/living/user)
var/diff = is_right_key(I)
if(diff && custom_action(I, user, diff))
update_index(diff)
return TRUE
return FALSE
/datum/component/construction/proc/is_right_key(obj/item/I) // returns index step
var/list/L = steps[index]
if(check_used_item(I, L["key"]))
return FORWARD //to the first step -> forward
else if(check_used_item(I, L["back_key"]))
return BACKWARD //to the last step -> backwards
return FALSE
/datum/component/construction/proc/check_used_item(obj/item/I, key)
if(!key)
return FALSE
if(ispath(key) && istype(I, key))
return TRUE
else if(I.tool_behaviour == key)
return TRUE
return FALSE
/datum/component/construction/proc/custom_action(obj/item/I, mob/living/user, diff)
var/target_index = index + diff
var/list/current_step = steps[index]
var/list/target_step
if(target_index > 0 && target_index <= steps.len)
target_step = steps[target_index]
. = TRUE
if(I.tool_behaviour)
. = I.use_tool(parent, user, 0, volume=50)
else if(diff == FORWARD)
switch(current_step["action"])
if(ITEM_DELETE)
. = user.transferItemToLoc(I, parent)
if(.)
qdel(I)
if(ITEM_MOVE_INSIDE)
. = user.transferItemToLoc(I, parent)
// Using stacks
else if(istype(I, /obj/item/stack))
. = I.use_tool(parent, user, 0, volume=50, amount=current_step["amount"])
// Going backwards? Undo the last action. Drop/respawn the items used in last action, if any.
if(. && diff == BACKWARD && target_step && !target_step["no_refund"])
var/target_step_key = target_step["key"]
switch(target_step["action"])
if(ITEM_DELETE)
new target_step_key(drop_location())
if(ITEM_MOVE_INSIDE)
var/obj/item/located_item = locate(target_step_key) in parent
if(located_item)
located_item.forceMove(drop_location())
else if(ispath(target_step_key, /obj/item/stack))
new target_step_key(drop_location(), target_step["amount"])
/datum/component/construction/proc/spawn_result()
// Some constructions result in new components being added.
if(ispath(result, /datum/component))
parent.AddComponent(result)
qdel(src)
else if(ispath(result, /atom))
new result(drop_location())
qdel(parent)
/datum/component/construction/proc/update_parent(step_index)
var/list/step = steps[step_index]
var/atom/parent_atom = parent
if(step["desc"])
desc = step["desc"]
if(step["icon_state"])
parent_atom.icon_state = step["icon_state"]
/datum/component/construction/proc/drop_location()
var/atom/parent_atom = parent
return parent_atom.drop_location()
// Unordered construction.
// Takes a list of part types, to be added in any order, as steps.
// Calls spawn_result() when every type has been added.
/datum/component/construction/unordered/check_step(obj/item/I, mob/living/user)
for(var/typepath in steps)
if(istype(I, typepath) && custom_action(I, user, typepath))
steps -= typepath
on_step()
return TRUE
return FALSE
/datum/component/construction/unordered/on_step()
if(!steps.len)
spawn_result()
else
update_parent(steps.len)
/datum/component/construction/unordered/update_parent(steps_left)
return
/datum/component/construction/unordered/custom_action(obj/item/I, mob/living/user, typepath)
return TRUE
code/datums/helper_datums/construction_datum.dm
-104
View File
@@ -1,104 +0,0 @@
#define FORWARD 1
#define BACKWARD -1
#define ITEM_DELETE "delete"
#define ITEM_MOVE_INSIDE "move_inside"
/datum/construction
var/list/steps
var/atom/holder
var/result
var/index = 1
/datum/construction/New(atom)
..()
holder = atom
if(!holder) //don't want this without a holder
qdel(src)
update_holder(index)
/datum/construction/proc/on_step()
if(index > steps.len)
spawn_result()
else
update_holder(index)
/datum/construction/proc/action(obj/item/I, mob/living/user)
return check_step(I, user)
/datum/construction/proc/update_index(diff)
index += diff
on_step()
/datum/construction/proc/check_step(obj/item/I, mob/living/user)
var/diff = is_right_key(I)
if(diff && custom_action(I, user, diff))
update_index(diff)
return TRUE
return FALSE
/datum/construction/proc/is_right_key(obj/item/I) // returns index step
var/list/L = steps[index]
if(check_used_item(I, L["key"]))
return FORWARD //to the first step -> forward
else if(check_used_item(I, L["back_key"]))
return BACKWARD //to the last step -> backwards
return FALSE
/datum/construction/proc/check_used_item(obj/item/I, key)
if(!key)
return FALSE
if(ispath(key) && istype(I, key))
return TRUE
else if(I.tool_behaviour == key)
return TRUE
return FALSE
/datum/construction/proc/custom_action(obj/item/I, mob/living/user, diff)
return TRUE
/datum/construction/proc/spawn_result()
if(result)
new result(drop_location())
qdel(holder)
/datum/construction/proc/update_holder(step_index)
var/list/step = steps[step_index]
if(step["desc"])
holder.desc = step["desc"]
if(step["icon_state"])
holder.icon_state = step["icon_state"]
/datum/construction/proc/drop_location()
return holder.drop_location()
// Unordered construction.
// Takes a list of part types, to be added in any order, as steps.
// Calls spawn_result() when every type has been added.
/datum/construction/unordered/check_step(obj/item/I, mob/living/user)
for(var/typepath in steps)
if(istype(I, typepath) && custom_action(I, user, typepath))
steps -= typepath
on_step()
return TRUE
return FALSE
/datum/construction/unordered/on_step()
if(!steps.len)
spawn_result()
else
update_holder(steps.len)
/datum/construction/unordered/update_holder(steps_left)
return
/datum/construction/unordered/custom_action(obj/item/I, mob/living/user, typepath)
return TRUE
code/game/mecha/mecha_construction_paths.dm
+209 -253
View File
File diff suppressed because it is too large Load Diff
code/game/mecha/mecha_parts.dm
+8 -13
View File
@@ -12,17 +12,12 @@
/obj/item/mecha_parts/chassis
name = "Mecha Chassis"
icon_state = "backbone"
var/datum/construction/construct
var/construct_type
/obj/item/mecha_parts/chassis/Initialize()
. = ..()
if(construct_type)
construct = new construct_type(src)
/obj/item/mecha_parts/chassis/attackby(obj/item/W, mob/user, params)
if(!construct || !construct.action(W, user))
return ..()
AddComponent(construct_type)
/obj/item/mecha_parts/chassis/attack_hand()
return
@@ -31,7 +26,7 @@
/obj/item/mecha_parts/chassis/ripley
name = "\improper Ripley chassis"
construct_type = /datum/construction/unordered/mecha_chassis/ripley
construct_type = /datum/component/construction/unordered/mecha_chassis/ripley
/obj/item/mecha_parts/part/ripley_torso
name = "\improper Ripley torso"
@@ -62,7 +57,7 @@
/obj/item/mecha_parts/chassis/odysseus
name = "\improper Odysseus chassis"
construct_type = /datum/construction/unordered/mecha_chassis/odysseus
construct_type = /datum/component/construction/unordered/mecha_chassis/odysseus
/obj/item/mecha_parts/part/odysseus_head
name = "\improper Odysseus head"
@@ -98,7 +93,7 @@
/obj/item/mecha_parts/chassis/gygax
name = "\improper Gygax chassis"
construct_type = /datum/construction/unordered/mecha_chassis/gygax
construct_type = /datum/component/construction/unordered/mecha_chassis/gygax
/obj/item/mecha_parts/part/gygax_torso
name = "\improper Gygax torso"
@@ -141,7 +136,7 @@
/obj/item/mecha_parts/chassis/durand
name = "\improper Durand chassis"
construct_type = /datum/construction/unordered/mecha_chassis/durand
construct_type = /datum/component/construction/unordered/mecha_chassis/durand
/obj/item/mecha_parts/part/durand_torso
name = "\improper Durand torso"
@@ -183,14 +178,14 @@
/obj/item/mecha_parts/chassis/firefighter
name = "\improper Firefighter chassis"
construct_type = /datum/construction/unordered/mecha_chassis/firefighter
construct_type = /datum/component/construction/unordered/mecha_chassis/firefighter
////////// HONK
/obj/item/mecha_parts/chassis/honker
name = "\improper H.O.N.K chassis"
construct_type = /datum/construction/unordered/mecha_chassis/honker
construct_type = /datum/component/construction/unordered/mecha_chassis/honker
/obj/item/mecha_parts/part/honker_torso
name = "\improper H.O.N.K torso"
@@ -227,7 +222,7 @@
/obj/item/mecha_parts/chassis/phazon
name = "\improper Phazon chassis"
construct_type = /datum/construction/unordered/mecha_chassis/phazon
construct_type = /datum/component/construction/unordered/mecha_chassis/phazon
/obj/item/mecha_parts/part/phazon_torso
name="\improper Phazon torso"