From a3f97bb181fc24c3a9a7feb9968014f48a9720e2 Mon Sep 17 00:00:00 2001 From: Kabra_men <46802162+Kabramen@users.noreply.github.com> Date: Mon, 15 Jun 2020 06:24:01 -0300 Subject: [PATCH] Size bits fix --- code/__DEFINES/citadel_defines.dm | 30 ++++++++++--------- code/__HELPERS/global_lists.dm | 2 +- .../code/modules/arousal/organs/breasts.dm | 25 +++++++++------- 3 files changed, 31 insertions(+), 26 deletions(-) diff --git a/code/__DEFINES/citadel_defines.dm b/code/__DEFINES/citadel_defines.dm index 7150ad0a..8a2c188a 100644 --- a/code/__DEFINES/citadel_defines.dm +++ b/code/__DEFINES/citadel_defines.dm @@ -19,7 +19,7 @@ //organ defines #define COCK_SIZE_MIN 1 -#define COCK_SIZE_MAX 20 +#define COCK_SIZE_MAX 35 #define COCK_GIRTH_RATIO_MAX 0.42 #define COCK_GIRTH_RATIO_DEF 0.25 @@ -40,11 +40,11 @@ #define BALLS_SACK_SIZE_DEF 8 #define BALLS_SACK_SIZE_MAX 40 -#define CUM_RATE 0.035 +#define CUM_RATE 5 #define CUM_RATE_MULT 1 -#define CUM_EFFICIENCY 1//amount of nutrition required per life() +#define CUM_EFFICIENCY 1 //amount of nutrition required per life() -#define EGG_GIRTH_MIN 1//inches +#define EGG_GIRTH_MIN 1 //inches #define EGG_GIRTH_DEF 6 #define EGG_GIRTH_MAX 16 @@ -52,25 +52,27 @@ #define BREASTS_VOLUME_MULT 1 //global multiplier for breast volume. #define BREASTS_SIZE_FLAT 0 #define BREASTS_SIZE_A 1 -#define BREASTS_SIZE_AA 1.5 #define BREASTS_SIZE_B 2 -#define BREASTS_SIZE_BB 2.5 #define BREASTS_SIZE_C 3 -#define BREASTS_SIZE_CC 3.5 #define BREASTS_SIZE_D 4 -#define BREASTS_SIZE_DD 4.5 #define BREASTS_SIZE_E 5 -#define BREASTS_SIZE_EE 5.5 #define BREASTS_SIZE_F 6 -#define BREASTS_SIZE_FF 6.5 #define BREASTS_SIZE_G 7 -#define BREASTS_SIZE_GG 7.5//Are these even real sizes? The world may never know because cup sizes make no fucking sense. #define BREASTS_SIZE_H 8 -#define BREASTS_SIZE_HH 8.5//Largest size, ever. For now. +#define BREASTS_SIZE_I 9 +#define BREASTS_SIZE_J 10 +#define BREASTS_SIZE_K 11 +#define BREASTS_SIZE_L 12 +#define BREASTS_SIZE_M 13 +#define BREASTS_SIZE_N 14 +#define BREASTS_SIZE_O 15 +#define BREASTS_SIZE_HUGE 16 +#define BREASTS_SIZE_MASSIVE 17 + #define BREASTS_SIZE_MIN BREASTS_SIZE_A -#define BREASTS_SIZE_DEF BREASTS_SIZE_C -#define BREASTS_SIZE_MAX BREASTS_SIZE_HH +#define BREASTS_SIZE_DEF BREASTS_SIZE_D +#define BREASTS_SIZE_MAX BREASTS_SIZE_MASSIVE #define MILK_RATE 5 #define MILK_RATE_MULT 1 diff --git a/code/__HELPERS/global_lists.dm b/code/__HELPERS/global_lists.dm index aec25a3f..630c3b43 100644 --- a/code/__HELPERS/global_lists.dm +++ b/code/__HELPERS/global_lists.dm @@ -54,7 +54,7 @@ init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list) init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list) - GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. + GLOB.breasts_size_list = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing. GLOB.genital_fluids_list = list ("milk", "water", "semen", "blood", "femcum") GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "baloney pony", "schlanger") for(var/K in GLOB.breasts_shapes_list) diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm index 75a2ff2c..f102cc74 100644 --- a/modular_citadel/code/modules/arousal/organs/breasts.dm +++ b/modular_citadel/code/modules/arousal/organs/breasts.dm @@ -9,8 +9,8 @@ size = BREASTS_SIZE_DEF //SHOULD BE A LETTER, starts as a number...??? var/cached_size = null //for enlargement SHOULD BE A NUMBER var/prev_size //For flavour texts SHOULD BE A LETTER - //var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "flat") - var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "flat" = 0) + //var/breast_sizes = list ("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o", "huge", "massive", "flat") + var/breast_values = list ("a" = 1, "b" = 2, "c" = 3, "d" = 4, "e" = 5, "f" = 6, "g" = 7, "h" = 8, "i" = 9, "j" = 10, "k" = 11, "l" = 12, "m" = 13, "n" = 14, "o" = 15, "huge" = 16, "massive" = 17, "flat" = 0) // Note: Do not forget to define new sizes. var/statuscheck = FALSE fluid_id = "milk" var/amount = 2 @@ -68,7 +68,7 @@ desc = "You see three sets of breasts, running from their chest to their belly." else desc = "You see some breasts, they seem to be quite exotic." - if(cached_size > 16) + if(cached_size > 18) desc = "You see [pick("some serious honkers", "a real set of badonkers", "some dobonhonkeros", "massive dohoonkabhankoloos", "two big old tonhongerekoogers", "a couple of giant bonkhonagahoogs", "a pair of humongous hungolomghnonoloughongous")]. Their volume is way beyond cupsize now, measuring in about [round(cached_size)]cm in diameter." else if (!isnum(size)) if (size == "flat") @@ -125,12 +125,17 @@ if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger)) owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger) statuscheck = TRUE - if(16 to 20) //if Rediculous - size = cached_size - if(20 to INFINITY) //if Hyper-Rediculous + if(16 to 17) //if Ridiculous + size = breast_values[round(cached_size)] + if(!owner.has_status_effect(/datum/status_effect/chem/breast_enlarger)) + owner.apply_status_effect(/datum/status_effect/chem/breast_enlarger) + statuscheck = TRUE + + if(18 to INFINITY) //if Hyper-Ridiculous size = cached_size - if(round(cached_size) < 16)//Because byond doesn't count from 0, I have to do this. + + if(round(cached_size) < 17)//Because byond doesn't count from 0, I have to do this. if (prev_size == 0) prev_size = "flat" if(size == 0)//Bloody byond with it's counting from 1 @@ -146,7 +151,5 @@ var/mob/living/carbon/human/H = owner H.Force_update_genitals() prev_size = size - else if (cached_size >= 16) - size = "huge" - else if (cached_size >= 20) - size = "massive" + else if (cached_size >= 18) + size = "massive" \ No newline at end of file