Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vault: Loadout-based Activity Reward System #8305

Open
wants to merge 35 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
43ed58f
Vault: persistence set up
Doster-d Sep 6, 2023
c79460d
feat(vault): add vault into loadout
Doster-d Sep 10, 2023
7f461db
Vault: fix test
Doster-d Sep 13, 2023
1b31c64
Vault: fix loadout test
Doster-d Sep 13, 2023
15f3181
Vault: now can't sell items in vault
Doster-d Sep 15, 2023
65d94a5
Vault: add SQL support
Doster-d Sep 21, 2023
54fd4cf
Vault: DB support fix
Doster-d Sep 23, 2023
2a5221d
Merge branch 'master' into eris-coin-base
Doster-d Sep 27, 2023
bb6cfed
Vault: add support for discord bot
Doster-d Sep 30, 2023
158b6e8
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Oct 2, 2023
78d50e0
Vault: reward selecting menu
Doster-d Oct 4, 2023
ec4796f
Vault: fix linters
Doster-d Oct 4, 2023
9ea8b50
Vault: fix null error and lint JS code
Doster-d Oct 4, 2023
273891e
Vault: remove assert as IT doesnt have config
Doster-d Oct 4, 2023
ae2ee7b
Vault: final linter (JS compiler) fix
Doster-d Oct 4, 2023
2387bff
Vault: code style fix
Doster-d Oct 4, 2023
b6bbaa3
Vault: final things for release
Doster-d Oct 4, 2023
ae92edb
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Oct 22, 2023
b5a2844
tweak(Vault): resolve confilcts
Doster-d Oct 22, 2023
c567f1e
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Dec 23, 2023
4b897ea
fix tgui bundle
Doster-d Dec 23, 2023
d2774a9
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Feb 4, 2024
67b0ed5
temp
Doster-d Feb 10, 2024
1250e0e
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Feb 17, 2024
e429663
Merge remote-tracking branch 'upstream/master'
Doster-d Mar 2, 2024
5f91d23
Merge remote-tracking branch 'upstream/master'
Doster-d Sep 9, 2024
0c44bb6
Merge branch 'master' into eris-coin-base
Doster-d Sep 9, 2024
4f67598
Merge remote-tracking branch 'upstream/master' into eris-coin-base
Doster-d Oct 5, 2024
51bc079
revert anomaly commit
Doster-d Oct 5, 2024
71a2681
initial fix
Doster-d Oct 5, 2024
d53a606
lint test fix
Doster-d Oct 5, 2024
a16cfb0
add example use case
Doster-d Oct 6, 2024
241b0ef
example config update
Doster-d Oct 6, 2024
fb540d1
fix persistence save error
Doster-d Oct 28, 2024
2353240
fix missing icon, new write method
Doster-d Oct 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/ci_suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@ jobs:
run: |
sudo systemctl start mysql
mysql -u root -proot -e 'CREATE DATABASE tg_ci;'
mysql -u root -proot tg_ci < schema.sql
mysql -u root -proot tg_ci < ./sql/migrate/V0001_schema.sql
mysql -u root -proot tg_ci < ./sql/migrate/V0002_donations.sql
- name: Install rust-g
run: |
sudo dpkg --add-architecture i386
Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@
## CONTRIBUTING

Please see [CONTRIBUTING.md](CONTRIBUTING.md)

### DB guide

Please see [DB.md](docs/db.md)
7 changes: 7 additions & 0 deletions cev_eris.dme
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
#include "code\__DEFINES\trade.dm"
#include "code\__DEFINES\turfs.dm"
#include "code\__DEFINES\typeids.dm"
#include "code\__DEFINES\vault.dm"
#include "code\__DEFINES\verb_manager.dm"
#include "code\__DEFINES\weapons.dm"
#include "code\__DEFINES\ZAS.dm"
Expand Down Expand Up @@ -227,6 +228,7 @@
#include "code\controllers\subsystems\chunks.dm"
#include "code\controllers\subsystems\craft.dm"
#include "code\controllers\subsystems\dcs.dm"
#include "code\controllers\subsystems\donations.dm"
#include "code\controllers\subsystems\economy.dm"
#include "code\controllers\subsystems\evac.dm"
#include "code\controllers\subsystems\event.dm"
Expand All @@ -243,6 +245,7 @@
#include "code\controllers\subsystems\migration.dm"
#include "code\controllers\subsystems\misc.dm"
#include "code\controllers\subsystems\pai.dm"
#include "code\controllers\subsystems\persistence.dm"
#include "code\controllers\subsystems\ping.dm"
#include "code\controllers\subsystems\radio.dm"
#include "code\controllers\subsystems\research.dm"
Expand Down Expand Up @@ -454,6 +457,7 @@
#include "code\datums\outfits\jobs\security.dm"
#include "code\datums\perks\cooldown.dm"
#include "code\datums\perks\fate.dm"
#include "code\datums\perks\iriski.dm"
#include "code\datums\perks\job.dm"
#include "code\datums\perks\oddity.dm"
#include "code\datums\perks\perk.dm"
Expand Down Expand Up @@ -1526,6 +1530,7 @@
#include "code\modules\client\preference_setup\loadout\lists\suits.dm"
#include "code\modules\client\preference_setup\loadout\lists\uniforms.dm"
#include "code\modules\client\preference_setup\loadout\lists\utility.dm"
#include "code\modules\client\preference_setup\loadout\lists\vault.dm"
#include "code\modules\client\preference_setup\matchmaking\matchmaking.dm"
#include "code\modules\client\preference_setup\matchmaking\relations.dm"
#include "code\modules\client\preference_setup\matchmaking\relations_types.dm"
Expand Down Expand Up @@ -2787,6 +2792,8 @@
#include "code\modules\trade\machinery\trade_beacon.dm"
#include "code\modules\trade\machinery\circuits\trade_beacon.dm"
#include "code\modules\unit_tests\_unit_tests.dm"
#include "code\modules\vault\vault.dm"
#include "code\modules\vault\vault_control.dm"
#include "code\modules\vehicles\cargo_train.dm"
#include "code\modules\vehicles\train.dm"
#include "code\modules\vehicles\vehicle.dm"
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/perks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@
#define PERK_SURE_STEP /datum/perk/oddity/sure_step
#define PERK_MARKET_PROF /datum/perk/oddity/market_prof

