From 027632ffd1dd82bb5074665a4b1ed51b1ec4338b Mon Sep 17 00:00:00 2001
From: sarcoph <83266791+sarcoph@users.noreply.github.com>
Date: Mon, 2 May 2022 20:04:29 -0800
Subject: [PATCH] fixed belly (and butt) sizes

before, it was impossible to select a size of 0 for either bellies or butts, and all the belly sizes rendered one size smaller. this fixes that - all sizes are accurate and you can choose 0 for both belly and butt. also makes belly back sprite show up as right color
---
 code/__DEFINES/hyper_arousal.dm               |   8 +++
 code/modules/client/preferences.dm            |  14 ++---
 .../code/modules/arousal/arousalhud.dm        |   8 +--
 .../code/modules/arousal/expansion.dm         |  35 ++++++++++++
 hyperstation/icons/obj/genitals/belly.dmi     | Bin 7205 -> 7392 bytes
 hyperstation/icons/obj/genitals/butt.dmi      | Bin 2714 -> 2723 bytes
 .../code/modules/arousal/arousal.dm           |  16 +-----
 .../code/modules/arousal/organs/genitals.dm   |  53 +++++++-----------
 .../chemistry/reagents/enlargement.dm         |   2 +-
 tgstation.dme                                 |   2 +
 10 files changed, 78 insertions(+), 60 deletions(-)
 create mode 100644 code/__DEFINES/hyper_arousal.dm
 create mode 100644 hyperstation/code/modules/arousal/expansion.dm

diff --git a/code/__DEFINES/hyper_arousal.dm b/code/__DEFINES/hyper_arousal.dm
new file mode 100644
index 000000000..bedb5c860
--- /dev/null
+++ b/code/__DEFINES/hyper_arousal.dm
@@ -0,0 +1,8 @@
+#define BELLY_MIN_SIZE 0
+#define BELLY_MAX_SIZE 8
+
+#define BELLY_STRAIN_SIZE 3 // for flavor text
+#define BELLY_STRETCH_SIZE 6 // for flavor text
+
+#define BUTT_MIN_SIZE 0
+#define BUTT_MAX_SIZE 5
\ No newline at end of file
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 922c1be3f..2bd8d84fe 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -2430,14 +2430,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
 
 				if("belly_size")
-					var/new_bellysize = input(user, "Belly size :\n(1-8)", "Character Preference") as num|null
-					if(new_bellysize)
-						features["belly_size"] = clamp(new_bellysize, 1, 8)
+					var/new_bellysize = input(user, "Belly size :\n([BELLY_MIN_SIZE]-[BELLY_MAX_SIZE])", "Character Preference") as num|null
+					if(new_bellysize != null)
+						features["belly_size"] = clamp(new_bellysize, BELLY_MIN_SIZE, BELLY_MAX_SIZE)
 
 				if("butt_size")
-					var/new_buttsize = input(user, "Butt size :\n(0-5)", "Character Preference") as num|null
-					if(new_buttsize)
-						features["butt_size"] = clamp(new_buttsize, 0, 5)
+					var/new_buttsize = input(user, "Butt size :\n([BUTT_MIN_SIZE]-[BUTT_MAX_SIZE])", "Character Preference") as num|null
+					if(new_buttsize != null)
+						features["butt_size"] = clamp(new_buttsize, BUTT_MIN_SIZE, BUTT_MAX_SIZE)
 
 				if("vag_shape")
 					var/new_shape
@@ -2572,7 +2572,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(features["has_belly"] == FALSE)
 						features["hide_belly"] = FALSE
 						features["inflatable_belly"] = FALSE
-						features["belly_size"] = 1
+						features["belly_size"] = 0
 
 				if("inflatable_belly")
 					features["inflatable_belly"] = !features["inflatable_belly"]
diff --git a/hyperstation/code/modules/arousal/arousalhud.dm b/hyperstation/code/modules/arousal/arousalhud.dm
index ff7725ddb..509438813 100644
--- a/hyperstation/code/modules/arousal/arousalhud.dm
+++ b/hyperstation/code/modules/arousal/arousalhud.dm
@@ -211,13 +211,7 @@
 		return
 
 	if(href_list["shrink_belly"])
