mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
Improves/fixes surplus crate item selection
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
/datum/uplink_item/item/ammo
|
||||
item_cost = 20
|
||||
category = /datum/uplink_category/ammunition
|
||||
blacklisted = 1
|
||||
|
||||
/datum/uplink_item/item/ammo/a357
|
||||
name = ".357 Speedloader"
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
*****************/
|
||||
/datum/uplink_item/abstract/announcements
|
||||
category = /datum/uplink_category/services
|
||||
blacklisted = 1
|
||||
|
||||
/datum/uplink_item/abstract/announcements/buy(var/obj/item/device/uplink/U, var/mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -19,6 +19,7 @@
|
||||
/datum/uplink_item/item/badassery/random_one
|
||||
name = "Random Item"
|
||||
desc = "Buys you one random item."
|
||||
blacklisted = 1
|
||||
|
||||
/datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
|
||||
var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)
|
||||
|
||||
@@ -28,13 +28,10 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
|
||||
for(var/i = 0; i < attempts; i++)
|
||||
var/datum/uplink_random_item/RI
|
||||
if(items_override)
|
||||
world << 1
|
||||
RI = pick(all_items)
|
||||
else
|
||||
world << 2
|
||||
RI = pick(items)
|
||||
if(!prob(RI.keep_probability))
|
||||
world << 3
|
||||
continue
|
||||
var/datum/uplink_item/I = uplink.items_assoc[RI.uplink_item]
|
||||
if(I.cost(telecrystals, U) > telecrystals)
|
||||
@@ -46,6 +43,7 @@ var/datum/uplink_random_selection/all_uplink_selection = new/datum/uplink_random
|
||||
return I
|
||||
|
||||
/datum/uplink_random_selection/all/New()
|
||||
..()
|
||||
for(var/datum/uplink_item/item in uplink.items)
|
||||
if(item.blacklisted)
|
||||
continue
|
||||
|
||||
Reference in New Issue
Block a user