From 734d22329e6530cba355d08e84d5dbd71ddf74f0 Mon Sep 17 00:00:00 2001 From: Casey Date: Sun, 14 Aug 2022 01:44:08 -0400 Subject: [PATCH] Nerfs mining yields for SD and RP --- code/modules/random_map/noise/ore.dm | 16 ++-- maps/expedition_vr/aerostat/_aerostat.dm | 75 +++++++++++++++++++ maps/groundbase/gb-mining.dm | 12 +-- maps/groundbase/groundbase_defines.dm | 2 +- .../stellar_delight_defines.dm | 2 +- .../stellar_delight/stellar_delight_things.dm | 24 +++++- maps/stellar_delight/stellar_delight_turfs.dm | 35 +++++++++ maps/submaps/space_rocks/space_rocks.dm | 14 +--- maps/tether/submaps/_tether_submaps.dm | 2 +- .../underdark_pois/underdark_things.dm | 5 ++ 10 files changed, 158 insertions(+), 29 deletions(-) diff --git a/code/modules/random_map/noise/ore.dm b/code/modules/random_map/noise/ore.dm index 5eecf3b3e2..ec6dbae1b1 100644 --- a/code/modules/random_map/noise/ore.dm +++ b/code/modules/random_map/noise/ore.dm @@ -53,7 +53,7 @@ var/current_cell = map[get_map_cell(x,y)] if(current_cell < rare_val) // Surface metals. - T.resources["hematite"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) T.resources["gold"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["silver"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) @@ -81,17 +81,17 @@ T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["hydrogen"] = 0 T.resources["diamond"] = 0 - T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) + T.resources["hematite"] = 0 T.resources["marble"] = 0 //T.resources["copper"] = 0 //T.resources["tin"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) //T.resources["bauxite"] = 0 - T.resources["rutile"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) + T.resources["rutile"] = 0 //T.resources["void opal"] = 0 //T.resources["quartz"] = 0 //T.resources["painite"] = 0 else // Deep metals. - T.resources["uranium"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources["uranium"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["diamond"] = rand(RESOURCE_LOW_MIN, RESOURCE_LOW_MAX) T.resources["verdantium"] = rand(RESOURCE_LOW_MIN, RESOURCE_MID_MAX) T.resources["phoron"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) @@ -99,13 +99,13 @@ T.resources["hydrogen"] = rand(RESOURCE_MID_MIN, RESOURCE_MID_MAX) T.resources["marble"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) T.resources["lead"] = rand(RESOURCE_LOW_MIN, RESOURCE_HIGH_MAX) - T.resources["hematite"] = rand(RESOURCE_HIGH_MIN, RESOURCE_HIGH_MAX) - T.resources["gold"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) - T.resources["silver"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources["hematite"] = 0 + T.resources["gold"] = 0 + T.resources["silver"] = 0 //T.resources["copper"] = 0 //T.resources["tin"] = 0 //T.resources["bauxite"] = 0 - T.resources["rutile"] = rand(RESOURCE_MID_MIN, RESOURCE_HIGH_MAX) + T.resources["rutile"] = 0 //T.resources["void opal"] = 0 //T.resources["quartz"] = 0 //T.resources["painite"] = 0 diff --git a/maps/expedition_vr/aerostat/_aerostat.dm b/maps/expedition_vr/aerostat/_aerostat.dm index e4a5d2c528..54ddab176a 100644 --- a/maps/expedition_vr/aerostat/_aerostat.dm +++ b/maps/expedition_vr/aerostat/_aerostat.dm @@ -36,6 +36,81 @@ /datum/random_map/noise/ore/virgo2/check_map_sanity() return 1 //Totally random, but probably beneficial. +/datum/random_map/noise/ore/virgo2/apply_to_turf(var/x,var/y) //Same as normal + Rutile + + var/tx = ((origin_x-1)+x)*chunk_size + var/ty = ((origin_y-1)+y)*chunk_size + + for(var/i=0,i>>>>>> fd8a3ed26e... Merge pull request #13487 from Heroman3003/mine-nerf diff --git a/maps/stellar_delight/stellar_delight_turfs.dm b/maps/stellar_delight/stellar_delight_turfs.dm index 9e7927efe2..6e8e86fb33 100644 --- a/maps/stellar_delight/stellar_delight_turfs.dm +++ b/maps/stellar_delight/stellar_delight_turfs.dm @@ -45,3 +45,38 @@ VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/dirt) icon_state = "asteroid" VIRGO3B_TURF_CREATE(/turf/simulated/floor/outdoors/rocks) + +/turf/simulated/mineral/virgo2/make_ore(var/rare_ore) // Override V2 ore generation + if(mineral || ignore_mapgen) + return + var/mineral_name + if(rare_ore) + mineral_name = pickweight(list( + "marble" = 7, + "uranium" = 10, + "platinum" = 10, + "hematite" = 10, + "carbon" = 10, + "diamond" = 4, + "gold" = 15, + "silver" = 15, + "lead" = 5, + "verdantium" = 2, + "rutile" = 10)) + else + mineral_name = pickweight(list( + "marble" = 5, + "uranium" = 7, + "platinum" = 7, + "hematite" = 28, + "carbon" = 28, + "diamond" = 2, + "gold" = 7, + "silver" = 7, + "lead" = 4, + "verdantium" = 1, + "rutile" = 10)) + if(mineral_name && (mineral_name in GLOB.ore_data)) + mineral = GLOB.ore_data[mineral_name] + UpdateMineral() + update_icon() diff --git a/maps/submaps/space_rocks/space_rocks.dm b/maps/submaps/space_rocks/space_rocks.dm index 3951d51171..62437676d5 100644 --- a/maps/submaps/space_rocks/space_rocks.dm +++ b/maps/submaps/space_rocks/space_rocks.dm @@ -11,7 +11,7 @@ "uranium" = 10, "platinum" = 10, "hematite" = 20, - "carbon" = 5, + "carbon" = 20, "diamond" = 1, "gold" = 8, "silver" = 8, @@ -24,7 +24,7 @@ "uranium" = 5, "platinum" = 5, "hematite" = 35, - "carbon" = 5, + "carbon" = 35, "gold" = 3, "silver" = 3, "phoron" = 25, @@ -35,15 +35,7 @@ UpdateMineral() update_icon() -/datum/random_map/noise/ore/spacerocks - descriptor = "asteroid field ore distribution map" - deep_val = 0.2 - rare_val = 0.1 - -/datum/random_map/noise/ore/spacerocks/check_map_sanity() - return 1 //Totally random, but probably beneficial. - -/area/sdmine/ +/area/sdmine ambience = list('sound/ambience/ambimine.ogg', 'sound/ambience/song_game.ogg') base_turf = /turf/simulated/mineral/floor/vacuum /area/sdmine/unexplored diff --git a/maps/tether/submaps/_tether_submaps.dm b/maps/tether/submaps/_tether_submaps.dm index ad7af628fc..26eb6dbae3 100644 --- a/maps/tether/submaps/_tether_submaps.dm +++ b/maps/tether/submaps/_tether_submaps.dm @@ -55,7 +55,7 @@ . = ..() seed_submaps(list(Z_LEVEL_UNDERDARK), 100, /area/mine/unexplored/underdark, /datum/map_template/underdark) new /datum/random_map/automata/cave_system/no_cracks(null, 3, 3, Z_LEVEL_UNDERDARK, world.maxx - 4, world.maxy - 4) // Create the mining Z-level. - new /datum/random_map/noise/ore(null, 1, 1, Z_LEVEL_UNDERDARK, 64, 64) // Create the mining ore distribution map. + new /datum/random_map/noise/ore/underdark(null, 1, 1, Z_LEVEL_UNDERDARK, 64, 64) // Create the mining ore distribution map. /datum/map_template/tether_lateload/tether_plains diff --git a/maps/tether/submaps/underdark_pois/underdark_things.dm b/maps/tether/submaps/underdark_pois/underdark_things.dm index 9a5ffc8fdb..926fb7393b 100644 --- a/maps/tether/submaps/underdark_pois/underdark_things.dm +++ b/maps/tether/submaps/underdark_pois/underdark_things.dm @@ -1,3 +1,8 @@ +/datum/random_map/noise/ore/underdark + descriptor = "Underdark ore distribution map" + deep_val = 0.7 + rare_val = 0.5 + // Weakened version of Phoron spiders /mob/living/simple_mob/animal/giant_spider/phorogenic/weak maxHealth = 100