From cba81db7e12538c85b83d68a049f9b89dd2c7884 Mon Sep 17 00:00:00 2001 From: ynot01 Date: Tue, 23 Feb 2021 13:48:26 -0500 Subject: [PATCH] changes 500 uranium goal to 50 of every sheet (#11011) * changes 500 uranium goal to 50 of every sheet * sorted by rarity to reduce lag * makes it look pretty * strings * separate var name * Update cargo.dm * paths * Update code/modules/goals/department_goals/cargo.dm Co-authored-by: Redmoogle Co-authored-by: Redmoogle --- code/modules/goals/department_goals/cargo.dm | 29 +++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/code/modules/goals/department_goals/cargo.dm b/code/modules/goals/department_goals/cargo.dm index 16dd4c41d451..1bb758025aa2 100644 --- a/code/modules/goals/department_goals/cargo.dm +++ b/code/modules/goals/department_goals/cargo.dm @@ -2,24 +2,33 @@ account = ACCOUNT_CAR -// Have 500 plasteel sheets in the ore silo -// I'ven't played this game for so long I have no clue how viable this even is. -// Is this easy? Is this hard? Is the reward too high? Who knows? -/datum/department_goal/car/uranium - name = "Have 500 uranium" - desc = "Store 500 uranium sheets in the ore silo" - reward = "50000" +// Have 50 of every (traditional) sheet (not bananium or plastic) +/datum/department_goal/car/sheets + name = "Have 50 of every ore sheet" + desc = "Store 50 of every ore sheet in the ore silo" + reward = 5000 + continuous = 3000 // rewards every 5 minutes -/datum/department_goal/car/uranium/check_complete() +/datum/department_goal/car/sheets/check_complete() var/obj/machinery/ore_silo/O = GLOB.ore_silo_default var/datum/component/material_container/materials = O.GetComponent(/datum/component/material_container) - return materials.has_enough_of_material(/datum/material/uranium, MINERAL_MATERIAL_AMOUNT, 500) + var/list/material_list = list( + /datum/material/bluespace, + /datum/material/diamond, + /datum/material/uranium, + /datum/material/gold, + /datum/material/titanium, + /datum/material/silver, + /datum/material/plasma, + /datum/material/glass, + /datum/material/iron) + return materials.has_materials(material_list, 50*MINERAL_MATERIAL_AMOUNT) // Setup a tesla in cargo /datum/department_goal/car/tesla name = "Create a tesla" desc = "Create a tesla engine in the cargo bay" - reward = "50000" + reward = 50000 /datum/department_goal/car/tesla/check_complete() for(var/obj/singularity/energy_ball/e in GLOB.singularities)