From 0993b5d402a77cb18c455ab04648e55f4ac8233c Mon Sep 17 00:00:00 2001 From: Legendaxe <102746941+Legendaxe@users.noreply.github.com> Date: Tue, 7 Nov 2023 14:18:43 +0200 Subject: [PATCH 1/3] tweak: loadout --- config/example/config.toml | 2 +- modular_ss220/donor/code/client_procs.dm | 30 +++++++++++++++ modular_ss220/loadout/_loadout.dme | 1 + modular_ss220/loadout/code/donor.dm | 45 +++++++++++++++++++++++ modular_ss220/loadout/code/donor_items.dm | 10 +++++ 5 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 modular_ss220/loadout/code/donor_items.dm diff --git a/config/example/config.toml b/config/example/config.toml index d895384ba86b..25311d096ea9 100644 --- a/config/example/config.toml +++ b/config/example/config.toml @@ -306,7 +306,7 @@ disable_ambient_noise = false # Enable this if you want to disable the popup alert for people on the same CID disable_cid_warning_popup = false # Amount of loadout points people should get -base_loadout_points = 5 +base_loadout_points = 4 # Respawnability loss penalty if you cryo below this threshold (Minutes) cryo_penalty_period = 30 # Enable twitter emojis in OOC? diff --git a/modular_ss220/donor/code/client_procs.dm b/modular_ss220/donor/code/client_procs.dm index 9b7d06f47e17..8e45b0a7a5f8 100644 --- a/modular_ss220/donor/code/client_procs.dm +++ b/modular_ss220/donor/code/client_procs.dm @@ -1,3 +1,5 @@ +#define MAX_SAVE_SLOTS_SS220 5 + /datum/client_login_processor/donator_check/process_result(datum/db_query/Q, client/C) if(IsGuestKey(C.ckey)) return @@ -21,6 +23,7 @@ if(10000 to INFINITY) C.donator_level = DONATOR_LEVEL_MAX C.donor_loadout_points() + C.donor_character_slots() /datum/client_login_processor/donator_check/get_query(client/C) var/datum/db_query/query = SSdbcore.NewQuery({" @@ -33,3 +36,30 @@ "}, list("ckey" = C.ckey)) return query + +/client/donor_loadout_points() + if(!prefs) + return + + prefs.max_gear_slots = GLOB.configuration.general.base_loadout_points + + switch(donator_level) + if(1) + prefs.max_gear_slots += 2 + if(2) + prefs.max_gear_slots += 4 + if(3) + prefs.max_gear_slots += 8 + if(4) + prefs.max_gear_slots += 12 + if(5) + prefs.max_gear_slots += 16 + +/client/proc/donor_character_slots() + if(!prefs) + return + + prefs.max_save_slots = MAX_SAVE_SLOTS_SS220 + donator_level * 5 + prefs.character_saves.len = prefs.max_save_slots + +#undef MAX_SAVE_SLOTS_SS220 diff --git a/modular_ss220/loadout/_loadout.dme b/modular_ss220/loadout/_loadout.dme index 9853029c9d8d..0f4bc51cc5c2 100644 --- a/modular_ss220/loadout/_loadout.dme +++ b/modular_ss220/loadout/_loadout.dme @@ -3,3 +3,4 @@ #include "code/donor.dm" #include "code/shoes.dm" #include "code/suit.dm" +#include "code/donor_items.dm" diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index 9d3d44c6ed01..4f6e253e7480 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -57,3 +57,48 @@ path = /obj/item/clothing/suit/hooded/vi_arcane donator_tier = 3 cost = 2 + +/datum/gear/donor/wallet + display_name = "Бумажник" + path = /obj/item/storage/wallet + cost = 18 + +/datum/gear/donor/firefirstaid + display_name = "Набор первой медицинской помощи от премиальной страховки" + path = /obj/item/storage/firstaid/regular/donor + cost = 6 + +/datum/gear/donor/airtank + display_name = "Спаренный балон от премиальной страховки" + path = /obj/item/tank/internals/emergency_oxygen/double + cost = 10 + +/datum/gear/donor/toolbelt + display_name = "Дедушкин пояс с инструментами" + path = /obj/item/storage/belt/utility + cost = 18 + +/datum/gear/donor/bruise_pack + display_name = "Медицинские бинты" + path = /obj/item/stack/medical/bruise_pack + cost = 2 + +/datum/gear/donor/ointment + display_name = "Мазь от ожогов" + path = /obj/item/stack/medical/ointment + cost = 2 + +/datum/gear/donor/charcoal + display_name = "Активированный уголь" + path = /obj/item/reagent_containers/syringe/charcoal + cost = 2 + +/datum/gear/donor/epinephrine + display_name = "Эпинефрин" + path = /obj/item/reagent_containers/hypospray/autoinjector/epinephrine + cost = 2 + +/datum/gear/donor/healthanalyzer + display_name = "Медицинский анализатор" + path = /obj/item/healthanalyzer + cost = 4 diff --git a/modular_ss220/loadout/code/donor_items.dm b/modular_ss220/loadout/code/donor_items.dm new file mode 100644 index 000000000000..5c0709ff29d8 --- /dev/null +++ b/modular_ss220/loadout/code/donor_items.dm @@ -0,0 +1,10 @@ +/obj/item/storage/firstaid/regular/donor + desc = "Набор первой медицинской помощи за оформление страховки" + icon_state = "firstaid" + +/obj/item/storage/firstaid/regular/donor/populate_contents() + new /obj/item/reagent_containers/food/pill/patch/styptic(src) + new /obj/item/reagent_containers/food/pill/salicylic(src) + new /obj/item/reagent_containers/food/pill/patch/silver_sulf(src) + new /obj/item/healthanalyzer(src) + new /obj/item/reagent_containers/hypospray/autoinjector/epinephrine(src) From 2b593d567c0dd4dbac6c7250bf0b62488f5b75fc Mon Sep 17 00:00:00 2001 From: Legendaxe <102746941+Legendaxe@users.noreply.github.com> Date: Tue, 7 Nov 2023 22:33:21 +0200 Subject: [PATCH 2/3] Alcoreru: price review --- modular_ss220/loadout/code/donor.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modular_ss220/loadout/code/donor.dm b/modular_ss220/loadout/code/donor.dm index 4f6e253e7480..60abcf1cd4f1 100644 --- a/modular_ss220/loadout/code/donor.dm +++ b/modular_ss220/loadout/code/donor.dm @@ -61,22 +61,22 @@ /datum/gear/donor/wallet display_name = "Бумажник" path = /obj/item/storage/wallet - cost = 18 + cost = 12 /datum/gear/donor/firefirstaid display_name = "Набор первой медицинской помощи от премиальной страховки" path = /obj/item/storage/firstaid/regular/donor - cost = 6 + cost = 12 /datum/gear/donor/airtank display_name = "Спаренный балон от премиальной страховки" path = /obj/item/tank/internals/emergency_oxygen/double - cost = 10 + cost = 3 /datum/gear/donor/toolbelt display_name = "Дедушкин пояс с инструментами" path = /obj/item/storage/belt/utility - cost = 18 + cost = 8 /datum/gear/donor/bruise_pack display_name = "Медицинские бинты" @@ -101,4 +101,4 @@ /datum/gear/donor/healthanalyzer display_name = "Медицинский анализатор" path = /obj/item/healthanalyzer - cost = 4 + cost = 2 From e5e6ecf8461629d69aa46ad2384dc46623cf2e53 Mon Sep 17 00:00:00 2001 From: Legendaxe <102746941+Legendaxe@users.noreply.github.com> Date: Mon, 13 Nov 2023 15:15:33 +0200 Subject: [PATCH 3/3] Alcore save slots review --- modular_ss220/donor/code/client_procs.dm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/modular_ss220/donor/code/client_procs.dm b/modular_ss220/donor/code/client_procs.dm index 8e45b0a7a5f8..a4aa3850a165 100644 --- a/modular_ss220/donor/code/client_procs.dm +++ b/modular_ss220/donor/code/client_procs.dm @@ -1,4 +1,4 @@ -#define MAX_SAVE_SLOTS_SS220 5 +#define MAX_SAVE_SLOTS_SS220 3 /datum/client_login_processor/donator_check/process_result(datum/db_query/Q, client/C) if(IsGuestKey(C.ckey)) @@ -59,7 +59,20 @@ if(!prefs) return - prefs.max_save_slots = MAX_SAVE_SLOTS_SS220 + donator_level * 5 + prefs.max_save_slots = MAX_SAVE_SLOTS_SS220 + + switch(donator_level) + if(1) + prefs.max_save_slots += 2 + if(2) + prefs.max_save_slots += 4 + if(3) + prefs.max_save_slots += 6 + if(4) + prefs.max_save_slots += 8 + if(5) + prefs.max_save_slots += 10 + prefs.character_saves.len = prefs.max_save_slots #undef MAX_SAVE_SLOTS_SS220