diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 98b247f..fff6f83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,7 +55,7 @@ build: when: on_success expire_in: 1 day paths: - - "*" # Include everything + - "*" # Incluse everything exclude: - ".*" # Exclude dot files - ".*/**/*" # Exclude everything in the dot folders @@ -66,13 +66,12 @@ release_dev: rules: - if: $CI_COMMIT_TAG when: never # Do not run this job when a tag is created manually - - if: $CI_COMMIT_BRANCH == "dev" # Run this job when commits are pushed or merged to the dev branch + - if: $CI_COMMIT_BRANCH == "dev" # Run this job when commits are pushed or merged to the dev branch variables: GIT_STRATEGY: none # Do not clone repo and skip 'before_script' - PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${CI_PROJECT_NAME}/${CI_COMMIT_BRANCH}" + PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/rsi/test" script: - apk add zip - zip -rq mod.zip ./ - echo "${PACKAGE_REGISTRY_URL}" - - 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file About/About.xml "${PACKAGE_REGISTRY_URL}/About.xml"' - 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file mod.zip "${PACKAGE_REGISTRY_URL}/rjw_sexperience_ideology.zip"' diff --git a/1.5/Assemblies/RJWSexperience.Ideology.dll b/1.5/Assemblies/RJWSexperience.Ideology.dll index f4c6716..271bc27 100644 Binary files a/1.5/Assemblies/RJWSexperience.Ideology.dll and b/1.5/Assemblies/RJWSexperience.Ideology.dll differ diff --git a/About/About.xml b/About/About.xml index f7bc102..630ca35 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,13 +1,13 @@  RJW Sexperience Ideology - amevarashi + aamevarashi
  • 1.3
  • 1.4
  • 1.5
    •  - 1.5.1.1 + 1.5.1.0
  • Ludeon.RimWorld.Ideology @@ -31,7 +31,6 @@
  • rim.job.world
    • rjw.sexperience.ideology - https://gitgud.io/amevarashi/rjw-sexperience-ideology RJWSexperienceIdeology - 1.5.1.1 + 1.5.1.0
  • RimJobWorld >= 5.3.0
    •  diff --git a/CHANGELOG.md b/CHANGELOG.md index b78e14f..cefc8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,16 +1,10 @@ -## Version 1.5.1.1 -* Changed size matters precepts for futanari: now they only check penis size and do not reverse it - ## Version 1.5.1.0 * Rimworld 1.5 - ## Version 1.4.1.0 * Changed to a new versioning system. Now the first two digits are a Rimworld version, followed by the major and minor version of the mod. * Fixed: Pawns raping despite Rape-Abhorrent precept - ## Version 1.0.2.1 * Fixed SecondaryRomanceChanceFactor patch - ## Version 1.0.2.0 * Removed Incestuos_IncestOnly conflict with Zoophile * Patched manual romance to respect incestuous precepts @@ -21,30 +15,24 @@ * Removed "not obedient" social thought for raping a slave * Bestiality_Acceptable now nullifies RJW bestiality thoughts * Fixed swapped baseMoodEffect of holy and elevated pregnancy precepts - ## Version 1.0.1.2 * Removed 100% certainty spam for sex proselyzing * Maybe removed sex proselyzing error with bestiality - ## Version 1.0.1.1 * Fixed Ideology overwriting Sexperience's mod settings label * Fixed submissive gender can't be marked for comfort * Fixed new precepts adding thoughts to children * Fixed Sexual Proselyzing precept * Fixed biotech pregnancy not counting for pregnancy precepts - ## Version 1.0.1.0 * Rimworld 1.4 ### by Twonki * Added Pregnancy, Sex Proselyzing and Size Matters precepts - ## Version 1.0.0.3 * Fixed error in *_Gendered precept comps - ## Version 1.0.0.2 * Fixed error in Sex_Promiscuous that happend when RJW Sexperience was not used * Optimized Virgin_*_Taken thoughts - ## Version 1.0.0.1 * Fixed SexAbility errors if used without RJW Sexperience ### by XenoMorphie diff --git a/README.md b/README.md index feca10d..48aedd7 100644 --- a/README.md +++ b/README.md @@ -39,14 +39,6 @@ The only consistent way to get in touch with me is the RJW Discord server #sexpe Please, ping me in the RJW Discord if you rased the issue here. ### Contributing -All work should be done based of the `dev` branch! Trying to compile on the `master` branch will fail - this is intentional. While I can't do something like that for XML and translations, I may choose to reject the pull request based on the amount of work required to transfer all commits into the `dev` branch. - -The best practices: -1. Fork this repository. -2. In your fork create a new branch based on `dev`. The name of the new branch should reflect what you are changing in 3 words or less, separated by `-`. For example `rmb-menu-refactor` or `japanese-translation`. -3. Make your changes and commit them to the new branch. -4. Create a new merge request from your branch into the `dev` branch of this repository. - To be consistent with RJW, please use TABS not SPACES. -Please, ping me in the RJW Discord after creating a merge request. +Please, ping me in the RJW Discord after creating a merge request. \ No newline at end of file diff --git a/Source/IdeologyAddon/IdeoUtility.cs b/Source/IdeologyAddon/IdeoUtility.cs index c103729..05ffd75 100644 --- a/Source/IdeologyAddon/IdeoUtility.cs +++ b/Source/IdeologyAddon/IdeoUtility.cs @@ -61,44 +61,27 @@ namespace RJWSexperience.Ideology } } - /// - /// If the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina). - /// For futanari return the biggest penis size - /// public static float GetGenitalSize(Pawn p) { if (p == null) return 0f; - float bestSize = 0f; - bool foundPenis = false; + // Iff the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina) + float bestSeenSize = 0f; foreach (Hediff part in Genital_Helper.get_AllPartsHediffList(p)) { - float size; // Only check for Vaginas and Penises, not for Anus or for things not categorized as primary sexual parts - if (Genital_Helper.is_penis(part)) + if (Genital_Helper.is_penis(part) || Genital_Helper.is_vagina(part)) { - if (!foundPenis) - { - foundPenis = true; - bestSize = 0f; - } - size = part.Severity; + bestSeenSize = part.Severity > bestSeenSize ? part.Severity : bestSeenSize; } - else if (!foundPenis && Genital_Helper.is_vagina(part)) - { - // For vagina, the scale is inverted. - size = 1 - part.Severity; - } - else - { - continue; - } - - bestSize = size > bestSize ? size : bestSize; } - return bestSize; + // For Women, the scale is inverted. + if (p.gender == Gender.Female) + return 1 - bestSeenSize; + + return bestSeenSize; } public static bool IsVisiblyPregnant(Pawn pawn) diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index f2f51af..cc624eb 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -2,7 +2,7 @@ Debug 1.5 - 1.1 + 1.0 $(TargetGameVersion).$(InternalModVersion) {B4481C38-31B1-422D-B5AA-0059FE7CCA1C} Library