From 1a1d8c3d177352b946d75ceb2f8016971e5b1b1d Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Mon, 23 Apr 2012 22:10:26 +0100 Subject: [PATCH] TG: - commented out the old adamantine recipe. - removed adamantine ore - removed adamantine mineral walls - added a new adamantine recipe, but it's commented out for the moment - added a new material, mythril, with a nice urist sprite - added a mythril coin - added a mythril recipe, but it's commented out for the moment So yeah, adamantine will have a new recipe and will no longer be gained from ore and added mythril to the procesisng unit, stacking unit and coin press. NOTE TO URIST: to enable this, you only have to uncomment the part with your name in machine_processing.dm Everything else is already in working order. Oh and you need to make the coin and sheet sprite. Revision: r3146 Author: baloh.matevz --- .../modules/mining/datum_processing_recipe.dm | 1 - code/modules/mining/machine_processing.dm | 63 ++++++++----------- code/modules/mining/machine_stacking.dm | 25 +++++++- code/modules/mining/machine_unloading.dm | 1 - code/modules/mining/mine_turfs.dm | 11 ---- code/modules/mining/mint.dm | 13 ++++ code/modules/mining/ores_materials_coins.dm | 19 ++++-- code/modules/mining/satchel_ore_box.dm | 5 -- 8 files changed, 74 insertions(+), 64 deletions(-) diff --git a/code/modules/mining/datum_processing_recipe.dm b/code/modules/mining/datum_processing_recipe.dm index 8aef5a78d28..b06915a6392 100644 --- a/code/modules/mining/datum_processing_recipe.dm +++ b/code/modules/mining/datum_processing_recipe.dm @@ -20,5 +20,4 @@ var/list/datum/material_recipe/MATERIAL_RECIPES = list( new/datum/material_recipe("Diamond",list(/obj/item/weapon/ore/diamond),/obj/item/stack/sheet/diamond), new/datum/material_recipe("Plasma",list(/obj/item/weapon/ore/plasma),/obj/item/stack/sheet/plasma), new/datum/material_recipe("Bananium",list(/obj/item/weapon/ore/clown),/obj/item/stack/sheet/clown), - new/datum/material_recipe("Adamantine",list(/obj/item/weapon/ore/adamantine),/obj/item/stack/sheet/adamantine) ) \ No newline at end of file diff --git a/code/modules/mining/machine_processing.dm b/code/modules/mining/machine_processing.dm index 41425cf2c04..aaa6aaf8b44 100644 --- a/code/modules/mining/machine_processing.dm +++ b/code/modules/mining/machine_processing.dm @@ -103,16 +103,6 @@ else machine.selected_clown = 0 - //adamantine - if(machine.ore_adamantine) - if (machine.selected_adamantine==1) - dat += text("Smelting ") - else - dat += text("Not smelting ") - dat += text("Adamantine: [machine.ore_adamantine]
") - else - machine.selected_adamantine = 0 - //On or off dat += text("Machine is currently ") @@ -173,11 +163,6 @@ machine.selected_clown = 1 else machine.selected_clown = 0 - if(href_list["sel_adamantine"]) - if (href_list["sel_adamantine"] == "yes") - machine.selected_adamantine = 1 - else - machine.selected_adamantine =0 if(href_list["set_on"]) if (href_list["set_on"] == "on") machine.on = 1 @@ -216,7 +201,6 @@ var/selected_uranium = 0 var/selected_iron = 0 var/selected_clown = 0 - var/selected_adamantine = 0 var/on = 0 //0 = off, 1 =... oh you know! /obj/machinery/mineral/processing_unit/New() @@ -237,14 +221,14 @@ var/i for (i = 0; i < 10; i++) if (on) - if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_glass > 0) ore_glass--; new /obj/item/stack/sheet/glass(output.loc) else on = 0 continue - if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 1 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0) if (ore_glass > 0 && ore_iron > 0) ore_glass--; ore_iron--; @@ -252,49 +236,49 @@ else on = 0 continue - if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 1 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_gold > 0) ore_gold--; new /obj/item/stack/sheet/gold(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_silver > 0) ore_silver--; new /obj/item/stack/sheet/silver(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_diamond > 0) ore_diamond--; new /obj/item/stack/sheet/diamond(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) if (ore_plasma > 0) ore_plasma--; new /obj/item/stack/sheet/plasma(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0) if (ore_uranium > 0) ore_uranium--; new /obj/item/stack/sheet/uranium(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0) if (ore_iron > 0) ore_iron--; new /obj/item/stack/sheet/metal(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 1 && selected_clown == 0) if (ore_iron > 0 && ore_plasma > 0) ore_iron--; ore_plasma--; @@ -302,20 +286,32 @@ else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1 && selected_adamantine == 0) + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 1) if (ore_clown > 0) ore_clown--; new /obj/item/stack/sheet/clown(output.loc) else on = 0 continue - if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 0 && selected_plasma == 0 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0 && selected_adamantine == 1) - if (ore_adamantine > 0) - ore_adamantine--; + //THESE TWO ARE CODED FOR URIST TO USE WHEN HE GETS AROUND TO IT. + //They were coded on 18 Feb 2012. If you're reading this in 2015, then firstly congratulations on the world not ending on 21 Dec 2012 and secondly, Urist is apparently VERY lazy. ~Errorage + /*if (selected_glass == 0 && selected_gold == 0 && selected_silver == 0 && selected_diamond == 1 && selected_plasma == 0 && selected_uranium == 1 && selected_iron == 0 && selected_clown == 0) + if (ore_uranium >= 2 && ore_diamond >= 1) + ore_uranium -= 2 + ore_diamond -= 1 new /obj/item/stack/sheet/adamantine(output.loc) else on = 0 continue + if (selected_glass == 0 && selected_gold == 0 && selected_silver == 1 && selected_diamond == 0 && selected_plasma == 1 && selected_uranium == 0 && selected_iron == 0 && selected_clown == 0) + if (ore_silver >= 1 && ore_plasma >= 3) + ore_silver -= 1 + ore_plasma -= 3 + new /obj/item/stack/sheet/mythril(output.loc) + else + on = 0 + continue*/ + //if a non valid combination is selected @@ -348,9 +344,6 @@ if (selected_clown == 1) if (ore_clown <= 0) b = 0 - if (selected_adamantine == 1) - if (ore_adamantine <= 0) - b = 0 if (b) //if they are, deduct one from each, produce slag and shut the machine off if (selected_gold == 1) @@ -367,8 +360,6 @@ ore_iron-- if (selected_clown == 1) ore_clown-- - if (selected_adamantine == 1) - ore_adamantine-- new /obj/item/weapon/ore/slag(output.loc) on = 0 else @@ -413,10 +404,6 @@ ore_clown++ del(O) continue - if (istype(O,/obj/item/weapon/ore/adamantine)) - ore_adamantine++ - del(O) - continue O.loc = src.output.loc else break diff --git a/code/modules/mining/machine_stacking.dm b/code/modules/mining/machine_stacking.dm index 0f65c3a370a..30a03fe70eb 100644 --- a/code/modules/mining/machine_stacking.dm +++ b/code/modules/mining/machine_stacking.dm @@ -44,11 +44,13 @@ if(machine.ore_diamond) dat += text("Diamond: [machine.ore_diamond] Release
") if(machine.ore_clown) - dat += text("Bananium: [machine.ore_clown] Release