-		var/obj/item/organ/genital/belly/E = usr.getorganslot("belly")
-		if(E.size > 0)
-			to_chat(usr, "<span class='userlove'>You feel your belly diminish.</span>")
-			E.size -= 1
-			H.update_genitals()
-		else
-			to_chat(usr, "<span class='warning'>Your belly is already at the minimum size! </span>")
+		H.shrink_belly(1)
 
 	if(href_list["removecondom"])
 		H.menuremovecondom()
diff --git a/hyperstation/code/modules/arousal/expansion.dm b/hyperstation/code/modules/arousal/expansion.dm
new file mode 100644
index 000000000..5000c16d3
--- /dev/null
+++ b/hyperstation/code/modules/arousal/expansion.dm
@@ -0,0 +1,35 @@
+/mob/living/carbon/proc/expand_belly(expansion = 1)
+	var/obj/item/organ/genital/belly/_belly = getorganslot("belly")
+	if(!expansion || !_belly || !_belly.inflatable)
+		return
+	var/original_size = _belly.size
+	_belly.size = clamp(_belly.size + expansion, BELLY_MIN_SIZE, BELLY_MAX_SIZE)
+	if(_belly.size == original_size)
+		return
+	var/_verb = "expand"
+	switch(_belly.size)
+		if(BELLY_MAX_SIZE to INFINITY)
+			_verb = "stretch to its limit"
+		if(BELLY_STRETCH_SIZE to BELLY_MAX_SIZE)
+			_verb = "stretch"
+		if(BELLY_STRAIN_SIZE to BELLY_STRETCH_SIZE)
+			_verb = "strain"
+	to_chat(src, "<span class='userlove'>You feel your belly [_verb].</span>")
+	_belly.update()
+
+
+/mob/living/carbon/proc/shrink_belly(shrinkage = 1)
+	var/obj/item/organ/genital/belly/_belly = getorganslot("belly")
+	if(!shrinkage ||!_belly || !_belly.inflatable)
+		return
+	var/original_size = _belly.size
+	_belly.size = clamp(_belly.size - shrinkage, BELLY_MIN_SIZE, BELLY_MAX_SIZE)
+	if(_belly.size == original_size)
+		return
+	var/_verb = "diminish"
+	var/_class = "userlove"
+	if(_belly.size == BELLY_MIN_SIZE)
+		_verb = "can't shrink anymore"
+		_class = "warning"
+	to_chat(src, "<span class='[_class]'>You feel your belly [_verb].</span>")
+	_belly.update()
\ No newline at end of file
diff --git a/hyperstation/icons/obj/genitals/belly.dmi b/hyperstation/icons/obj/genitals/belly.dmi
index 8c3bae32f957a4484896d3c936d1b4d1c497b4d8..3324744b7bed63879f0e17bcbc0127cbb65e2504 100644
GIT binary patch
literal 7392
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
ZsC)jyy$_{x;J+*Zy{m?Z3a#4_{|5bv=JNmm

literal 7205
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

diff --git a/hyperstation/icons/obj/genitals/butt.dmi b/hyperstation/icons/obj/genitals/butt.dmi
index e4b8f5c6b08306d738b86d26236e91212bb1c2b0..55f746287107b430642fff05e2deb7ac3e4c76b4 100644
GIT binary patch
delta 2634
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

delta 2625
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

diff --git a/modular_citadel/code/modules/arousal/arousal.dm b/modular_citadel/code/modules/arousal/arousal.dm
index c8d4ea191..5e37cbbe7 100644
--- a/modular_citadel/code/modules/arousal/arousal.dm
+++ b/modular_citadel/code/modules/arousal/arousal.dm
@@ -437,17 +437,9 @@
 			if(!remote && !in_range(src, L))
 				return
 			if(do_after(src, mb_time, target = src))
-
-				if(!spillage) //hyper inflation
-					var/obj/item/organ/genital/belly/B = L.getorganslot("belly")
-					if(B)
-						if(B.inflatable && total_fluids > 80) //requires a big cumshot to expand.
-							if(B.size < 3)
-								B.size += 1
-								to_chat(L, "<span class='userlove'>You feel your belly expand.</span>")
-							else
-								to_chat(L, "<span class='userlove'>You feel your belly strain.</span>")
-
+				var/mob/living/carbon/H = L
+				if(!spillage && total_fluids > 80) //hyper inflation; requires a big cumshot to expand
+					H.expand_belly(1)
 				var/obj/item/organ/genital/penis/P = G
 				if (P.condom)//condomed.
 					src.condomclimax()
@@ -673,8 +665,6 @@
 								var/mob/living/carbon/C = check_target
 								if(C.exposed_genitals.len || C.is_groin_exposed() || C.is_chest_exposed()) //Are they naked enough?
 									partner = C
-							else //A cat is fine too
-								partner = check_target
 						if(partner) //Did they pass the clothing checks?
 							mob_climax_partner(G, partner, mb_time = 0) //Instant climax due to forced
 							continue //You've climaxed once with this organ, continue on
diff --git a/modular_citadel/code/modules/arousal/organs/genitals.dm b/modular_citadel/code/modules/arousal/organs/genitals.dm
index 394fb0aa4..bdf4d7856 100644
--- a/modular_citadel/code/modules/arousal/organs/genitals.dm
+++ b/modular_citadel/code/modules/arousal/organs/genitals.dm
@@ -229,7 +229,7 @@
 	if(!getorganslot("belly"))
 		var/obj/item/organ/genital/belly/B = new
 		if(dna.features["belly_size"])
-			B.size = dna.features["belly_size"]-1
+			B.size = dna.features["belly_size"]
 		B.Insert(src)
 		if(B)
 			if(dna.species.use_skintones && dna.features["genitals_use_skintone"])
@@ -478,39 +478,39 @@
 			genital_overlay.icon_state = "[G.slot]_[S.icon_state]_[size]_[aroused_state]_[layertext]"
 			colourcode = S.color_src
 
-			//sizecheck added to prevent rendering blank icons
-			if(G.slot == "belly" && G.size > 0) //we have a different size system
-
+			if(G.slot == "belly")
+				size = round(size)
 				genital_overlay.icon = 'hyperstation/icons/obj/genitals/belly.dmi'
-				genital_overlay.icon_state = "belly_[round(size)]_OTHER"
+				genital_overlay.icon_state = "belly_[size]_OTHER"
 				colourcode = "belly_color"
 
 				//creates directional layering by rendering twice.
 				genital_overlay_directional.icon = 'hyperstation/icons/obj/genitals/belly.dmi' //Added directionals for larger bellies!
-				genital_overlay_directional.icon_state = "belly_[round(size)]_NORTH"
+				genital_overlay_directional.icon_state = "belly_[size]_NORTH"
 				genital_overlay_directional.layer = -GENITALS_BEHIND_LAYER
 
-			//sizecheck added to prevent rendering blank icons
-			if(G.slot == "anus" && G.size > 0) //we have a different size system
-
+			if(G.slot == "anus")
+				size = round(size)
 				genital_overlay.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
-				genital_overlay.icon_state = "butt_[round(size)]_OTHER"
+				genital_overlay.icon_state = "butt_[size]_OTHER"
 				genital_overlay.layer = -ID_LAYER //in front of suit, behind bellies.
 
 				//creates directional layering by rendering twice. North has higher layer priority to occlude hands.
 				genital_overlay_directional.icon = 'hyperstation/icons/obj/genitals/butt.dmi'
-				genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH"
+				genital_overlay_directional.icon_state = "butt_[size]_NORTH"
 				genital_overlay_directional.layer = -NECK_LAYER
 
 				colourcode = "butt_color"
-				if(use_skintones) //butts are forced a colour, either skin tones, or main colour. how ever, mutants use a darker version, because of their body tone.
+				if(use_skintones && H.dna.features["genitals_use_skintone"]) 
+				//butts are forced a colour, either skin tones, or main colour.
+				//how ever, mutants use a darker version, because of their body tone.
 					genital_overlay.color = "#[skintone2hex(H.skin_tone)]"
-					genital_overlay.icon_state = "butt_[round(size)]_OTHER"
-					genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH"
+					genital_overlay.icon_state = "butt_[size]_OTHER"
+					genital_overlay_directional.icon_state = "butt_[size]_NORTH"
 				else
 					genital_overlay.color = "#[H.dna.features["mcolor"]]"
-					genital_overlay.icon_state = "butt_[round(size)]_OTHER_m"
-					genital_overlay_directional.icon_state = "butt_[round(size)]_NORTH_m"
+					genital_overlay.icon_state = "butt_[size]_OTHER_m"
+					genital_overlay_directional.icon_state = "butt_[size]_NORTH_m"
 
 
 			if(S.center)
@@ -521,21 +521,10 @@
 				if (colourtint)
 					genital_overlay.color = "#[colourtint]"
 			else
-				switch(colourcode)
-					if("cock_color")
-						genital_overlay.color = "#[H.dna.features["cock_color"]]"
-						if (colourtint)
-							genital_overlay.color = "#[colourtint]"
-					if("balls_color")
-						genital_overlay.color = "#[H.dna.features["balls_color"]]"
-					if("breasts_color")
-						genital_overlay.color = "#[H.dna.features["breasts_color"]]"
-					if("vag_color")
-						genital_overlay.color = "#[H.dna.features["vag_color"]]"
-					if("belly_color")
-						genital_overlay.color = "#[H.dna.features["belly_color"]]"
-					if("butt_color")
-						genital_overlay.color = "#[H.dna.features["butt_color"]]"
+				if(colourcode != MUTCOLORS)
+					genital_overlay.color = "#[H.dna.features[colourcode]]"
+					if(colourcode == "cock_color" && colourtint)
+						genital_overlay.color = "#[colourtint]"
 
 			standing += genital_overlay
 
@@ -549,7 +538,7 @@
 					if (colourtint)
 						genital_overlay_directional.color = "#[colourtint]"
 				else
-					genital_overlay_directional.color = "#[H.dna.features["butt_color"]]"
+					genital_overlay_directional.color = "#[H.dna.features[colourcode]]"
 
 				standing += genital_overlay_directional
 
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index e0d8e8417..95f58780c 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -412,7 +412,7 @@
 				B = nB
 	//If they have & opt in, increase size.
 	if(H.client?.prefs.cit_toggles & ASS_ENLARGEMENT)
-		if(B.size < 5) //just make sure you dont break sprites
+		if(B.size < BUTT_MAX_SIZE) //just make sure you dont break sprites
 			B.size = B.size + 0.05
 			B.update()
 	..()
diff --git a/tgstation.dme b/tgstation.dme
index 1d242e4fc..b134bc3a4 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -50,6 +50,7 @@
 #include "code\__DEFINES\food.dm"
 #include "code\__DEFINES\footsteps.dm"
 #include "code\__DEFINES\hud.dm"
+#include "code\__DEFINES\hyper_arousal.dm"
 #include "code\__DEFINES\integrated_electronics.dm"
 #include "code\__DEFINES\interaction_flags.dm"
 #include "code\__DEFINES\inventory.dm"
@@ -3141,6 +3142,7 @@
 #include "hyperstation\code\modules\antagonists\werewolf\werewolf.dm"
 #include "hyperstation\code\modules\arousal\arousalhud.dm"
 #include "hyperstation\code\modules\arousal\creampie.dm"
+#include "hyperstation\code\modules\arousal\expansion.dm"
 #include "hyperstation\code\modules\busy_space\air_traffic.dm"
 #include "hyperstation\code\modules\busy_space\atc_controller.dm"
 #include "hyperstation\code\modules\busy_space\loremaster.dm"