From b13da57769d02f226f439d0204fa629abb186e44 Mon Sep 17 00:00:00 2001 From: Jack Edge Date: Wed, 24 Jun 2020 12:14:54 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=81=20Fix=20holiday=20loot=20being=20u?= =?UTF-8?q?ltra=20rare?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since maintenance loot was put in the wide categories of trash, common, uncommon and oddities, the Easter and Christmas maintenance loot was made incredibly rare. This commit increases the chances to around 25% of all maintenance loot to be a special holiday item, rather than the tiny oddity level chance before. --- code/_globalvars/lists/maintenance_loot.dm | 1 + code/modules/holiday/holidays.dm | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index db2c6ebeaff..196c19533ae 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -257,6 +257,7 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items #define maint_common_weight 4500 #define maint_uncommon_weight 1000 #define maint_oddity_weight 1 //1 out of 10,000 would give metastation (180 spawns) a 2 in 111 chance of spawning an oddity per round, similar to xeno egg +#define maint_holiday_weight 3500 // When holiday loot is enabled, it'll give every loot item a 25% chance of being a holiday item //Loot pool used by default maintenance loot spawners GLOBAL_LIST_INIT(maintenance_loot, list( diff --git a/code/modules/holiday/holidays.dm b/code/modules/holiday/holidays.dm index bcf2c99faa2..fc3a3810053 100644 --- a/code/modules/holiday/holidays.dm +++ b/code/modules/holiday/holidays.dm @@ -511,9 +511,11 @@ /datum/holiday/xmas/celebrate() SSticker.OnRoundstart(CALLBACK(src, .proc/roundstart_celebrate)) GLOB.maintenance_loot += list( - /obj/item/toy/xmas_cracker = 3, - /obj/item/clothing/head/santa = 1, - /obj/item/a_gift/anything = 1 + list( + /obj/item/toy/xmas_cracker = 3, + /obj/item/clothing/head/santa = 1, + /obj/item/a_gift/anything = 1 + ) = maint_holiday_weight, ) /datum/holiday/xmas/proc/roundstart_celebrate() @@ -583,8 +585,11 @@ /datum/holiday/easter/celebrate() GLOB.maintenance_loot += list( - /obj/item/reagent_containers/food/snacks/egg/loaded = 15, - /obj/item/storage/bag/easterbasket = 15) + list( + /obj/item/reagent_containers/food/snacks/egg/loaded = 15, + /obj/item/storage/bag/easterbasket = 15 + ) = maint_holiday_weight, + ) /datum/holiday/easter/greet() return "Greetings! Have a Happy Easter and keep an eye out for Easter Bunnies!"