cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 15:08:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

tweak: randomly choose special kit receiver (#23528)

Browse Source 
* tweak: randomly choose special kit receiver

* fix: create `/datum/theft_objective` only when required

* refactor: notify about failed special item give, only when needed. Notify other owners about receiving of item

* Update code/game/gamemodes/objective.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Gaxeer
2024-01-21 20:46:24 +00:00
committed by GitHub
co-authored by Contrabang
parent 5b6329ed25
commit 2889003fd5
1 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+51 -23
View File
@@ -558,20 +558,25 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
explanation_text = "Free Objective."
/datum/objective/steal/proc/select_target()
var/list/possible_items_all = GLOB.potential_theft_objectives+"custom"
var/list/possible_items_all = GLOB.potential_theft_objectives + "custom"
var/new_target = input("Select target:", "Objective target", null) as null|anything in possible_items_all
if(!new_target) return
if(!new_target)
return
if(new_target == "custom")
var/datum/theft_objective/O=new
O.typepath = input("Select type:","Type") as null|anything in typesof(/obj/item)
if(!O.typepath) return
var/tmp_obj = new O.typepath
var/custom_name = tmp_obj:name
qdel(tmp_obj)
O.name = sanitize(copytext(input("Enter target name:", "Objective target", custom_name) as text|null,1,MAX_NAME_LEN))
if(!O.name) return
steal_target = O
explanation_text = "Steal [O.name]."
var/obj/item/steal_target_path = input("Select type:","Type") as null|anything in typesof(/obj/item)
if(!steal_target_path)
return
var/theft_objective_name = sanitize(copytext(input("Enter target name:", "Objective target", initial(steal_target_path.name)) as text|null, 1, MAX_NAME_LEN))
if(!theft_objective_name)
return
var/datum/theft_objective/target_theft_objective = new
target_theft_objective.typepath = steal_target_path
target_theft_objective.name = theft_objective_name
steal_target = target_theft_objective
explanation_text = "Steal [theft_objective_name]."
else
steal_target = new new_target
update_explanation_text()
@@ -597,23 +602,46 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
return FALSE
/datum/objective/steal/proc/give_kit(obj/item/item_path)
var/I = new item_path
var/list/slots = list(
var/list/datum/mind/objective_owners = get_owners()
if(!length(objective_owners))
return
var/obj/item/item_to_give = new item_path
var/static/list/slots = list(
"backpack" = SLOT_HUD_IN_BACKPACK,
"left pocket" = SLOT_HUD_LEFT_STORE,
"right pocket" = SLOT_HUD_RIGHT_STORE,
"left hand" = SLOT_HUD_LEFT_HAND,
"right hand" = SLOT_HUD_RIGHT_HAND,
)
for(var/datum/mind/M in get_owners())
var/mob/living/carbon/human/H = M.current
var/where = H.equip_in_one_of_slots(I, slots)
if(where)
to_chat(H, "<br><br><span class='info'>In your [where] is a box containing <b>items and instructions</b> to help you with your steal objective.</span><br>")
else
to_chat(H, "<span class='userdanger'>Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).</span>")
message_admins("[ADMIN_LOOKUPFLW(H)] Failed to spawn with their [item_path] theft kit.")
qdel(I)
for(var/datum/mind/kit_receiver_mind as anything in shuffle(objective_owners))
var/mob/living/carbon/human/kit_receiver = kit_receiver_mind.current
if(!kit_receiver)
continue
var/where = kit_receiver.equip_in_one_of_slots(item_to_give, slots)
if(!where)
continue
to_chat(kit_receiver, "<br><br><span class='info'>In your [where] is a box containing <b>items and instructions</b> to help you with your steal objective.</span><br>")
for(var/datum/mind/objective_owner as anything in objective_owners)
if(kit_receiver_mind == objective_owner || !objective_owner.current)
continue
to_chat(objective_owner.current, "<br><br>[kit_receiver] has received a box containing <b>items and instructions</b> to help you with your steal objective.</span><br>")
return
qdel(item_to_give)
for(var/datum/mind/objective_owner as anything in objective_owners)
var/mob/living/carbon/human/failed_receiver = objective_owner.current
if(!failed_receiver)
continue
to_chat(failed_receiver, "<span class='userdanger'>Unfortunately, you weren't able to get a stealing kit. This is very bad and you should adminhelp immediately (press F1).</span>")
message_admins("[ADMIN_LOOKUPFLW(failed_receiver)] Failed to spawn with their [item_path] theft kit.")
/datum/objective/absorb