mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-25 21:19:00 +01:00
[TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209)
* initial edits * initial edits * converting shit over to machinery/economy * vending and mapping fixes * vending fix pt.2 * Converts Supply Economy to Use Space Credits instead of Supply Points * Job Payment, NanoBank, and Paychecks * clothing type path fixes (damn merge conflicts) * fixes map typepath issues * adjusts supply prices * Vendor Price Adjustments * account uplink terminal tweaks * please pass tests * Apply suggestions from code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * reviews and bug fixes * Review Suggestions/Fixes and Request Console Rewrite * edits * vending changes for merge * typepath fix * final tweaks * proc ref fixes * Fixes and Tweaks from 2nd TM * rebuild TGUI * final tweaks * Apply suggestions from code review Co-authored-by: Farie82 <farie82@users.noreply.github.com> * requested reviews * tweaks * updates slot machine winnings * fixes * GC fixes * fixes * oops. still need to deconflict this * Apply suggestions from code review Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com> * requested changes and bug fixes * atm runtime fix * requested reviews * vend act stuff * attempt to pass tests * supply packs fix * user tochat -> debug log * FINAL FIXES * removes CC db stuff * Apply suggestions from code review Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: Farie82 <farie82@users.noreply.github.com> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
This commit is contained in:
Sirryan2002
co-authored by
AffectedArc07
Farie82
Henri215
Luc
AffectedArc07
Farie82
Henri215
Luc
parent
ae8accb766
commit
61145a02f8
@@ -49,6 +49,7 @@ GLOBAL_LIST_EMPTY(PDAs)
|
||||
new/datum/data/pda/app/notekeeper,
|
||||
new/datum/data/pda/app/messenger,
|
||||
new/datum/data/pda/app/manifest,
|
||||
new/datum/data/pda/app/nanobank,
|
||||
new/datum/data/pda/app/atmos_scanner,
|
||||
new/datum/data/pda/utility/flashlight)
|
||||
var/list/shortcut_cache = list()
|
||||
@@ -267,6 +268,10 @@ GLOBAL_LIST_EMPTY(PDAs)
|
||||
playsound(src, 'sound/machines/terminal_error.ogg', 50, TRUE)
|
||||
return
|
||||
if(!owner)
|
||||
var/datum/data/pda/app/nanobank/nanobank_program = (locate(/datum/data/pda/app/nanobank) in programs)
|
||||
if(nanobank_program && idcard.associated_account_number)
|
||||
nanobank_program.reconnect_database()
|
||||
nanobank_program.user_account = nanobank_program.account_database?.find_user_account(idcard.associated_account_number)
|
||||
owner = idcard.registered_name
|
||||
ownjob = idcard.assignment
|
||||
ownrank = idcard.rank
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
/datum/data/pda/proc/program_hit_check()
|
||||
return
|
||||
|
||||
/datum/data/pda/proc/notify(message, blink = 1)
|
||||
/datum/data/pda/proc/notify(message, blink = 1, silence_ringtone = FALSE)
|
||||
if(message)
|
||||
//Search for holder of the PDA.
|
||||
var/mob/living/L = null
|
||||
@@ -36,7 +36,7 @@
|
||||
to_chat(L, "[bicon(pda)] [message]")
|
||||
SStgui.update_user_uis(L, pda) // Update the receiving user's PDA UI so that they can see the new message
|
||||
|
||||
if(!pda.silent)
|
||||
if(!pda.silent && !silence_ringtone)
|
||||
pda.play_ringtone()
|
||||
|
||||
if(blink && !(src in pda.notifying_programs))
|
||||
|
||||
@@ -366,7 +366,7 @@
|
||||
|
||||
var/supplyOrderCount = 0
|
||||
var/list/supplyOrderData = list()
|
||||
for(var/S in SSshuttle.shoppinglist)
|
||||
for(var/S in SSeconomy.shopping_list)
|
||||
var/datum/supply_order/SO = S
|
||||
supplyOrderCount++
|
||||
supplyOrderData[++supplyOrderData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "ApprovedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
|
||||
@@ -379,7 +379,7 @@
|
||||
|
||||
var/requestCount = 0
|
||||
var/list/requestData = list()
|
||||
for(var/S in SSshuttle.requestlist)
|
||||
for(var/S in SSeconomy.request_list)
|
||||
var/datum/supply_order/SO = S
|
||||
requestCount++
|
||||
requestData[++requestData.len] = list("Number" = SO.ordernum, "Name" = html_encode(SO.object.name), "OrderedBy" = SO.orderedby, "Comment" = html_encode(SO.comment))
|
||||
|
||||
@@ -0,0 +1,277 @@
|
||||
#define TRANSFER_REQUEST_MAX 5000
|
||||
#define TRANSFER_COOLDOWN 5 SECONDS
|
||||
|
||||
/datum/data/pda/app/nanobank
|
||||
name = "NanoBank"
|
||||
icon = "fas fa-university"
|
||||
notify_icon = "comments"
|
||||
title = "NanoBank 1.0"
|
||||
template = "pda_nanobank"
|
||||
update = PDA_APP_UPDATE_SLOW //we want to avoid iterating through the data lists constantly
|
||||
|
||||
///the money account tethered to this program
|
||||
var/datum/money_account/user_account
|
||||
///money account database this PDA is connected to
|
||||
var/datum/money_account_database/main_station/account_database
|
||||
///world time of last transaction, used for cooldowns (to protect against transfer spams or accidental double clicks)
|
||||
var/last_transaction = 0
|
||||
|
||||
/datum/data/pda/app/nanobank/start()
|
||||
. = ..()
|
||||
reconnect_database()
|
||||
|
||||
/datum/data/pda/app/nanobank/Destroy()
|
||||
if(user_account)
|
||||
//because we have a user account, we know its in the user account's anp list
|
||||
LAZYREMOVE(user_account.associated_nanobank_programs, src) //removing references to this program
|
||||
logout() //removing signals
|
||||
return ..()
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/reconnect_database()
|
||||
account_database = GLOB.station_money_database
|
||||
|
||||
/datum/data/pda/app/nanobank/update_ui(mob/user, list/data)
|
||||
|
||||
if(pda.id)
|
||||
data["card_account_num"] = pda.id.associated_account_number
|
||||
|
||||
data["requests"] = list()
|
||||
data["available_accounts"] = list()
|
||||
data["transaction_log"] = list()
|
||||
data["db_status"] = account_database.online
|
||||
data["logged_in"] = FALSE
|
||||
if(user_account)
|
||||
data["logged_in"] = TRUE
|
||||
data["owner_name"] = user_account.account_name
|
||||
data["money"] = user_account.credit_balance
|
||||
data["security_level"] = user_account.security_level
|
||||
data["is_department_account"] = (user_account.account_type == ACCOUNT_TYPE_DEPARTMENT)
|
||||
if(data["is_department_account"])
|
||||
data["department_members"] = list()
|
||||
for(var/datum/station_department/department as anything in SSjobs.station_departments)
|
||||
if(department.department_account == user_account)
|
||||
data["auto_approve_amount"] = department.auto_approval_cap
|
||||
data["auto_approve"] = department.crate_auto_approve
|
||||
for(var/datum/department_member/member in department.members)
|
||||
var/list/member_data = list(
|
||||
"name" = member.name,
|
||||
"job" = member.role,
|
||||
"can_approve" = member.can_approve_crates,
|
||||
)
|
||||
data["department_members"] += list(member_data)
|
||||
break
|
||||
data["transaction_log"] = list()
|
||||
for(var/datum/transaction/T as anything in user_account.account_log)
|
||||
var/list/transaction_info = list(
|
||||
"time" = T.time,
|
||||
"target_name" = T.transactor,
|
||||
"purpose" = T.purpose,
|
||||
"amount" = T.amount,
|
||||
"is_deposit" = T.is_deposit
|
||||
)
|
||||
data["transaction_log"] += list(transaction_info)
|
||||
|
||||
|
||||
for(var/datum/transfer_request/request as anything in user_account.transfer_requests)
|
||||
var/list/request_data = list(
|
||||
"purpose" = request.purpose,
|
||||
"amount" = request.amount,
|
||||
"time" = FLOOR((world.time - request.time) / (1 MINUTES), 1),
|
||||
"requester" = request.requesting_account.account_name,
|
||||
"request_id" = request.UID())
|
||||
data["requests"] += list(request_data)
|
||||
|
||||
data["available_accounts"] = get_available_account_data()
|
||||
|
||||
return data
|
||||
|
||||
/datum/data/pda/app/nanobank/ui_act(action, list/params, datum/tgui/ui)
|
||||
if(..())
|
||||
return
|
||||
|
||||
unnotify()
|
||||
var/mob/user = ui.user
|
||||
var/play_beep = TRUE
|
||||
|
||||
. = TRUE
|
||||
|
||||
switch(action)
|
||||
if("login")
|
||||
var/tried_account_num = text2num(params["account_num"])
|
||||
var/tried_pin = text2num(params["account_pin"])
|
||||
attempt_login(tried_account_num, tried_pin, user)
|
||||
if("logout")
|
||||
logout()
|
||||
if("transfer")
|
||||
if(!user_account)
|
||||
return
|
||||
if(last_transaction + TRANSFER_COOLDOWN >= world.time)
|
||||
return
|
||||
var/transfer_amount = text2num(params["amount"])
|
||||
if(!transfer_amount || transfer_amount < 0) //if null, 0, or negative amount
|
||||
return
|
||||
var/datum/money_account/transfer_to = locateUID(params["transfer_to_account"])
|
||||
if(!istype(transfer_to) || transfer_to == src)
|
||||
return //account no longer exists or something fucked is going on
|
||||
if(transfer_funds(user, transfer_amount, transfer_to))
|
||||
to_chat(user, "<span class='notice'>NanoBank: Transfer Succesful</span>")
|
||||
last_transaction = world.time
|
||||
if(!pda.silent)
|
||||
playsound(pda, 'sound/machines/ping.ogg', 50, 0)
|
||||
if("transfer_request")
|
||||
if(!user_account)
|
||||
return
|
||||
if(last_transaction + TRANSFER_COOLDOWN >= world.time)
|
||||
return
|
||||
var/transfer_amount = text2num(params["amount"])
|
||||
var/purpose = length(params["purpose"]) ? params["purpose"] : ""
|
||||
if(length(purpose) >= MAX_NAME_LEN)
|
||||
error_message(user, "Purpose too long, please limit to [MAX_NAME_LEN] characters max")
|
||||
if(!transfer_amount || transfer_amount < 0) //if null, 0, or negative amount
|
||||
return
|
||||
var/datum/money_account/request_from = locateUID(params["transfer_to_account"])
|
||||
if(!istype(request_from) || request_from == user_account)
|
||||
return //account no longer exists or they're trying to send to themselves
|
||||
if(create_fund_request(user, transfer_amount, purpose, request_from))
|
||||
to_chat(user, "<span class='notice'>NanoBank: Transfer Request Submitted</span>")
|
||||
last_transaction = world.time
|
||||
if(!pda.silent)
|
||||
playsound(pda, 'sound/machines/ping.ogg', 50, 0)
|
||||
if("resolve_transfer_request")
|
||||
if(!user_account)
|
||||
return
|
||||
var/accepted = params["accepted"] ? TRUE : FALSE
|
||||
var/datum/transfer_request/request = locateUID(params["requestUID"])
|
||||
if(!istype(request) || !(request in user_account.transfer_requests))
|
||||
return
|
||||
account_database.resolve_transfer_request(request, user_account, accepted)
|
||||
if("set_security")
|
||||
if(!user_account)
|
||||
return
|
||||
var/new_sec_level = clamp(text2num(params["new_security_level"]), ACCOUNT_SECURITY_ID, ACCOUNT_SECURITY_PIN)
|
||||
if(!new_sec_level)
|
||||
return
|
||||
var/attempt_pin = input_account_pin(user)
|
||||
if(account_database.try_authenticate_login(user_account, attempt_pin, FALSE, FALSE, FALSE))
|
||||
user_account.security_level = new_sec_level
|
||||
if("toggle_member_approval")
|
||||
for(var/datum/station_department/department as anything in SSjobs.station_departments)
|
||||
if(department.department_account == user_account)
|
||||
for(var/datum/department_member/member in department.members)
|
||||
if(member.name == params["member"] && member.member_account != user_account)
|
||||
member.can_approve_crates = !member.can_approve_crates
|
||||
break
|
||||
break
|
||||
if("toggle_auto_approve")
|
||||
for(var/datum/station_department/department as anything in SSjobs.station_departments)
|
||||
if(department.department_account == user_account)
|
||||
department.crate_auto_approve = !department.crate_auto_approve
|
||||
break
|
||||
if("set_approve_amount")
|
||||
var/new_amount = text2num(params["approve_amount"])
|
||||
for(var/datum/station_department/department as anything in SSjobs.station_departments)
|
||||
if(department.department_account == user_account)
|
||||
if(new_amount)
|
||||
department.auto_approval_cap = clamp(new_amount, 0, 3000)
|
||||
else
|
||||
department.auto_approval_cap = 0
|
||||
|
||||
if(play_beep && !pda.silent)
|
||||
playsound(pda, 'sound/machines/terminal_select.ogg', 15, TRUE)
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/attempt_login(tried_account_num, tried_pin, mob/user)
|
||||
if(!tried_account_num)
|
||||
to_chat(user, "<span class='warning'>Authentification Failure: Account number not found.</span>")
|
||||
return FALSE
|
||||
|
||||
var/datum/money_account/attempt_account = account_database.find_user_account(tried_account_num, include_departments = TRUE)
|
||||
if(!attempt_account)
|
||||
to_chat(user, "<span class='warning'>Authentification Failure: User Account Not Found.</span>")
|
||||
return FALSE
|
||||
|
||||
if(account_database.try_authenticate_login(attempt_account, tried_pin, TRUE, FALSE, FALSE))
|
||||
user_account = attempt_account
|
||||
//lets make sure to logout if the account gets deleted somehow (such as cryo'ing)
|
||||
RegisterSignal(user_account, COMSIG_PARENT_QDELETING, PROC_REF(logout))
|
||||
if(!LAZYLEN(user_account.associated_nanobank_programs) || !(src in user_account.associated_nanobank_programs))
|
||||
LAZYADD(user_account.associated_nanobank_programs, src)
|
||||
return TRUE
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/logout()
|
||||
if(!user_account)
|
||||
return
|
||||
//even though this is a LAZYLIST, we know it has a single entry on it because we're connected to the account
|
||||
LAZYREMOVE(user_account.associated_nanobank_programs, src)
|
||||
UnregisterSignal(user_account, COMSIG_PARENT_QDELETING)
|
||||
user_account = null
|
||||
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/transfer_funds(mob/user, amount, datum/money_account/target)
|
||||
if(account_database.charge_account(user_account, amount, "Transfer to [target.account_name]", "NanoBank Transfer Services", FALSE, FALSE))
|
||||
account_database.credit_account(target, amount, "Transfer from [user_account.account_name]", "NanoBank Transfer Services", FALSE)
|
||||
return TRUE
|
||||
else
|
||||
error_message(user, "Insufficient Funds")
|
||||
return FALSE
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/create_fund_request(mob/user, amount, purpose, datum/money_account/target)
|
||||
if(!target)
|
||||
error_message(user, "Target Account Not Found")
|
||||
return FALSE
|
||||
if(!amount)
|
||||
error_message(user, "Please input an amount to request")
|
||||
return FALSE
|
||||
account_database.create_transfer_request(user_account, amount, purpose, target)
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/change_account_security(mob/user, attempted_pin, new_security_level)
|
||||
if(new_security_level >= ACCOUNT_SECURITY_RESTRICTED || new_security_level < ACCOUNT_SECURITY_ID)
|
||||
error_message(user, "Unable to apply selected security restrictions")
|
||||
///attempted new security level is NOT an available option, likely user spoofing values
|
||||
message_admins("[ADMIN_LOOKUPFLW(user)] attempted to set account security to an unavailable option, possible href exploit!")
|
||||
return
|
||||
if(account_database.try_authenticate_login(user_account, attempted_pin, FALSE, FALSE, FALSE))
|
||||
user_account.security_level = new_security_level
|
||||
else
|
||||
error_message(user, "Incorrect Credentials")
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/input_account_pin(mob/user)
|
||||
var/attempt_pin = input("Enter pin code", "NanoBank Account Auth") as num
|
||||
if(!user_account || !attempt_pin)
|
||||
return
|
||||
return attempt_pin
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/error_message(mob/user, message)
|
||||
to_chat(user, "<span class='warning'>ERROR: [message].</span>")
|
||||
if(!pda.silent)
|
||||
playsound(pda, 'sound/machines/terminal_error.ogg', 15, TRUE)
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/get_available_account_data()
|
||||
var/list/found_accounts = list()
|
||||
for(var/datum/money_account/account as anything in account_database.user_accounts)
|
||||
if(account != user_account)
|
||||
var/list/account_data = list(
|
||||
"name" = account.account_name,
|
||||
"UID" = account.UID()
|
||||
)
|
||||
found_accounts += list(account_data)
|
||||
for(var/department in account_database.department_accounts)
|
||||
var/datum/money_account/account = account_database.department_accounts[department]
|
||||
var/list/account_data = list(
|
||||
"name" = account.account_name,
|
||||
"UID" = account.UID()
|
||||
)
|
||||
found_accounts += list(account_data)
|
||||
return found_accounts
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/announce_payday(amount)
|
||||
if(ishuman(pda.loc))
|
||||
var/mob/user = pda.loc
|
||||
if(user.stat != UNCONSCIOUS) // Awake or dead people can see their messages
|
||||
to_chat(user, "<span class='notice'>NanoBank: Paycheck of [amount] credits received</span>")
|
||||
if(!pda.silent)
|
||||
playsound(pda, 'sound/machines/ping.ogg', 50, 0)
|
||||
|
||||
/datum/data/pda/app/nanobank/proc/can_receive()
|
||||
return pda.owner && !hidden
|
||||
|
||||
#undef TRANSFER_COOLDOWN
|
||||
Reference in New Issue
Block a user