") + dat += text("Bananium: [machine.ore_clown] Release
") if(machine.ore_adamantine) - dat += text ("Adamantine: [machine.ore_adamantine] Release

") + dat += text ("Adamantine: [machine.ore_adamantine] Release
") + if(machine.ore_mythril) + dat += text ("Mythril: [machine.ore_mythril] Release
") - dat += text("Stacking: [machine.stack_amt]

") + dat += text("
Stacking: [machine.stack_amt]

") user << browse("[dat]", "window=console_stacking_machine") @@ -125,6 +127,12 @@ G.amount = machine.ore_adamantine G.loc = machine.output.loc machine.ore_adamantine = 0 + if ("mythril") + if (machine.ore_mythril > 0) + var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril + G.amount = machine.ore_mythril + G.loc = machine.output.loc + machine.ore_mythril = 0 src.updateUsrDialog() return @@ -155,6 +163,7 @@ var/ore_rglass = 0; var/ore_plasteel = 0; var/ore_adamantine = 0; + var/ore_mythril = 0; var/stack_amt = 50; //ammount to stack before releassing /obj/machinery/mineral/stacking_machine/New() @@ -219,6 +228,10 @@ ore_adamantine+= O:amount del(O) continue + if (istype(O,/obj/item/stack/sheet/mythril)) + ore_mythril+= O:amount + del(O) + continue if (istype(O,/obj/item/weapon/ore/slag)) del(O) continue @@ -289,4 +302,10 @@ G.loc = output.loc ore_adamantine -= stack_amt return + if (ore_mythril >= stack_amt) + var/obj/item/stack/sheet/mythril/G = new /obj/item/stack/sheet/mythril + G.amount = stack_amt + G.loc = output.loc + ore_mythril -= stack_amt + return return diff --git a/code/modules/mining/machine_unloading.dm b/code/modules/mining/machine_unloading.dm index 149218e5720..2636806ca78 100644 --- a/code/modules/mining/machine_unloading.dm +++ b/code/modules/mining/machine_unloading.dm @@ -20,7 +20,6 @@ for (var/dir in cardinal) src.output = locate(/obj/machinery/mineral/output, get_step(src, dir)) if(src.output) break - processing_objects.Add(src) return return diff --git a/code/modules/mining/mine_turfs.dm b/code/modules/mining/mine_turfs.dm index d44cded8637..08755336fd5 100644 --- a/code/modules/mining/mine_turfs.dm +++ b/code/modules/mining/mine_turfs.dm @@ -162,15 +162,6 @@ spread = 1 -/turf/simulated/mineral/adamantine - name = "Adamantine deposit" - icon_state = "rock_Adamantine" - mineralName = "Adamantine" - mineralAmt = 3 - spreadChance = 0 - spread = 0 //It shouldn't spawn yet; will change these to match diamond once it's fully implemented. -Durandan - - /turf/simulated/mineral/clown name = "Bananium deposit" icon_state = "rock_Clown" @@ -255,8 +246,6 @@ new /obj/item/weapon/ore/diamond(src) if (src.mineralName == "Clown") new /obj/item/weapon/ore/clown(src) - if (src.mineralName == "Adamantine") - new /obj/item/weapon/ore/adamantine(src) ReplaceWithFloor() return diff --git a/code/modules/mining/mint.dm b/code/modules/mining/mint.dm index 7d05e8bbbce..b301fbe532a 100644 --- a/code/modules/mining/mint.dm +++ b/code/modules/mining/mint.dm @@ -17,6 +17,7 @@ var/amt_uranium = 0 var/amt_clown = 0 var/amt_adamantine = 0 + var/amt_mythril = 0 var/newCoins = 0 //how many coins the machine made in it's last load var/processing = 0 var/chosen = "metal" //which material will be used to make coins @@ -249,6 +250,18 @@ newCoins++ src.updateUsrDialog() sleep(5); + if("mythril") + while(amt_adamantine > 0 && coinsToProduce > 0) + if (locate(/obj/item/weapon/moneybag,output.loc)) + M = locate(/obj/item/weapon/moneybag,output.loc) + else + M = new/obj/item/weapon/moneybag(output.loc) + new /obj/item/weapon/coin/mythril(M) + amt_mythril -= 20 + coinsToProduce-- + newCoins++ + src.updateUsrDialog() + sleep(5); icon_state = "coinpress0" processing = 0; coinsToProduce = temp_coins diff --git a/code/modules/mining/ores_materials_coins.dm b/code/modules/mining/ores_materials_coins.dm index 02eca2ef5ca..573dc34714c 100644 --- a/code/modules/mining/ores_materials_coins.dm +++ b/code/modules/mining/ores_materials_coins.dm @@ -73,11 +73,6 @@ icon_state = "Clown ore" origin_tech = "materials=4" -/obj/item/weapon/ore/adamantine - name = "Adamantine ore" - icon_state = "Adamantine ore" - origin_tech = "materials=5" - /obj/item/weapon/ore/slag name = "Slag" desc = "Completely useless" @@ -136,6 +131,10 @@ name = "Adamantine coin" icon_state = "coin_adamantine" +/obj/item/weapon/coin/mythril + name = "Mythril coin" + icon_state = "coin_mythril" + /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/cable_coil) ) var/obj/item/weapon/cable_coil/CC = W @@ -257,6 +256,16 @@ throw_range = 3 origin_tech = "materials=4" +/obj/item/stack/sheet/mythril + name = "mythril" + icon_state = "sheet-mythril" + force = 5.0 + throwforce = 5 + w_class = 3.0 + throw_speed = 3 + throw_range = 3 + origin_tech = "materials=4" + /obj/item/stack/sheet/clown name = "bananium" icon_state = "sheet-clown" diff --git a/code/modules/mining/satchel_ore_box.dm b/code/modules/mining/satchel_ore_box.dm index c49cb19258d..e905570fc8f 100644 --- a/code/modules/mining/satchel_ore_box.dm +++ b/code/modules/mining/satchel_ore_box.dm @@ -65,7 +65,6 @@ var/amt_plasma = 0 var/amt_uranium = 0 var/amt_clown = 0 - var/amt_adamantine = 0 for (var/obj/item/weapon/ore/C in contents) if (istype(C,/obj/item/weapon/ore/diamond)) @@ -84,8 +83,6 @@ amt_uranium++; if (istype(C,/obj/item/weapon/ore/clown)) amt_clown++; - if (istype(C,/obj/item/weapon/ore/adamantine)) - amt_adamantine++; var/dat = text("The contents of the ore box reveal...
") if (amt_gold) @@ -104,8 +101,6 @@ dat += text("Uranium ore: [amt_uranium]
") if (amt_clown) dat += text("Bananium ore: [amt_clown]
") - if (amt_adamantine) - dat += text("Adamantine ore: [amt_adamantine]
") dat += text("

Empty box") user << browse("[dat]", "window=orebox")