More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.

This commit is contained in:
Zuhayr
2014-06-08 01:39:49 +09:30
parent 78918e4795
commit c3c6f72147
5 changed files with 47 additions and 14 deletions

View File

@@ -7,9 +7,11 @@ Mineral Sheets
- Phoron - Phoron
- Gold - Gold
- Silver - Silver
- Clown
Others:
- Enriched Uranium - Enriched Uranium
- Platinum
- Metallic Hydrogen
- Tritium
- Osmium
*/ */
var/global/list/datum/stack_recipe/sandstone_recipes = list ( \ var/global/list/datum/stack_recipe/sandstone_recipes = list ( \
@@ -46,6 +48,11 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \ new/datum/stack_recipe("plastic bag", /obj/item/weapon/storage/bag/plasticbag, 3, on_floor = 1), \
) )
var/global/list/datum/stack_recipe/iron_recipes = list ( \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
null, \
)
/obj/item/stack/sheet/mineral /obj/item/stack/sheet/mineral
force = 5.0 force = 5.0
throwforce = 5 throwforce = 5
@@ -58,6 +65,18 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
pixel_x = rand(0,4)-4 pixel_x = rand(0,4)-4
pixel_y = rand(0,4)-4 pixel_y = rand(0,4)-4
obj/item/stack/sheet/mineral/iron
name = "iron"
icon_state = "sheet-silver"
origin_tech = "materials=1"
sheettype = "iron"
color = "#333333"
perunit = 3750
obj/item/stack/sheet/mineral/iron/New()
..()
recipes = iron_recipes
/obj/item/stack/sheet/mineral/sandstone /obj/item/stack/sheet/mineral/sandstone
name = "sandstone brick" name = "sandstone brick"
desc = "This appears to be a combination of both sand and stone." desc = "This appears to be a combination of both sand and stone."
@@ -149,22 +168,28 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
origin_tech = "materials=5" origin_tech = "materials=5"
perunit = 1000 perunit = 1000
//Valuable resource, cargo can sell it.
/obj/item/stack/sheet/mineral/platinum /obj/item/stack/sheet/mineral/platinum
name = "platinum" name = "platinum"
icon_state = "sheet-adamantine" icon_state = "sheet-adamantine"
origin_tech = "materials=2"
sheettype = "platinum" sheettype = "platinum"
perunit = 2000 perunit = 2000
//Extremely valuable to Research.
/obj/item/stack/sheet/mineral/mhydrogen /obj/item/stack/sheet/mineral/mhydrogen
name = "metallic hydrogen" name = "metallic hydrogen"
icon_state = "sheet-mythril" icon_state = "sheet-mythril"
origin_tech = "materials=6;powerstorage=5;magnets=5"
sheettype = "mhydrogen" sheettype = "mhydrogen"
perunit = 2000 perunit = 2000
//Fuel for MRSPACMAN generator.
/obj/item/stack/sheet/mineral/tritium /obj/item/stack/sheet/mineral/tritium
name = "tritium" name = "tritium"
icon_state = "sheet-silver" icon_state = "sheet-silver"
sheettype = "tritium" sheettype = "tritium"
origin_tech = "materials=5"
color = "#777777" color = "#777777"
perunit = 2000 perunit = 2000
@@ -172,12 +197,6 @@ var/global/list/datum/stack_recipe/plastic_recipes = list ( \
name = "osmium" name = "osmium"
icon_state = "sheet-silver" icon_state = "sheet-silver"
sheettype = "osmium" sheettype = "osmium"
origin_tech = "materials=5"
color = "#9999FF" color = "#9999FF"
perunit = 2000 perunit = 2000
obj/item/stack/sheet/mineral/iron
name = "iron"
icon_state = "sheet-silver"
sheettype = "iron"
color = "#333333"
perunit = 3750

View File

@@ -70,7 +70,6 @@ var/global/list/datum/stack_recipe/metal_recipes = list ( \
new/datum/stack_recipe("air alarm frame", /obj/item/alarm_frame, 2), \ new/datum/stack_recipe("air alarm frame", /obj/item/alarm_frame, 2), \
new/datum/stack_recipe("fire alarm frame", /obj/item/firealarm_frame, 2), \ new/datum/stack_recipe("fire alarm frame", /obj/item/firealarm_frame, 2), \
null, \ null, \
new/datum/stack_recipe("iron door", /obj/structure/mineral_door/iron, 20, one_per_turf = 1, on_floor = 1), \
) )
/obj/item/stack/sheet/metal /obj/item/stack/sheet/metal

View File

@@ -134,7 +134,8 @@ var/list/mechtoys = list(
var/points_per_process = 1 var/points_per_process = 1
var/points_per_slip = 2 var/points_per_slip = 2
var/points_per_crate = 5 var/points_per_crate = 5
var/phoron_per_point = 2 // 2 phoron for 1 point var/points_per_platinum = 5 // 5 points per sheet
var/points_per_phoron = 5
//control //control
var/ordernum var/ordernum
var/list/shoppinglist = list() var/list/shoppinglist = list()
@@ -213,6 +214,7 @@ var/list/mechtoys = list(
if(!shuttle) return if(!shuttle) return
var/phoron_count = 0 var/phoron_count = 0
var/plat_count = 0
for(var/atom/movable/MA in shuttle) for(var/atom/movable/MA in shuttle)
if(MA.anchored) continue if(MA.anchored) continue
@@ -238,10 +240,19 @@ var/list/mechtoys = list(
if(istype(A, /obj/item/stack/sheet/mineral/phoron)) if(istype(A, /obj/item/stack/sheet/mineral/phoron))
var/obj/item/stack/sheet/mineral/phoron/P = A var/obj/item/stack/sheet/mineral/phoron/P = A
phoron_count += P.amount phoron_count += P.amount
// Sell platinum
if(istype(A, /obj/item/stack/sheet/mineral/platinum))
var/obj/item/stack/sheet/mineral/platinum/P = A
plat_count += P.amount
del(MA) del(MA)
if(phoron_count) if(phoron_count)
points += Floor(phoron_count / phoron_per_point) points += phoron_count * points_per_phoron
if(plat_count)
points += plat_count * points_per_platinum
//Buyin //Buyin
proc/buy() proc/buy()

View File

@@ -39,6 +39,10 @@
name = "uranium coin" name = "uranium coin"
icon_state = "coin_uranium" icon_state = "coin_uranium"
/obj/item/weapon/coin/platinum
name = "platinum coin"
icon_state = "coin_adamantine"
/obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob)
if(istype(W,/obj/item/weapon/cable_coil) ) if(istype(W,/obj/item/weapon/cable_coil) )
var/obj/item/weapon/cable_coil/CC = W var/obj/item/weapon/cable_coil/CC = W

View File

@@ -338,7 +338,7 @@ display round(lastgen) and phorontank amount
/obj/machinery/power/port_gen/pacman/mrs /obj/machinery/power/port_gen/pacman/mrs
name = "M.R.S.P.A.C.M.A.N.-type Portable Generator" name = "M.R.S.P.A.C.M.A.N.-type Portable Generator"
icon_state = "portgen2" icon_state = "portgen2"
sheet_path = /obj/item/stack/sheet/mineral/diamond sheet_path = /obj/item/stack/sheet/mineral/tritium
power_gen = 40000 power_gen = 40000
time_per_sheet = 80 time_per_sheet = 80
board_path = "/obj/item/weapon/circuitboard/pacman/mrs" board_path = "/obj/item/weapon/circuitboard/pacman/mrs"