From ec6c9b4f00aba3cb6ebc2d46df989beb795dcc6f Mon Sep 17 00:00:00 2001 From: Reddeyfish Date: Mon, 16 Apr 2018 17:15:26 -0700 Subject: [PATCH] quick fix for coin values not working --- code/modules/mining/coins.dm | 8 ++++++++ code/modules/mining/mining_vending.dm | 18 +++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/modules/mining/coins.dm b/code/modules/mining/coins.dm index 2536f0ac2d..8923abac56 100644 --- a/code/modules/mining/coins.dm +++ b/code/modules/mining/coins.dm @@ -11,6 +11,7 @@ slot_flags = SLOT_EARS var/string_attached var/sides = 2 + var/mining_value = 1 /obj/item/weapon/coin/New() pixel_x = rand(0,16)-8 @@ -19,30 +20,37 @@ /obj/item/weapon/coin/gold name = "gold coin" icon_state = "coin_gold" + mining_value = 2 /obj/item/weapon/coin/silver name = "silver coin" icon_state = "coin_silver" + mining_value = 2 /obj/item/weapon/coin/diamond name = "diamond coin" icon_state = "coin_diamond" + mining_value = 15 /obj/item/weapon/coin/iron name = "iron coin" icon_state = "coin_iron" + mining_value = 1 /obj/item/weapon/coin/phoron name = "solid phoron coin" icon_state = "coin_phoron" + mining_value = 2 /obj/item/weapon/coin/uranium name = "uranium coin" icon_state = "coin_uranium" + mining_value = 2 /obj/item/weapon/coin/platinum name = "platinum coin" icon_state = "coin_adamantine" + mining_value = 3 /obj/item/weapon/coin/attackby(obj/item/weapon/W as obj, mob/user as mob) if(istype(W,/obj/item/stack/cable_coil)) diff --git a/code/modules/mining/mining_vending.dm b/code/modules/mining/mining_vending.dm index 47ba67bab6..418f82199c 100644 --- a/code/modules/mining/mining_vending.dm +++ b/code/modules/mining/mining_vending.dm @@ -45,8 +45,6 @@ /obj/item/weapon/pickaxe/drill = 5, /obj/item/weapon/pickaxe/jackhammer = 5, /obj/item/weapon/pickaxe/plasmacutter = 5, - /obj/item/weapon/pickaxe/borgdrill = 5, - /obj/item/weapon/pickaxe/diamonddrill = 3, /obj/item/device/gps/mining = 5, /obj/item/rig_module/device/drill = 3, ) @@ -68,19 +66,17 @@ /obj/item/weapon/pickaxe/drill = 15, /obj/item/weapon/pickaxe/jackhammer = 25, /obj/item/weapon/pickaxe/plasmacutter = 42, - /obj/item/weapon/pickaxe/borgdrill = 60, - /obj/item/weapon/pickaxe/diamonddrill = 90, /obj/item/device/gps/mining = 8, /obj/item/rig_module/device/drill = 12, ) var/list/coins = list( - /obj/item/weapon/coin/iron = 1, - /obj/item/weapon/coin/gold = 2, - /obj/item/weapon/coin/silver = 2, - /obj/item/weapon/coin/phoron = 2, - /obj/item/weapon/coin/uranium = 3, - /obj/item/weapon/coin/platinum = 3, + /obj/item/weapon/coin/iron, + /obj/item/weapon/coin/gold, + /obj/item/weapon/coin/silver, + /obj/item/weapon/coin/phoron, + /obj/item/weapon/coin/uranium, + /obj/item/weapon/coin/platinum, //does not accept diamond ) @@ -180,7 +176,7 @@ return 1 visible_message("\The [usr] inserts a coin into \the [src].") - points += coins[C] + points += C.mining_value usr.drop_from_inventory(C) qdel(C) return 1