Merge branch dev

.gitlab-ci.yml

@@ -55,7 +55,7 @@ build:
     when: on_success
     expire_in: 1 day
     paths:
-      - "*"           # Incluse everything
+      - "*"           # Include everything
     exclude:
       - ".*"          # Exclude dot files
       - ".*/**/*"     # Exclude everything in the dot folders
@@ -69,9 +69,10 @@ release_dev:
     - 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/rsi/test"
+    PACKAGE_REGISTRY_URL: "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/generic/${CI_PROJECT_NAME}/${CI_COMMIT_BRANCH}"
   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"'

About/About.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ModMetaData>
   <name>RJW Sexperience Ideology</name>
-  <author>aamevarashi</author>
+  <author>amevarashi</author>
   <supportedVersions>
     <li>1.3</li>
     <li>1.4</li>
     <li>1.5</li>
   </supportedVersions>
-  <modVersion>1.5.1.0</modVersion>
+  <modVersion>1.5.1.1</modVersion>
   <modDependencies>
     <li>
       <packageId>Ludeon.RimWorld.Ideology</packageId>
@@ -31,6 +31,7 @@
     <li>rim.job.world</li>
   </loadAfter>
   <packageId>rjw.sexperience.ideology</packageId>
+  <url>https://gitgud.io/amevarashi/rjw-sexperience-ideology</url>
   <description><![CDATA[
 This is a submod for RJW that adds:
 Ideology content:

About/Manifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>RJWSexperienceIdeology</identifier>
-  <version>1.5.1.0</version>
+  <version>1.5.1.1</version>
   <dependencies>
     <li>RimJobWorld &gt;= 5.3.0</li>
   </dependencies>

CHANGELOG.md

@@ -1,10 +1,16 @@
+## 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
@@ -15,24 +21,30 @@
 * 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

README.md

@@ -39,6 +39,14 @@ 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.

Source/IdeologyAddon/IdeoUtility.cs

@@ -61,27 +61,44 @@ namespace RJWSexperience.Ideology
 			}
 		}
 
+		///<summary>
+		/// If the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina).
+		/// For futanari return the biggest penis size
+		///</summary>
 		public static float GetGenitalSize(Pawn p)
 		{
 			if (p == null)
 				return 0f;
 
-			// Iff the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina)
-			float bestSeenSize = 0f;
+			float bestSize = 0f;
+			bool foundPenis = false;
 			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) || Genital_Helper.is_vagina(part))
+				if (Genital_Helper.is_penis(part))
 				{
-					bestSeenSize = part.Severity > bestSeenSize ? part.Severity : bestSeenSize;
+					if (!foundPenis)
+					{
+						foundPenis = true;
+						bestSize = 0f;
 					}
+					size = part.Severity;
+				}
+				else if (!foundPenis && Genital_Helper.is_vagina(part))
+				{
+					// For vagina, the scale is inverted.
+					size = 1 - part.Severity;
+				}
+				else
+				{
+					continue;
 				}
 
-			// For Women, the scale is inverted.
-			if (p.gender == Gender.Female)
-				return 1 - bestSeenSize;
+				bestSize = size > bestSize ? size : bestSize;
+			}
 
-			return bestSeenSize;
+			return bestSize;
 		}
 
 		public static bool IsVisiblyPregnant(Pawn pawn)

Source/IdeologyAddon/IdeologyAddon.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <TargetGameVersion>1.5</TargetGameVersion>
-    <InternalModVersion>1.0</InternalModVersion>
+    <InternalModVersion>1.1</InternalModVersion>
     <Version>$(TargetGameVersion).$(InternalModVersion)</Version>
     <ProjectGuid>{B4481C38-31B1-422D-B5AA-0059FE7CCA1C}</ProjectGuid>
     <OutputType>Library</OutputType>