Merge pull request #14912 from Youtubeboy139/Thaler-Change

It's all bout that Money Money Money
This commit is contained in:
Heroman3003
2023-06-02 04:50:34 +10:00
committed by CHOMPStation2
parent f5ab670839
commit b37a023823
6 changed files with 17 additions and 8 deletions

View File

@@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(plant_item_products, list(
/obj/item/organ/internal/brain/grey = 1,
/obj/item/organ/internal/heart/grey = 1,
/obj/item/weapon/spacecash/c1 = 3,
/obj/item/weapon/spacecash/c10 = 1
/obj/item/weapon/spacecash/c5 = 1
))
GLOBAL_LIST_INIT(forbidden_plant_growth_sprites, list(

View File

@@ -276,6 +276,7 @@
/obj/random/cash/item_to_spawn()
return pick(prob(320);/obj/random/maintenance/clean,
prob(12);/obj/item/weapon/spacecash/c1,
prob(10);/obj/item/weapon/spacecash/c5,
prob(8);/obj/item/weapon/spacecash/c10,
prob(4);/obj/item/weapon/spacecash/c20,
prob(1);/obj/item/weapon/spacecash/c50,

View File

@@ -190,6 +190,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/clothing/under/harness,
/obj/item/clothing/accessory/storage/webbing,
/obj/item/weapon/spacecash/c1,
/obj/item/weapon/spacecash/c5,
/obj/item/weapon/spacecash/c10,
/obj/item/weapon/spacecash/c20,
/obj/item/weapon/camera_assembly,

View File

@@ -3,7 +3,7 @@
var/initial_name = "Thaler"
desc = "It's worth 0 Thalers."
gender = PLURAL
icon = 'icons/obj/items.dmi'
icon = 'icons/obj/economy.dmi'
icon_state = "spacecash1"
opacity = 0
density = FALSE
@@ -38,24 +38,24 @@
/obj/item/weapon/spacecash/update_icon()
cut_overlays()
name = "[worth] [initial_name]\s"
if(worth in list(1000,500,200,100,50,20,10,1))
if(worth in list(1000,500,200,100,50,20,10,5,1))
icon_state = "spacecash[worth]"
desc = "It's worth [worth] [initial_name]s."
return
var/sum = src.worth
var/num = 0
for(var/i in list(1000,500,200,100,50,20,10,1))
for(var/i in list(1000,500,200,100,50,20,10,5,1))
while(sum >= i && num < 50)
sum -= i
num++
var/image/banknote = image('icons/obj/items.dmi', "spacecash[i]")
var/image/banknote = image('icons/obj/economy.dmi', "spacecash[i]")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
banknote.transform = M
add_overlay(banknote)
if(num == 0) // Less than one thaler, let's just make it look like 1 for ease
var/image/banknote = image('icons/obj/items.dmi', "spacecash1")
var/image/banknote = image('icons/obj/economy.dmi', "spacecash1")
var/matrix/M = matrix()
M.Translate(rand(-6, 6), rand(-4, 8))
M.Turn(pick(-45, -27.5, 0, 0, 0, 0, 0, 0, 0, 27.5, 45))
@@ -96,9 +96,15 @@
/obj/item/weapon/spacecash/c1
name = "1 Thaler"
icon_state = "spacecash1"
desc = "It's worth 1 credit."
desc = "It's worth 1 Thaler."
worth = 1
/obj/item/weapon/spacecash/c5
name = "5 Thaler"
icon_state = "spacecash5"
desc = "It's worth 5 Thalers."
worth = 5
/obj/item/weapon/spacecash/c10
name = "10 Thaler"
icon_state = "spacecash10"

View File

@@ -35,7 +35,8 @@ GLOBAL_LIST_INIT(generic_fishing_pool_list, list(
/obj/random/junk = 80,
/obj/random/trash = 80,
/obj/item/weapon/spacecash/c1 = 10,
/obj/item/weapon/spacecash/c10 = 5,
/obj/item/weapon/spacecash/c5 = 3,
/obj/item/weapon/spacecash/c10 = 2,
/obj/item/weapon/spacecash/c100 = 1
))

BIN
icons/obj/economy.dmi Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.2 KiB