cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Fixes the 20+ TC items' discounts being applied incorrectly [MDB IGNORE] (#19697)

Browse Source 
* Fixes the 20+ TC items' discounts being applied incorrectly (#73597)

## About The Pull Request

When #22429 was added, the author's expressed intention was to make 20+
TC items discount less. However, by accident, it has been instead
doubled. I have fixed this problem, while also inverting the values in
`get_discount` to make the calculations easier, and make it clearer what
the return value of the proc is for.

This way, if the 140 TC mauler rolls 75% off, it will be 38% off instead
for 87.5 TC, instead of 87% off for 17 TC.

Also autodocced some procs.

## Why It's Good For The Game

Makes the code work as originally intended.

## Changelog

🆑
fix: 20+ item's discounts are properly smaller, instead of being larger
/🆑

* Fixes the 20+ TC items' discounts being applied incorrectly

---------

Co-authored-by: Profakos <profakos@gmail.com>
This commit is contained in:
SkyratBot
2023-03-07 03:22:54 +01:00
committed by GitHub
parent e62df8f5f0
commit fe550fa77c
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/uplink/uplink_items.dm
+26 -2
View File
@@ -1,5 +1,9 @@
#define TRAITOR_DISCOUNT_BIG "big_discount"
#define TRAITOR_DISCOUNT_AVERAGE "average_discount"
#define TRAITOR_DISCOUNT_SMALL "small_discount"
// TODO: Work into reworked uplinks.
/// Selects a set number of unique items from the uplink, and deducts a percentage discount from them
/proc/create_uplink_sales(num, datum/uplink_category/category, limited_stock, list/sale_items)
var/list/sales = list()
var/list/sale_items_copy = sale_items.Copy()
@@ -12,7 +16,7 @@
if(uplink_item.cost >= 20) //Tough love for nuke ops
discount *= 0.5
uplink_item.category = category
uplink_item.cost = max(round(uplink_item.cost * discount),1)
uplink_item.cost = max(round(uplink_item.cost * (1 - discount)),1)
uplink_item.name += " ([round(((initial(uplink_item.cost)-uplink_item.cost)/initial(uplink_item.cost))*100)]% off!)"
uplink_item.desc += " Normally costs [initial(uplink_item.cost)] TC. All sales final. [pick(disclaimer)]"
uplink_item.item = taken_item.item
@@ -80,15 +84,31 @@
/// Weight of the category. Used to determine the positioning in the uplink. High weight = appears first
var/weight = 0
/// Returns by how much percentage do we reduce the price of the selected item
/datum/uplink_item/proc/get_discount()
return pick(4;0.75,2;0.5,1;0.25)
var/static/list/discount_types = list(
TRAITOR_DISCOUNT_SMALL = 4,
TRAITOR_DISCOUNT_AVERAGE = 2,
TRAITOR_DISCOUNT_BIG = 1,
)
switch(pick_weight(discount_types))
if(TRAITOR_DISCOUNT_BIG)
return 0.75
if(TRAITOR_DISCOUNT_AVERAGE)
return 0.5
else
return 0.25
/// Spawns an item and logs its purchase
/datum/uplink_item/proc/purchase(mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
var/atom/A = spawn_item(item, user, uplink_handler, source)
log_uplink("[key_name(user)] purchased [src] for [cost] telecrystals from [source]'s uplink")
if(purchase_log_vis && uplink_handler.purchase_log)
uplink_handler.purchase_log.LogPurchase(A, src, cost)
/// Spawns an item in the world
/datum/uplink_item/proc/spawn_item(spawn_path, mob/user, datum/uplink_handler/uplink_handler, atom/movable/source)
if(!spawn_path)
return
@@ -136,3 +156,7 @@
/// Code that enables the ability to have limited stock that is shared by different items
/datum/shared_uplink_stock
#undef TRAITOR_DISCOUNT_BIG
#undef TRAITOR_DISCOUNT_AVERAGE
#undef TRAITOR_DISCOUNT_SMALL