From abb2e0ea7f24bcaed62e46cdb3bb56f688310b0d Mon Sep 17 00:00:00 2001 From: SeaPlusPlush <47161428+SeaPlusPlush@users.noreply.github.com> Date: Sat, 28 Oct 2023 00:41:30 -0500 Subject: [PATCH 1/3] rebalanced quirk points --- code/datums/quirks/positive_quirks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/positive_quirks.dm b/code/datums/quirks/positive_quirks.dm index 15ededda72a6..c13fb8ceede6 100644 --- a/code/datums/quirks/positive_quirks.dm +++ b/code/datums/quirks/positive_quirks.dm @@ -303,7 +303,7 @@ name = "Throwing Arm" desc = "Your arms have a lot of heft to them! Objects that you throw just always seem to fly further than everyone elses, and you never miss a toss." icon = "baseball" - value = 7 + value = 5 //monkestation edit mob_trait = TRAIT_THROWINGARM gain_text = span_notice("Your arms are full of energy!") lose_text = span_danger("Your arms ache a bit.") From 74d06557ad3241ca9eec963d0cceafc9a8a03e37 Mon Sep 17 00:00:00 2001 From: SeaPlusPlush <47161428+SeaPlusPlush@users.noreply.github.com> Date: Sat, 28 Oct 2023 00:49:51 -0500 Subject: [PATCH 2/3] uypdated description as well --- code/datums/quirks/positive_quirks.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/quirks/positive_quirks.dm b/code/datums/quirks/positive_quirks.dm index c13fb8ceede6..3fce3150e561 100644 --- a/code/datums/quirks/positive_quirks.dm +++ b/code/datums/quirks/positive_quirks.dm @@ -301,7 +301,7 @@ /datum/quirk/throwingarm name = "Throwing Arm" - desc = "Your arms have a lot of heft to them! Objects that you throw just always seem to fly further than everyone elses, and you never miss a toss." + desc = "Your arms have a lot of heft to them! You throw objects a bit further than other people, and you never miss a toss into a disposal bin." //monkestation edit icon = "baseball" value = 5 //monkestation edit mob_trait = TRAIT_THROWINGARM From fb233cfaceafb82d0b9ca214596d069d34f0ede3 Mon Sep 17 00:00:00 2001 From: SeaPlusPlush <47161428+SeaPlusPlush@users.noreply.github.com> Date: Sat, 28 Oct 2023 18:37:09 -0500 Subject: [PATCH 3/3] re-arranged metacoin code block to work properly --- code/datums/quirks/positive_quirks.dm | 4 ++-- .../modules/client/preferences/inventory.dm | 22 +++++++++++-------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/code/datums/quirks/positive_quirks.dm b/code/datums/quirks/positive_quirks.dm index 3fce3150e561..15ededda72a6 100644 --- a/code/datums/quirks/positive_quirks.dm +++ b/code/datums/quirks/positive_quirks.dm @@ -301,9 +301,9 @@ /datum/quirk/throwingarm name = "Throwing Arm" - desc = "Your arms have a lot of heft to them! You throw objects a bit further than other people, and you never miss a toss into a disposal bin." //monkestation edit + desc = "Your arms have a lot of heft to them! Objects that you throw just always seem to fly further than everyone elses, and you never miss a toss." icon = "baseball" - value = 5 //monkestation edit + value = 7 mob_trait = TRAIT_THROWINGARM gain_text = span_notice("Your arms are full of energy!") lose_text = span_danger("Your arms ache a bit.") diff --git a/monkestation/code/modules/client/preferences/inventory.dm b/monkestation/code/modules/client/preferences/inventory.dm index fb161c3a01e7..e4efae0bdf6c 100644 --- a/monkestation/code/modules/client/preferences/inventory.dm +++ b/monkestation/code/modules/client/preferences/inventory.dm @@ -32,13 +32,16 @@ if(!ckey || !SSdbcore.IsConnected()) return FALSE + //RoundCap Checks if(!max_round_coins && respects_roundcap) to_chat(parent, "You've hit the Monkecoin limit for this shift, please try again next shift.") return + if(respects_roundcap) + if(max_round_coins <= amount) + amount = max_round_coins + max_round_coins -= amount - var/datum/db_query/query_inc_metacoins = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET metacoins = metacoins + '[amount]' WHERE ckey = '[ckey]'") - query_inc_metacoins.warn_execute() - + //Donator Multiplier if(amount > 0 && donator_multipler) switch(parent.patreon.access_rank) if(ACCESS_COMMAND_RANK) @@ -48,14 +51,15 @@ if(ACCESS_NUKIE_RANK) amount *= 3 - if(respects_roundcap) - if(max_round_coins <= amount) - amount = max_round_coins - max_round_coins -= amount + amount = round(amount, 1) //make sure whole number + metacoins += amount //store the updated metacoins in a variable, but not the actual game-to-game storage mechanism (load_metacoins() pulls from database) - amount = round(amount, 1) - metacoins += amount + //SQL query - updates the metacoins in the database (this is where the storage actually happens) + var/datum/db_query/query_inc_metacoins = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET metacoins = metacoins + '[amount]' WHERE ckey = '[ckey]'") + query_inc_metacoins.warn_execute() qdel(query_inc_metacoins) + + //Output to chat if(announces) if(reason) to_chat(parent, "[abs(amount)] Monkecoins have been [amount >= 0 ? "deposited to" : "withdrawn from"] your account! Reason: [reason]")