// iriski perks
#define PERK_FREELANCERPLUS /datum/perk/iriski/freelancerplus

// NT perks
#define PERK_HOLY_LIGHT /datum/perk/nt_oddity/holy_light

Expand Down
6 changes: 4 additions & 2 deletions code/__DEFINES/subsystems.dm
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,10 @@
#define INIT_ORDER_LANGUAGE 11
#define INIT_ORDER_INVENTORY 10
#define INIT_ORDER_CHAR_SETUP 9
#define INIT_ORDER_ATOMS 8
#define INIT_ORDER_MACHINES 7
#define INIT_ORDER_PERSISTENCE 8
#define INIT_ORDER_DONATION 7
#define INIT_ORDER_ATOMS 6
#define INIT_ORDER_MACHINES 5
#define INIT_ORDER_TIMER 1
#define INIT_ORDER_DEFAULT 0
#define INIT_ORDER_AIR -1
Expand Down
19 changes: 19 additions & 0 deletions code/__DEFINES/vault.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#define VAULT_BALANCE "balance"
#define VAULT_ITEMS "items"
#define VAULT_ITEMS_DUBS "items_dubs"
#define VAULT_PATRON "patron"
#define VAULT_PATRON_0 "None"
#define VAULT_PATRON_1 "Vagabond"
#define VAULT_PATRON_2 "Guild Member"
#define VAULT_PATRON_3 "Neotheology Patron"

#define VAULT_TRANSACTION_TYPE_PURCHASE "vault_buy"
#define VAULT_TRANSACTION_TYPE_SELL "vault_sell"
#define VAULT_TRANSACTION_TYPE_ROUND_END "vault_round_end"

#define VAULT_REWARD_COST "cost"
#define VAULT_REWARD_IMAGE "icon"
#define VAULT_REWARD_NAME "name"
#define VAULT_REWARD_DESC "desc"
#define VAULT_REWARD_TYPE "item_type"
#define VAULT_REWARD_LOADOUT_TYPE "loadout_type"
1 change: 1 addition & 0 deletions code/_onclick/hud/HUD_element/client.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/client
var/list/HUD_elements //stores all elements shown to client, association list with index being element identifier
var/datum/player_vault/player_vault

/client/proc/hide_HUD_element(var/identifier)
if (!HUD_elements)
Expand Down
16 changes: 15 additions & 1 deletion code/controllers/configuration.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
var/log_hrefs = 0 // logs all links clicked in-game. Could be used for debugging and tracking down exploits
var/log_runtime = 0 // logs world.log to a file
var/log_world_output = 0 // log log_world(messages)
var/sql_enabled = 1 // for sql switching
var/sql_enabled = 0 // for sql switching
var/donation_track = 1 // for donation iriski track and patrons
var/allow_admin_ooccolor = 0 // Allows admins with relevant permissions to have their own ooc colour
var/allow_vote_restart = 0 // allow votes to restart
var/ert_admin_call_only = 0
Expand Down Expand Up @@ -299,6 +300,9 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
if ("sql_enabled")
config.sql_enabled = 1

if ("donation_track")
config.donation_track = 1

if ("log_say")
config.log_say = 1

Expand Down Expand Up @@ -820,6 +824,16 @@ GLOBAL_LIST_EMPTY(storyteller_cache)
sqllogin = value
if ("password")
sqlpass = value
if ("donation_address")
sqldonaddress = value
if ("donation_port")
sqldonport = value
if ("donation_database")
sqldondb = value
if ("donation_login")
sqldonlogin = value
if ("donation_password")
sqldonpass = value
else
log_misc("Unknown setting in configuration: '[name]'")

Expand Down
Loading
Loading