Merge pull request #5238 from Heroman3003/Orefixes

Adds new ores to Virgo 3b and 2
This commit is contained in:
Spades
2019-05-17 06:43:40 -04:00
committed by GitHub
2 changed files with 16 additions and 5 deletions
+1 -1
View File
@@ -152,7 +152,7 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral)
if(mineral)
return
var/mineral_name = pickweight(list("uranium" = 5, "platinum" = 10, "hematite" = 5, "carbon" = 5, "diamond" = 10, "gold" = 20, "silver" = 20, "phoron" = 5))
var/mineral_name = pickweight(list("marble" = 5, "uranium" = 5, "platinum" = 10, "hematite" = 5, "carbon" = 5, "diamond" = 10, "gold" = 20, "silver" = 20, "lead" = 10, "verdantium" = 5))
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]
+15 -4
View File
@@ -61,6 +61,7 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
var/mineral_name
if(rare_ore)
mineral_name = pickweight(list(
"marble" = 3,
"uranium" = 10,
"platinum" = 10,
"hematite" = 20,
@@ -68,16 +69,20 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
"diamond" = 1,
"gold" = 8,
"silver" = 8,
"phoron" = 18))
"phoron" = 18,
"lead" = 2,
"verdantium" = 1))
else
mineral_name = pickweight(list(
"marble" = 2,
"uranium" = 5,
"platinum" = 5,
"hematite" = 35,
"carbon" = 35,
"gold" = 3,
"silver" = 3,
"phoron" = 25))
"phoron" = 25,
"lead" = 1))
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]
UpdateMineral()
@@ -89,22 +94,28 @@ VIRGO3B_TURF_CREATE(/turf/simulated/mineral/floor)
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))
"silver" = 15,
"lead" = 5,
"verdantium" = 2))
else
mineral_name = pickweight(list(
"marble" = 5,
"uranium" = 7,
"platinum" = 7,
"hematite" = 28,
"carbon" = 28,
"diamond" = 2,
"gold" = 7,
"silver" = 7))
"silver" = 7,
"lead" = 4,
"verdantium" = 1))
if(mineral_name && (mineral_name in ore_data))
mineral = ore_data[mineral_name]
UpdateMineral()