From 375f4ed77d438bcd3ccc0a3390fa71ce6d1ab369 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Feb 2019 14:51:29 -0500 Subject: [PATCH 1/4] Cake is good. Uncomments a few crates: Cakes, Mexican, and Bakery stuff are re-enabled. --- code/datums/supplypacks/hospitality_vr.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/datums/supplypacks/hospitality_vr.dm b/code/datums/supplypacks/hospitality_vr.dm index a8fb518233..f420dbd9c3 100644 --- a/code/datums/supplypacks/hospitality_vr.dm +++ b/code/datums/supplypacks/hospitality_vr.dm @@ -11,7 +11,7 @@ cost = 25 containertype = /obj/structure/closet/crate/freezer containername = "Burger crate" -/* + /datum/supply_packs/randomised/hospitality/bakery_vr num_contained = 5 contains = list( @@ -52,7 +52,7 @@ /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake ) name = "Cake crate" - cost = 100 + cost = 20 containertype = /obj/structure/closet/crate/freezer containername = "Cake crate" @@ -68,7 +68,7 @@ cost = 50 containertype = /obj/structure/closet/crate/freezer containername = "Mexican takeout crate" -*/ + /datum/supply_packs/randomised/hospitality/asian_vr num_contained = 5 contains = list( @@ -81,4 +81,4 @@ containername = "Chinese takeout crate" /datum/supply_packs/randomised/hospitality/pizza - cost = 50 \ No newline at end of file + cost = 50 From 06967f636c7305d989730323a0935b082e730b6f Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Feb 2019 15:55:50 -0500 Subject: [PATCH 2/4] Bye-bye, Mechs. Hello, delicious points! Comments out requests for any sort of mechs and makes the points rewards randomised in proportion to the event's severity. Minor would give you a low amount of points. Major would give ya a heaping pile of points. Minor edit to the paper thing so it's not blending with another word. --- code/modules/events/supply_demand.dm | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/code/modules/events/supply_demand.dm b/code/modules/events/supply_demand.dm index 0e255499dc..da57e1e7a3 100644 --- a/code/modules/events/supply_demand.dm +++ b/code/modules/events/supply_demand.dm @@ -14,11 +14,11 @@ var/end_time announceWhen = 1 startWhen = 2 - endWhen = 1800 // Aproximately 1 hour in master controller ticks, refined by end_time + endWhen = 2700 // Aproximately 1.5 hour in master controller ticks, refined by end_time /datum/event/supply_demand/setup() my_department = "[using_map.company_name] Supply Division" // Can't have company name in initial value (not const) - end_time = world.time + 1 HOUR + (severity * 30 MINUTES) + end_time = world.time + 1.5 HOUR + (severity * 30 MINUTES) running_demand_events += src // Decide what items are requried! // We base this on what departmets are most active, excluding departments we don't have @@ -33,7 +33,7 @@ choose_chemistry_items(roll(severity, 2)) if(ROLE_RESEARCH) // Would be nice to differentiate between research diciplines choose_research_items(roll(severity, 2)) - choose_robotics_items(roll(1, severity)) +// choose_robotics_items(roll(1, severity)) //TFF: Goodbye, silly Gygax requests..... if(ROLE_CARGO) choose_alloy_items(rand(1, severity)) if(ROLE_CIVILIAN) // Would be nice to separate out chef/gardener/bartender @@ -52,7 +52,7 @@ message += "has a warehouse full of empty crates! " message += "We have to fill that gap quick before anyone starts asking questions. " message += "You'd better have this stuff here by [worldtime2stationtime(end_time)]
" - message += "The requested items are as follows" + message += "The requested items are as follows: " message += "
" for (var/datum/supply_demand_order/req in required_items) message += req.describe() + "
" @@ -74,7 +74,12 @@ // Check if the crew succeeded or failed! if(required_items.len == 0) // Success! - supply_controller.points += 500 * severity + if(severity <= EVENT_LEVEL_MUNDANE) + supply_controller.points += Cargo_points = rand(1, 10) * 2 //TFF: Give lower points for minor event + else if(severity == EVENT_LEVEL_MODERATE) + supply_controller.points += Cargo_points = rand(1, 25) * 2 //TFF: Give moderate points for moderate event + else + supply_controller.points += Cargo_points = rand(1, 50) * 2 //TFF: Give huge amount of points for major event var/msg = "Great work! With those items you delivered our inventory levels all match up. " msg += "[capitalize(pick(first_names_female))] from accounting will have nothing to complain about. " msg += "I think you'll find a little something in your supply account." @@ -103,7 +108,7 @@ for(var/atom/movable/MA in area_shuttle) // Special case to allow us to count mechs! - if(MA.anchored && !istype(MA, /obj/mecha)) continue // Ignore anchored stuff +// if(MA.anchored && !istype(MA, /obj/mecha)) continue // Ignore anchored stuff //TFF: Mechs sometimes ridiculous to ask, like come on... Multiple Gygaxes? Nah. // If its a crate, search inside of it for matching items. if(istype(MA, /obj/structure/closet/crate)) @@ -115,7 +120,7 @@ if(match_found && required_items.len >= 1) // Okay we delivered SOME. Lets give an update, but only if not finished. - var/message = "Shipment Received. As a reminder, the following items are still requried:" + var/message = "Shipment Received. As a reminder, the following items are still requried: " message += "
" for (var/datum/supply_demand_order/req in required_items) message += req.describe() + "
" @@ -310,7 +315,7 @@ var/chosen_qty = rand(1, 20) * 5 required_items += new /datum/supply_demand_order/reagent(chosen_qty, R) return - +/* /datum/event/supply_demand/proc/choose_robotics_items(var/differentTypes) // Do not make mechs dynamic, its too silly var/list/types = list( @@ -323,7 +328,7 @@ types -= T // Don't pick the same thing twice required_items += new /datum/supply_demand_order/thing(rand(1, 2), T) return - +*/ //TFF: Some of the time, these end up being too much. 2 Gygaxes? Nope, ask somewhere else, Central. /* // Commented out, same reason as the above. Broken event /datum/event/supply_demand/proc/choose_atmos_items(var/differentTypes) var/datum/gas_mixture/mixture = new From 0806e17459d4ec11e31dd5f17ea6a454ece45452 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Feb 2019 16:58:24 -0500 Subject: [PATCH 3/4] Two Long Comments too long? Maybe Travis will accept this, combining two long comments one after the other. --- code/modules/events/supply_demand.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/events/supply_demand.dm b/code/modules/events/supply_demand.dm index da57e1e7a3..95b21fb3d8 100644 --- a/code/modules/events/supply_demand.dm +++ b/code/modules/events/supply_demand.dm @@ -327,9 +327,9 @@ var/T = pick(types) types -= T // Don't pick the same thing twice required_items += new /datum/supply_demand_order/thing(rand(1, 2), T) - return -*/ //TFF: Some of the time, these end up being too much. 2 Gygaxes? Nope, ask somewhere else, Central. -/* // Commented out, same reason as the above. Broken event + return //TFF: Some of the time, these end up being too much. 2 Gygaxes? Nope, ask somewhere else, Central. + +// Commented out, same reason as the above. Broken event /datum/event/supply_demand/proc/choose_atmos_items(var/differentTypes) var/datum/gas_mixture/mixture = new mixture.temperature = T20C From ff26b60240bf9b67f5e9b4b26485229817714463 Mon Sep 17 00:00:00 2001 From: TheFurryFeline <38586851+TheFurryFeline@users.noreply.github.com> Date: Sun, 24 Feb 2019 17:15:47 -0500 Subject: [PATCH 4/4] Initialise a var Did a dumb and forgot to define Cargo_points var. >W> --- code/modules/events/supply_demand.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/events/supply_demand.dm b/code/modules/events/supply_demand.dm index 95b21fb3d8..db7edd58de 100644 --- a/code/modules/events/supply_demand.dm +++ b/code/modules/events/supply_demand.dm @@ -70,6 +70,7 @@ endWhen = activeFor // End early becuase we're done already! /datum/event/supply_demand/end() + var/Cargo_points = null running_demand_events -= src // Check if the crew succeeded or failed! if(required_items.len == 0)