From e19b6d8ff3ecceb141a19961cdc4a9fa3ad244a5 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 24 Mar 2024 14:48:16 +0500 Subject: [PATCH 01/48] Fix 1.4 cproj --- Source/IdeologyAddon/IdeologyAddon.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index a5593cf..7844895 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -24,10 +24,9 @@ 1.4.* - 2.* + 2.2.* runtime compile; build; native; contentfiles; analyzers; buildtransitive - \ No newline at end of file From 89aefe03fe554d4decf49d46950c6b3dfc0cd950 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 14:54:02 +0000 Subject: [PATCH 02/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..64b372d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,49 @@ +# This file is a template, and might need editing before it works on your project. +# This is a sample GitLab CI/CD configuration file that should run without any modifications. +# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts, +# it uses echo commands to simulate the pipeline execution. +# +# A pipeline is composed of independent jobs that run scripts, grouped into stages. +# Stages run in sequential order, but jobs within stages run in parallel. +# +# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages +# +# You can copy and paste this template into a new `.gitlab-ci.yml` file. +# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword. +# +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml + +stages: # List of stages for jobs, and their order of execution + - build + - test + - deploy + +build-job: # This job runs in the build stage, which runs first. + stage: build + script: + - echo "Compiling the code..." + - echo "Compile complete." + +unit-test-job: # This job runs in the test stage. + stage: test # It only starts when the job in the build stage completes successfully. + script: + - echo "Running unit tests... This will take about 60 seconds." + - sleep 60 + - echo "Code coverage is 90%" + +lint-test-job: # This job also runs in the test stage. + stage: test # It can run at the same time as unit-test-job (in parallel). + script: + - echo "Linting code... This will take about 10 seconds." + - sleep 10 + - echo "No lint issues found." + +deploy-job: # This job runs in the deploy stage. + stage: deploy # It only runs when *both* jobs in the test stage complete successfully. + environment: production + script: + - echo "Deploying application..." + - echo "Application successfully deployed." From 3bcc4f334e33ba0a8e3289199e353ed1f0644d9b Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 15:12:16 +0000 Subject: [PATCH 03/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 149 ++++++++++++++++++++++++++++++++++++------------- 1 file changed, 109 insertions(+), 40 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64b372d..bbb223e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,49 +1,118 @@ -# This file is a template, and might need editing before it works on your project. -# This is a sample GitLab CI/CD configuration file that should run without any modifications. -# It demonstrates a basic 3 stage CI/CD pipeline. Instead of real tests or scripts, -# it uses echo commands to simulate the pipeline execution. -# -# A pipeline is composed of independent jobs that run scripts, grouped into stages. -# Stages run in sequential order, but jobs within stages run in parallel. -# -# For more information, see: https://docs.gitlab.com/ee/ci/yaml/index.html#stages -# -# You can copy and paste this template into a new `.gitlab-ci.yml` file. -# You should not add this template to an existing `.gitlab-ci.yml` file by using the `include:` keyword. -# # To contribute improvements to CI/CD templates, please follow the Development guide at: # https://docs.gitlab.com/ee/development/cicd/templates.html # This specific template is located at: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Getting-Started.gitlab-ci.yml +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.gitlab-ci.yml -stages: # List of stages for jobs, and their order of execution - - build - - test - - deploy +# This is a simple example illustrating how to build and test .NET Core project +# with GitLab Continuous Integration / Continuous Delivery. +# +# ### Specify the Docker image +# +# Instead of installing .NET Core SDK manually, a docker image is used +# with already pre-installed .NET Core SDK. +# +# The 'latest' tag targets the latest available version of .NET Core SDK image. +# If preferred, you can explicitly specify version of .NET Core (e.g. using '2.2-sdk' tag). +# +# See other available tags for .NET Core: https://hub.docker.com/_/microsoft-dotnet +# Learn more about Docker tags: https://docs.docker.com/glossary/?term=tag +# and the Docker itself: https://opensource.com/resources/what-docker +image: mcr.microsoft.com/dotnet/sdk:latest -build-job: # This job runs in the build stage, which runs first. +# ### Define variables +# +variables: + # 1) Name of directory where restore and build objects are stored. + OBJECTS_DIRECTORY: 'obj' + # 2) Name of directory used for keeping restored dependencies. + NUGET_PACKAGES_DIRECTORY: '.nuget' + # 3) A relative path to the source code from project repository root. + # NOTE: Please edit this path so it matches the structure of your project! + SOURCE_CODE_PATH: '*/*/' + +# ### Define global cache rule +# +# Before building the project, all dependencies (e.g. third-party NuGet packages) +# must be restored. Jobs on GitLab.com's Shared Runners are executed on autoscaled machines. +# +# Each machine is used only once (for security reasons) and after that is removed. +# This means that, before every job, a dependency restore must be performed +# because restored dependencies are removed along with machines. Fortunately, +# GitLab provides cache mechanism with the aim of keeping restored dependencies +# for other jobs. +# +# This example shows how to configure cache to pass over restored +# dependencies for re-use. +# +# With global cache rule, cached dependencies will be downloaded before every job +# and then unpacked to the paths as specified below. +cache: + # Per-stage and per-branch caching. + key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG" + paths: + # Specify three paths that should be cached: + # + # 1) Main JSON file holding information about package dependency tree, packages versions, + # frameworks etc. It also holds information where to the dependencies were restored. + - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/project.assets.json' + # 2) Other NuGet and MSBuild related files. Also needed. + - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/*.csproj.nuget.*' + # 3) Path to the directory where restored dependencies are kept. + - '$NUGET_PACKAGES_DIRECTORY' + # + # 'pull-push' policy means that latest cache will be downloaded (if it exists) + # before executing the job, and a newer version will be uploaded afterwards. + # Such a setting saves time when there are no changes in referenced third-party + # packages. + # + # For example, if you run a pipeline with changes in your code, + # but with no changes within third-party packages which your project is using, + # then project restore will happen quickly as all required dependencies + # will already be there — unzipped from cache. + + # 'pull-push' policy is the default cache policy, you do not have to specify it explicitly. + policy: pull-push + +# ### Restore project dependencies +# +# NuGet packages by default are restored to '.nuget/packages' directory +# in the user's home directory. That directory is out of scope of GitLab caching. +# +# To get around this, a custom path can be specified using the '--packages ' option +# for 'dotnet restore' command. In this example, a temporary directory is created +# in the root of project repository, so its content can be cached. +# +# Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html +before_script: + - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY' + +build: stage: build + # ### Build all projects discovered from solution file. + # + # Note: this will fail if you have any projects in your solution that are not + # .NET Core-based projects (e.g. WCF service), which is based on .NET Framework, + # not .NET Core. In this scenario, you will need to build every .NET Core-based + # project by explicitly specifying a relative path to the directory + # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). + # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - echo "Compiling the code..." - - echo "Compile complete." + - 'dotnet build --no-restore' -unit-test-job: # This job runs in the test stage. - stage: test # It only starts when the job in the build stage completes successfully. - script: - - echo "Running unit tests... This will take about 60 seconds." - - sleep 60 - - echo "Code coverage is 90%" +#tests: +# stage: test + # ### Run the tests + # + # You can either run tests for all test projects that are defined in your solution + # with 'dotnet test' or run tests only for specific project by specifying + # a relative path to the directory where it is located (e.g. 'dotnet test ./test/UnitTests'). + # + # You may want to define separate testing jobs for different types of testing + # (e.g. integration tests, unit tests etc). +# script: +# - 'dotnet test --no-restore' -lint-test-job: # This job also runs in the test stage. - stage: test # It can run at the same time as unit-test-job (in parallel). - script: - - echo "Linting code... This will take about 10 seconds." - - sleep 10 - - echo "No lint issues found." - -deploy-job: # This job runs in the deploy stage. - stage: deploy # It only runs when *both* jobs in the test stage complete successfully. - environment: production - script: - - echo "Deploying application..." - - echo "Application successfully deployed." +#deploy: +# stage: deploy +# script: echo "Define your deployment script!" +# environment: production From f718e863e32b308a4dd0b7e75141ca3ca784c89b Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 15:22:58 +0000 Subject: [PATCH 04/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbb223e..ec6e935 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,7 +28,7 @@ variables: NUGET_PACKAGES_DIRECTORY: '.nuget' # 3) A relative path to the source code from project repository root. # NOTE: Please edit this path so it matches the structure of your project! - SOURCE_CODE_PATH: '*/*/' + SOURCE_CODE_PATH: 'Source/' # ### Define global cache rule # From 97cd357cf7e8e98aaa1232d405a31d911900b641 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 15:27:17 +0000 Subject: [PATCH 05/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ec6e935..0e0b180 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -84,6 +84,7 @@ cache: # # Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html before_script: + - 'cd $SOURCE_CODE_PATH' - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY' build: From 76bd1bdabfe5ea4290982ff129b78aa61326476a Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 16:03:06 +0000 Subject: [PATCH 06/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e0b180..2cb9b48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From b83b0c0ecdadeb2a43fe6a6c628a8fab768b6be6 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 16:13:33 +0000 Subject: [PATCH 07/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2cb9b48..c1419fb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,7 @@ build: # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' + - 'ls ../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 6bc7a58be1e4c2638f016b32f571181cc184b7e0 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 16:25:22 +0000 Subject: [PATCH 08/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c1419fb..e597d8d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,8 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' - - 'ls ../../rjw/1.5/Assemblies/RJW.dll' + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../../rjw/1.5/Assemblies/RJW.dll' + - 'ls ../../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 57f3feae8bab0fba20769858368f9ab9583b62aa Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 16:46:34 +0000 Subject: [PATCH 09/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e597d8d..64c5696 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,9 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: + - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../../rjw/1.5/Assemblies/RJW.dll' - - 'ls ../../../rjw/1.5/Assemblies/RJW.dll' + - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From d598f33e74c6b79b22fe557d6ec2d5f391ef48f4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 17:13:13 +0000 Subject: [PATCH 10/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 64c5696..a867186 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,9 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../../rjw/1.5/Assemblies/RJW.dll' - - 'ls -l ../../../rjw/1.5/Assemblies/RJW.dll' + - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' + - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 45e84a83fcc0eda16ef33f0604bf7740a736d38d Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 17:43:57 +0000 Subject: [PATCH 11/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a867186..73c021d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,9 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.5/Assemblies/RJW.dll' - - 'ls -l ../../rjw/1.5/Assemblies/RJW.dll' + - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 79a3dc684b2c7468a40b69eda58c90dc3bcb3d4c Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:01:08 +0000 Subject: [PATCH 12/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73c021d..3bb83f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ image: mcr.microsoft.com/dotnet/sdk:latest # variables: # 1) Name of directory where restore and build objects are stored. - OBJECTS_DIRECTORY: 'obj' + OBJECTS_DIRECTORY: 'IdeologyAddon/obj' # 2) Name of directory used for keeping restored dependencies. NUGET_PACKAGES_DIRECTORY: '.nuget' # 3) A relative path to the source code from project repository root. @@ -98,7 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'curl --create-dirs "https://gitgud.io/jikulopo/rjw/-/raw/1.5-test/1.5/Assemblies/RJW.dll" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From b2fae1c39ca4468ad3d47fd68cce2f14f609ec5c Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:05:08 +0000 Subject: [PATCH 13/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bb83f0..684ed48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,6 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: + - 'echo $RJW_DLL_URL' - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' From 332a65eb7d6e3a92a89b5a093f0b3d31e078258a Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:06:38 +0000 Subject: [PATCH 14/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684ed48..e778595 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ build: # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'echo $RJW_DLL_URL' - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs $RJW_DLL_URL -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From d39a01a96280e6ea5d91436976d02a6c10003457 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:10:59 +0000 Subject: [PATCH 15/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e778595..684ed48 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ build: # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'echo $RJW_DLL_URL' - - 'curl --create-dirs $RJW_DLL_URL -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 8bd4d5cd14a3636442408a3490f1ed826665580e Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:24:24 +0000 Subject: [PATCH 16/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 684ed48..c848e73 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,8 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'echo $RJW_DLL_URL' - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.4/Assemblies/RJW.dll' + - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From 8315e2b8bebed56383ae5c458533bfebab939264 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:29:44 +0000 Subject: [PATCH 17/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c848e73..444063f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,7 +85,7 @@ cache: # Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html before_script: - 'cd $SOURCE_CODE_PATH' - - 'dotnet restore --packages $NUGET_PACKAGES_DIRECTORY' + - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' build: stage: build @@ -98,7 +98,7 @@ build: # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). # Only one project path can be passed as a parameter to 'dotnet build' command. script: - - 'curl --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' + - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' #tests: From c748aa266ac15dd6e32bcc6fc93238b30a56eec3 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sat, 27 Apr 2024 18:34:50 +0000 Subject: [PATCH 18/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 444063f..37b5780 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -90,13 +90,6 @@ before_script: build: stage: build # ### Build all projects discovered from solution file. - # - # Note: this will fail if you have any projects in your solution that are not - # .NET Core-based projects (e.g. WCF service), which is based on .NET Framework, - # not .NET Core. In this scenario, you will need to build every .NET Core-based - # project by explicitly specifying a relative path to the directory - # where it is located (e.g. 'dotnet build ./src/ConsoleApp'). - # Only one project path can be passed as a parameter to 'dotnet build' command. script: - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' From 2b86118ad6fa5a62b75e95a3510f077d2303718f Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 05:59:59 +0000 Subject: [PATCH 19/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37b5780..62ae2c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -93,6 +93,10 @@ build: script: - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' + artifacts: + untracked: false + when: on_success + expire_in: 3 days #tests: # stage: test From f48432d3ebb61dd7e75a08509c86ba18e1855cc1 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:02:09 +0000 Subject: [PATCH 20/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 62ae2c7..1016ad0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -97,6 +97,8 @@ build: untracked: false when: on_success expire_in: 3 days + paths: + - / #tests: # stage: test From 479232e8b0ef9b767db3f9bc01cde76d3977d501 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:07:40 +0000 Subject: [PATCH 21/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1016ad0..1f4a827 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,7 +98,7 @@ build: when: on_success expire_in: 3 days paths: - - / + - "*" #tests: # stage: test From e41f0be25169562c7e1df9161071ae710c8a1b22 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:11:32 +0000 Subject: [PATCH 22/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f4a827..fd328ef 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,6 +99,8 @@ build: expire_in: 3 days paths: - "*" + exclude: + - ".*" #tests: # stage: test From 6f6291b8f88b47721d04298218d78096aa98501f Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:16:29 +0000 Subject: [PATCH 23/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fd328ef..f8af6d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,6 +101,7 @@ build: - "*" exclude: - ".*" + - ".*/" #tests: # stage: test From eef4121e1fe49be8918d8534557fde4caa98d94f Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:21:24 +0000 Subject: [PATCH 24/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f8af6d1..cba51f6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ build: - "*" exclude: - ".*" - - ".*/" + - ".*/*" #tests: # stage: test From 6c7a9503f44bbd6d618d2add00b106d0e769c199 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:25:07 +0000 Subject: [PATCH 25/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cba51f6..eacfaad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -101,7 +101,7 @@ build: - "*" exclude: - ".*" - - ".*/*" + - ".*/**/*" #tests: # stage: test From 4136e131e799e71d51cc23933ee75cb66bfeffeb Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 06:31:20 +0000 Subject: [PATCH 26/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eacfaad..94a92bb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -98,10 +98,11 @@ build: when: on_success expire_in: 3 days paths: - - "*" + - "*" # Incluse everything exclude: - - ".*" - - ".*/**/*" + - ".*" # Exclude dot files + - ".*/**/*" # Exclude everything in the dot folders + - "Source/**/*" # Exclude everything in the Source folder #tests: # stage: test From 80f0786960c6813a330c1bcc45acc959561104f4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 13:51:52 +0000 Subject: [PATCH 27/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94a92bb..798f8d4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -96,7 +96,7 @@ build: artifacts: untracked: false when: on_success - expire_in: 3 days + expire_in: 1 day paths: - "*" # Incluse everything exclude: @@ -117,7 +117,17 @@ build: # script: # - 'dotnet test --no-restore' -#deploy: -# stage: deploy -# script: echo "Define your deployment script!" -# environment: production +release_dev: + stage: deploy + image: registry.gitlab.com/gitlab-org/release-cli:latest + rules: + - if: $CI_COMMIT_TAG + when: never # Do not run this job when a tag is created manually + - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch + script: + - echo "running release_job for $TAG" + release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties + tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. + description: 'Automated release based on commit $CI_COMMIT_SHA' + ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. + From bc6c37e0ccef1c0d299abb8001e2f27d24989465 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 14:00:17 +0000 Subject: [PATCH 28/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 798f8d4..30b57a9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,14 +83,16 @@ cache: # in the root of project repository, so its content can be cached. # # Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html -before_script: - - 'cd $SOURCE_CODE_PATH' - - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' +#before_script: +# - 'cd $SOURCE_CODE_PATH' +# - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' build: stage: build # ### Build all projects discovered from solution file. script: + - 'cd $SOURCE_CODE_PATH' + - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/$RIMWORLD_VERSION/Assemblies/RJW.dll' - 'dotnet build --no-restore' artifacts: From 863dfc71dcfe7d7420c5fb62f3e78a848a064a60 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 14:03:28 +0000 Subject: [PATCH 29/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 30b57a9..56e5fa3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ release_dev: when: never # Do not run this job when a tag is created manually - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - - echo "running release_job for $TAG" + - echo "running release_job for TAG" release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. description: 'Automated release based on commit $CI_COMMIT_SHA' From 6aac2836bba93abb86e949af805622a6ffc4a148 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 14:11:08 +0000 Subject: [PATCH 30/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 56e5fa3..5a72652 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -122,10 +122,10 @@ build: release_dev: stage: deploy image: registry.gitlab.com/gitlab-org/release-cli:latest - rules: - - if: $CI_COMMIT_TAG - when: never # Do not run this job when a tag is created manually - - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch +# rules: +# - if: $CI_COMMIT_TAG +# when: never # Do not run this job when a tag is created manually +# - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - echo "running release_job for TAG" release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties From 12af69d11a50bd8b961bf1d4413d1e1a844f605e Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 14:42:48 +0000 Subject: [PATCH 31/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a72652..ae59f7f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -131,5 +131,5 @@ release_dev: release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. description: 'Automated release based on commit $CI_COMMIT_SHA' - ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. +# ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. From 61b209021a2889a88e278c1e7ad797bc3b8b37c4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 14:56:50 +0000 Subject: [PATCH 32/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae59f7f..e0a6f26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -130,6 +130,6 @@ release_dev: - echo "running release_job for TAG" release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. - description: 'Automated release based on commit $CI_COMMIT_SHA' -# ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. + description: 'Automated release based on commit CI_COMMIT_SHA' + ref: '$CI_COMMIT_BRANCH' # The tag is created from the pipeline SHA. From 2399f2af6465e3e40bcbb693f62d69a3a7c6efcd Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 15:06:45 +0000 Subject: [PATCH 33/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e0a6f26..7ccf58f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,9 +127,9 @@ release_dev: # when: never # Do not run this job when a tag is created manually # - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - - echo "running release_job for TAG" - release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties - tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. - description: 'Automated release based on commit CI_COMMIT_SHA' - ref: '$CI_COMMIT_BRANCH' # The tag is created from the pipeline SHA. + - echo "running release_job for $CI_COMMIT_SHA" +# release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties +# tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. +# description: 'Automated release based on commit CI_COMMIT_SHA' +# ref: '$CI_COMMIT_BRANCH' # The tag is created from the pipeline SHA. From e643833472267a8a12dd928e3f56603ef239f597 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 15:10:02 +0000 Subject: [PATCH 34/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7ccf58f..d9afd90 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -127,7 +127,7 @@ release_dev: # when: never # Do not run this job when a tag is created manually # - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - - echo "running release_job for $CI_COMMIT_SHA" + - 'echo "running release_job for $CI_COMMIT_SHA"' # release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties # tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. # description: 'Automated release based on commit CI_COMMIT_SHA' From 818d288cc53d18c0759cfef028365c0950743fdd Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 17:19:35 +0000 Subject: [PATCH 35/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d9afd90..351a915 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -121,15 +121,16 @@ build: release_dev: stage: deploy - image: registry.gitlab.com/gitlab-org/release-cli:latest +# image: registry.gitlab.com/gitlab-org/release-cli:latest # this image currently is amd64 only + image: alpine:latest # rules: # - if: $CI_COMMIT_TAG # when: never # Do not run this job when a tag is created manually # - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - - 'echo "running release_job for $CI_COMMIT_SHA"' -# release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties -# tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. -# description: 'Automated release based on commit CI_COMMIT_SHA' -# ref: '$CI_COMMIT_BRANCH' # The tag is created from the pipeline SHA. + - 'apk add gitlab-release-cli' + release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties + tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. + description: 'Automated release based on commit CI_COMMIT_SHA' + ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. From 00c4eac73a9e74f9fae11da691f59e0253146649 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Sun, 28 Apr 2024 17:28:49 +0000 Subject: [PATCH 36/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 351a915..dfac7b5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -123,10 +123,10 @@ release_dev: stage: deploy # image: registry.gitlab.com/gitlab-org/release-cli:latest # this image currently is amd64 only image: alpine:latest -# rules: -# - if: $CI_COMMIT_TAG -# when: never # Do not run this job when a tag is created manually -# - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch + rules: + - if: $CI_COMMIT_TAG + when: never # Do not run this job when a tag is created manually + - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: - 'apk add gitlab-release-cli' release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties From 41adf1086517ba62048059ce5f1089e5b57625be Mon Sep 17 00:00:00 2001 From: amevarashi Date: Mon, 29 Apr 2024 08:22:51 +0000 Subject: [PATCH 37/48] Update .gitlab-ci.yml file --- .gitlab-ci.yml | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfac7b5..e473f22 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,20 +3,7 @@ # This specific template is located at: # https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.gitlab-ci.yml -# This is a simple example illustrating how to build and test .NET Core project -# with GitLab Continuous Integration / Continuous Delivery. -# # ### Specify the Docker image -# -# Instead of installing .NET Core SDK manually, a docker image is used -# with already pre-installed .NET Core SDK. -# -# The 'latest' tag targets the latest available version of .NET Core SDK image. -# If preferred, you can explicitly specify version of .NET Core (e.g. using '2.2-sdk' tag). -# -# See other available tags for .NET Core: https://hub.docker.com/_/microsoft-dotnet -# Learn more about Docker tags: https://docs.docker.com/glossary/?term=tag -# and the Docker itself: https://opensource.com/resources/what-docker image: mcr.microsoft.com/dotnet/sdk:latest # ### Define variables @@ -109,13 +96,6 @@ build: #tests: # stage: test # ### Run the tests - # - # You can either run tests for all test projects that are defined in your solution - # with 'dotnet test' or run tests only for specific project by specifying - # a relative path to the directory where it is located (e.g. 'dotnet test ./test/UnitTests'). - # - # You may want to define separate testing jobs for different types of testing - # (e.g. integration tests, unit tests etc). # script: # - 'dotnet test --no-restore' @@ -128,9 +108,10 @@ release_dev: when: never # Do not run this job when a tag is created manually - if: $CI_COMMIT_BRANCH == "ci-test" # Run this job when commits are pushed or merged to the dev branch script: + - 'ls -l' - 'apk add gitlab-release-cli' - release: # See https://docs.gitlab.com/ee/ci/yaml/#release for available properties - tag_name: 'test-build-$CI_PIPELINE_IID' # The version is incremented per pipeline. - description: 'Automated release based on commit CI_COMMIT_SHA' + release: + tag_name: '$CI_COMMIT_BRANCH-$CI_PIPELINE_IID' # The version is incremented per pipeline. + description: 'Automated release based on commit $CI_COMMIT_SHORT_SHA $CI_COMMIT_TAG' ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. From 2f7a1c0883796c4280f04bb5e59d18817a11284c Mon Sep 17 00:00:00 2001 From: amevarashi Date: Mon, 29 Apr 2024 21:02:37 +0500 Subject: [PATCH 38/48] initial 1.5 --- .gitlab-ci.yml | 124 +++ 1.5/Defs/DutyDefs/Duties_Rituals_sex.xml | 89 +++ 1.5/Defs/Goodwill/MemeCompatibility_Sex.xml | 50 ++ .../Interactions_Speech_sex.xml | 103 +++ 1.5/Defs/JobDefs/Jobs_Ritual_Sex.xml | 47 ++ 1.5/Defs/MemeDefs/Memes_Sexual.xml | 246 ++++++ 1.5/Defs/PreceptDefs/Precepts_BabyFaction.xml | 42 + 1.5/Defs/PreceptDefs/Precepts_Bestiality.xml | 744 ++++++++++++++++++ 1.5/Defs/PreceptDefs/Precepts_Incest.xml | 516 ++++++++++++ .../PreceptDefs/Precepts_Masturbation.xml | 47 ++ 1.5/Defs/PreceptDefs/Precepts_Necrophilia.xml | 309 ++++++++ 1.5/Defs/PreceptDefs/Precepts_Pregnancy.xml | 206 +++++ 1.5/Defs/PreceptDefs/Precepts_Rape.xml | 438 +++++++++++ 1.5/Defs/PreceptDefs/Precepts_Ritual_sex.xml | 118 +++ 1.5/Defs/PreceptDefs/Precepts_Sex.xml | 384 +++++++++ .../PreceptDefs/Precepts_SexProselytizing.xml | 21 + 1.5/Defs/PreceptDefs/Precepts_SizeMatters.xml | 219 ++++++ .../PreceptDefs/Precepts_SocialAffection.xml | 62 ++ 1.5/Defs/PreceptDefs/Precepts_Submissive.xml | 204 +++++ 1.5/Defs/PreceptDefs/Precepts_Virginity.xml | 360 +++++++++ .../RitualPatternDefs/RitualPatterns_sex.xml | 67 ++ .../PreconfiguredIdeos/IdeoPresetDefs_sex.xml | 36 + 1.5/Defs/Rituals/Ritual_Behaviors_sex.xml | 466 +++++++++++ 1.5/Defs/Rituals/Ritual_Outcomes_sex.xml | 400 ++++++++++ 1.5/Defs/Rituals/Ritual_Targets_sex.xml | 15 + 1.5/Defs/ThingDefs/Buildings_Ideo_sex.xml | 134 ++++ .../Thoughts_Ritual_sex_Quality.xml | 115 +++ 1.5/Patches/InteractionDef/Masturbation.xml | 14 + 1.5/Patches/InteractionDef/Necro.xml | 25 + 1.5/Patches/InteractionDef/Rape.xml | 83 ++ 1.5/Patches/InteractionDef/Rape_Reverse.xml | 83 ++ 1.5/Patches/InteractionDef/Sex.xml | 73 ++ 1.5/Patches/InteractionDef/Sex_Reverse.xml | 73 ++ 1.5/Patches/RJW_Drugs.xml | 47 ++ 1.5/Patches/RJW_Precepts.xml | 29 + 1.5/Patches/RJW_StatDefs_Ideo.xml | 14 + 1.5/Patches/RJW_ThoughtDefs.xml | 114 +++ 1.5/Patches/RJW_ThoughtDefsDeath.xml | 68 ++ 1.5/Patches/RJW_ThoughtDefsLost.xml | 68 ++ About/About.xml | 1 + About/Manifest.xml | 2 +- LoadFolders.xml | 4 + Source/IdeologyAddon/DebugAction.cs | 3 +- Source/IdeologyAddon/IdeologyAddon.csproj | 10 +- .../Rituals/JobGiver_DrugOrgy.cs | 12 +- .../Rituals/JobGiver_GangbangConsensual.cs | 9 +- .../Rituals/RitualOutcomeComps.cs | 16 +- .../RomanceChanceFactorHelpers.cs | 3 +- 48 files changed, 6295 insertions(+), 18 deletions(-) create mode 100644 .gitlab-ci.yml create mode 100644 1.5/Defs/DutyDefs/Duties_Rituals_sex.xml create mode 100644 1.5/Defs/Goodwill/MemeCompatibility_Sex.xml create mode 100644 1.5/Defs/InteractionDefs/Interactions_Speech_sex.xml create mode 100644 1.5/Defs/JobDefs/Jobs_Ritual_Sex.xml create mode 100644 1.5/Defs/MemeDefs/Memes_Sexual.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_BabyFaction.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Bestiality.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Incest.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Masturbation.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Necrophilia.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Pregnancy.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Rape.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Ritual_sex.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Sex.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_SexProselytizing.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_SizeMatters.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Submissive.xml create mode 100644 1.5/Defs/PreceptDefs/Precepts_Virginity.xml create mode 100644 1.5/Defs/PreceptDefs/RitualPatternDefs/RitualPatterns_sex.xml create mode 100644 1.5/Defs/PreconfiguredIdeos/IdeoPresetDefs_sex.xml create mode 100644 1.5/Defs/Rituals/Ritual_Behaviors_sex.xml create mode 100644 1.5/Defs/Rituals/Ritual_Outcomes_sex.xml create mode 100644 1.5/Defs/Rituals/Ritual_Targets_sex.xml create mode 100644 1.5/Defs/ThingDefs/Buildings_Ideo_sex.xml create mode 100644 1.5/Defs/ThoughtDefs/Thoughts_Ritual_sex_Quality.xml create mode 100644 1.5/Patches/InteractionDef/Masturbation.xml create mode 100644 1.5/Patches/InteractionDef/Necro.xml create mode 100644 1.5/Patches/InteractionDef/Rape.xml create mode 100644 1.5/Patches/InteractionDef/Rape_Reverse.xml create mode 100644 1.5/Patches/InteractionDef/Sex.xml create mode 100644 1.5/Patches/InteractionDef/Sex_Reverse.xml create mode 100644 1.5/Patches/RJW_Drugs.xml create mode 100644 1.5/Patches/RJW_Precepts.xml create mode 100644 1.5/Patches/RJW_StatDefs_Ideo.xml create mode 100644 1.5/Patches/RJW_ThoughtDefs.xml create mode 100644 1.5/Patches/RJW_ThoughtDefsDeath.xml create mode 100644 1.5/Patches/RJW_ThoughtDefsLost.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..3410c8d --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,124 @@ +# To contribute improvements to CI/CD templates, please follow the Development guide at: +# https://docs.gitlab.com/ee/development/cicd/templates.html +# This specific template is located at: +# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.gitlab-ci.yml + +# ### Specify the Docker image +image: mcr.microsoft.com/dotnet/sdk:latest + +# ### Define variables +# +variables: + # 1) Name of directory where restore and build objects are stored. + OBJECTS_DIRECTORY: 'IdeologyAddon/obj' + # 2) Name of directory used for keeping restored dependencies. + NUGET_PACKAGES_DIRECTORY: '.nuget' + # 3) A relative path to the source code from project repository root. + # NOTE: Please edit this path so it matches the structure of your project! + SOURCE_CODE_PATH: 'Source/' + +# ### Define global cache rule +# +# Before building the project, all dependencies (e.g. third-party NuGet packages) +# must be restored. Jobs on GitLab.com's Shared Runners are executed on autoscaled machines. +# +# Each machine is used only once (for security reasons) and after that is removed. +# This means that, before every job, a dependency restore must be performed +# because restored dependencies are removed along with machines. Fortunately, +# GitLab provides cache mechanism with the aim of keeping restored dependencies +# for other jobs. +# +# This example shows how to configure cache to pass over restored +# dependencies for re-use. +# +# With global cache rule, cached dependencies will be downloaded before every job +# and then unpacked to the paths as specified below. +cache: + # Per-stage and per-branch caching. + key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG" + paths: + # Specify three paths that should be cached: + # + # 1) Main JSON file holding information about package dependency tree, packages versions, + # frameworks etc. It also holds information where to the dependencies were restored. + - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/project.assets.json' + # 2) Other NuGet and MSBuild related files. Also needed. + - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/*.csproj.nuget.*' + # 3) Path to the directory where restored dependencies are kept. + - '$NUGET_PACKAGES_DIRECTORY' + # + # 'pull-push' policy means that latest cache will be downloaded (if it exists) + # before executing the job, and a newer version will be uploaded afterwards. + # Such a setting saves time when there are no changes in referenced third-party + # packages. + # + # For example, if you run a pipeline with changes in your code, + # but with no changes within third-party packages which your project is using, + # then project restore will happen quickly as all required dependencies + # will already be there — unzipped from cache. + + # 'pull-push' policy is the default cache policy, you do not have to specify it explicitly. + policy: pull-push + +# ### Restore project dependencies +# +# NuGet packages by default are restored to '.nuget/packages' directory +# in the user's home directory. That directory is out of scope of GitLab caching. +# +# To get around this, a custom path can be specified using the '--packages ' option +# for 'dotnet restore' command. In this example, a temporary directory is created +# in the root of project repository, so its content can be cached. +# +# Learn more about GitLab cache: https://docs.gitlab.com/ee/ci/caching/index.html +#before_script: +# - 'cd $SOURCE_CODE_PATH' +# - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' + +build: + stage: build + # ### Build all projects discovered from solution file. + script: + - 'cd $SOURCE_CODE_PATH' + - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' + - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.5/Assemblies/RJW.dll' + - 'dotnet build --no-restore' + artifacts: + untracked: false + when: on_success + expire_in: 1 day + paths: + - "*" # Incluse everything + exclude: + - ".*" # Exclude dot files + - ".*/**/*" # Exclude everything in the dot folders + - "Source/**/*" # Exclude everything in the Source folder + +#tests: +# stage: test + # ### Run the tests +# script: +# - 'dotnet test --no-restore' + +release_dev: + stage: deploy +# image: registry.gitlab.com/gitlab-org/release-cli:latest # this image currently is amd64 only + image: alpine:latest + 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 + 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" + script: +# - 'apk add gitlab-release-cli' + - apk add zip curl + - 'zip -rq rsi.zip ./' + - echo "${PACKAGE_REGISTRY_URL}" + - | + curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file rsi.zip "${PACKAGE_REGISTRY_URL}/rjw_sexperience_ideology.zip" +# release: +# tag_name: '$CI_COMMIT_BRANCH-$CI_PIPELINE_IID' # The version is incremented per pipeline. +# description: 'Automated release based on commit $CI_COMMIT_SHORT_SHA $CI_COMMIT_TAG' +# ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. + diff --git a/1.5/Defs/DutyDefs/Duties_Rituals_sex.xml b/1.5/Defs/DutyDefs/Duties_Rituals_sex.xml new file mode 100644 index 0000000..87b4ade --- /dev/null +++ b/1.5/Defs/DutyDefs/Duties_Rituals_sex.xml @@ -0,0 +1,89 @@ + + + + + Gangbang_Rape + HighPriority + Off + + +
  • + +
  • + 0.25 + +
  • + +
    • +     + + +
  • + Jog + 50~250 +
    • + +     +     + + + Gangbang_Consensual + HighPriority + Off + + +
  • + +
  • + 0.25 + +
  • + +
    • +     + + +
  • + Jog + 50~250 +
    • + +     +     + + + FuckVictim + HighPriority + Off + + +
  • + + + + + + DrugOrgy + HighPriority + Off + + +
  • + +
  • + 0.15 + +
  • + +
    • +     + + +
  • + Jog + 50~250 +
    • + +     +     +     \ No newline at end of file diff --git a/1.5/Defs/Goodwill/MemeCompatibility_Sex.xml b/1.5/Defs/Goodwill/MemeCompatibility_Sex.xml new file mode 100644 index 0000000..2f21ff1 --- /dev/null +++ b/1.5/Defs/Goodwill/MemeCompatibility_Sex.xml @@ -0,0 +1,50 @@ + + + + + + Zoophile_Zoophile + + GoodwillSituationWorker_MemeCompatibility + Zoophile + Zoophile + 30 + + + + Necrophile_Necrophile + + GoodwillSituationWorker_MemeCompatibility + Necrophile + Necrophile + 30 + + + + + Zoophile_All + + RJWSexperience.Ideology.GoodwillSituationWorker_OneWayReceive + Zoophile + true + -50 + + + + Rapist_All + + RJWSexperience.Ideology.GoodwillSituationWorker_OneWayReceive + Rapist + true + -20 + + + + Necrophile_All + + RJWSexperience.Ideology.GoodwillSituationWorker_OneWayReceive + Necrophile + true + -50 + + diff --git a/1.5/Defs/InteractionDefs/Interactions_Speech_sex.xml b/1.5/Defs/InteractionDefs/Interactions_Speech_sex.xml new file mode 100644 index 0000000..8e90d69 --- /dev/null +++ b/1.5/Defs/InteractionDefs/Interactions_Speech_sex.xml @@ -0,0 +1,103 @@ + + + + + Speech_Gangbang + + InteractionWorker + True + Things/Mote/SpeechSymbols/Speech + +
  • SpeechUtility
    •  + +
  • r_logentry->[INITIATOR_nameDef] [spokeof] [speechtopic].
    • +
  • r_logentry(p=0.2)->[INITIATOR_nameDef] [crazy].
    • + +
  • speechtopic->the meaning and true value of rape
    • +
  • speechtopic->expressions of rape
    • +
  • speechtopic->controlled lustful
    • +
  • speechtopic->the warmth of pussy
    • +
  • speechtopic->the meaning of cum
    • +
  • speechtopic->love and rape
    • +
  • speechtopic->symbolizing rape
    • +
  • speechtopic->dick and pussy
    • +
  • speechtopic->the art of rape
    • +
  • speechtopic->the seduction of victim
    • +
  • speechtopic->the music of screams
    • +
  • speechtopic->cums on the floor
    • + +
  • crazy->screamed maniacally
    • +
  • crazy->broke into a chant
    • +
  • crazy->chanted towards the heavens
    • +
  • crazy->spat in the sacrifice's genital
    • +
  • crazy->cackled
    • +
  • crazy->brandished a condom
    • +
  • crazy->muttered repetitively while masturbating
    • +     +     +     + + + Speech_Zoophile + + InteractionWorker + True + Things/Mote/SpeechSymbols/Speech + +
  • SpeechUtility
    •  + +
  • r_logentry->[INITIATOR_nameDef] [spokeof] [speechtopic].
    • + +
  • speechtopic->the meaning and true value of bestiality
    • +
  • speechtopic->expressions of bestiality
    • +
  • speechtopic->controlled lustful
    • +
  • speechtopic->the warmth of cum
    • +
  • speechtopic->the meaning of interspecies breeding
    • +
  • speechtopic->animal and love
    • +
  • speechtopic->symbolizing bestiality
    • +
  • speechtopic->breed and birth
    • +
  • speechtopic->the art of breeding
    • +
  • speechtopic->the seduction of animals
    • +
  • speechtopic->cums on the floor
    • +     +     +     + + + + Speech_Lewd + + InteractionWorker + True + Things/Mote/SpeechSymbols/Speech + +
  • SpeechUtility
    •  + +
  • r_logentry->[INITIATOR_nameDef] [spokeof] [speechtopic].
    • +
  • r_logentry(p=0.2)->[INITIATOR_nameDef] [crazy].
    • + +
  • speechtopic->the meaning and true value of sex
    • +
  • speechtopic->expressions of sex
    • +
  • speechtopic->uncontrolled lustful
    • +
  • speechtopic->the warmth of pussy
    • +
  • speechtopic->the meaning of cum
    • +
  • speechtopic->love and incest
    • +
  • speechtopic->symbolizing rape
    • +
  • speechtopic->dick and pussy
    • +
  • speechtopic->the art of sex
    • +
  • speechtopic->the seduction of [spokeof]
    • +
  • speechtopic->the music of moan
    • +
  • speechtopic->cums on the floor
    • + +
  • crazy->moaned maniacally
    • +
  • crazy->threw a dildo
    • +
  • crazy->threw an onahole
    • +
  • crazy->chanted towards the heavens
    • +
  • crazy->moaned
    • +
  • crazy->brandished a dildo
    • +
  • crazy->muttered repetitively while masturbating
    • +     +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/JobDefs/Jobs_Ritual_Sex.xml b/1.5/Defs/JobDefs/Jobs_Ritual_Sex.xml new file mode 100644 index 0000000..3f3151b --- /dev/null +++ b/1.5/Defs/JobDefs/Jobs_Ritual_Sex.xml @@ -0,0 +1,47 @@ + + + + + RapeVictim + RJWSexperience.Ideology.JobDriver_RapeVictim + rapin' victim + false + + + + DrugSex + RJWSexperience.Ideology.JobDriver_SexDrugOrgy + lovin'. + false + + + + GettinDrugSex + RJWSexperience.Ideology.JobDriver_DrugSexReceiver + lovin'. + false + + + + DrugMasturbate + RJWSexperience.Ideology.JobDriver_DrugMasturabate + masturbatin'. + false + + + + Gangbang + RJWSexperience.Ideology.JobDriver_Gangbang + lovin'. + false + + + + GettinGangbang + RJWSexperience.Ideology.JobDriver_GangbangReceiver + gettin' gangbanged. + Never + false + + + \ No newline at end of file diff --git a/1.5/Defs/MemeDefs/Memes_Sexual.xml b/1.5/Defs/MemeDefs/Memes_Sexual.xml new file mode 100644 index 0000000..44f828c --- /dev/null +++ b/1.5/Defs/MemeDefs/Memes_Sexual.xml @@ -0,0 +1,246 @@ + + + + SexualDissolutely + (0.65, 0.23) + 1 + 3000 + + + + SexualDissolutely + + 1.0 + + + + + + + Zoophile + + Animal fuckers. + UI/Commands/Breeding_Pawn_off + 3 + +
  • +
  • Bestiality_Acceptable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • + +     + + +
  • memeAdjective->bestial
    • +
  • memeAdjective->zoophile
    • +
  • memeHyphenPrefix->bestial
    • +
  • memeConcept->breeding
    • +
  • memeConcept->bestiality
    • +
  • memeConcept->zoophile
    • +
  • memeLeaderNoun->livestock
    • +     +     + + + + +
  • creation(tag=meme_Zoophile) ->[deity0_name] loves breeding with beasts.
    • +
  • episode(uses=1,tag=meme_Zoophile) ->[deity0_name] said to all, "Sigmar forbids this!"
    • + +
  • setup(tag=meme_Zoophile) ->Someday, [founderName] was so horny that accidentally fucked with an animal and loved it.
    • +
  • story(uses=1,tag=meme_Zoophile) ->For spreading animals, [founderName] started to breed with animals.
    • + +
  • lessonIntro(tag=meme_Zoophile) ->Someday, i had sex with animal. It was much better than humans!
    • +
  • lesson(tag=meme_Zoophile) ->Only the animals can satisfy me.
    • +
  • lessonReinforcement(tag=meme_Zoophile) ->Breed with animals. It is the eternal hapiness.
    • + +
  • archistBasis(tag=meme_Zoophile) ->Archists are always seeking ultimate pleasure.
    • +
  • archistFact(tag=meme_Zoophile) ->That was breeding with animals.
    • +
  • archistProphecy(tag=meme_Zoophile) ->[inTheEnd], the archotechs will finally unlock the interspecies breeding, so that they may lead ultimate pleasure.
    • + +
  • animistFact(tag=meme_Zoophile) ->The most powerful spirits are those of beasts, and spirits of beasts will be restless unless beasts rule.
    • +
  • animistProphecy(tag=meme_Zoophile) ->[itIsSaid] that a powerful spirit of destruction will seek to end the universe, but that a human-born beast will wield the spirit of the [relic0_name] and destroy the destroyer.
    • +     +     +     + +
  • + Breeders + breed + bestiality + breeder +
    • +
  • + Zoophilia + zoophile + zoophile + zoophiliac +
    • +     + +
  • Zoophile
    • +     +     + + + + Rapist + + Rape is best. + UI/Memes/Rape + 2 + +
  • +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • + +     + + +
  • memeAdjective->violent
    • +
  • memeAdjective->raping
    • +
  • memeHyphenPrefix->rapist
    • +
  • memeHyphenPrefix->molester
    • +
  • memeHyphenPrefix->pervert
    • +
  • memeConcept->rapist
    • +
  • memeConcept->pervert
    • +
  • r_deityName->slaanesh
    • +
  • memeLeaderNoun->stallion
    • +
  • memeLeaderNoun->grand rapist
    • +     +     + + + + +
  • creation(tag=meme_Rapist) ->[deity0_name] loves rape.
    • +
  • episode(uses=1,tag=meme_Rapist) ->[deity0_name] raped everyone until death during rape.
    • + +
  • setup(tag=meme_Rapist) ->[founderName] is always horny.
    • +
  • story(uses=1,tag=meme_Rapist) ->[founderName] raped everyone. No one can stop [founderName]. [founderName] died trying to rape planet.
    • + +
  • lessonIntro(tag=meme_Rapist) ->Rape is best! Rape is best! Rape is best!
    • +
  • lesson(tag=meme_Rapist) ->Rape is best! Rape is best! Rape is best! Rape is best!
    • +
  • lessonReinforcement(tag=meme_Rapist) ->Rape is best! Rape is best! Rape is best! Rape is best! Rape is best!
    • + +
  • archistBasis(tag=meme_Rapist) ->Human history is history of rape.
    • +
  • archistFact(tag=meme_Rapist) ->Even archotechs cannot stop rapists.
    • +
  • archistProphecy(tag=meme_Rapist) ->[inTheEnd], the rapists never stop raping.
    • + +
  • animistFact(tag=meme_Rapist) ->The most powerful spirits are those of rapists, and spirits of rapists will rape all.
    • +
  • animistProphecy(tag=meme_Rapist) ->[itIsSaid] that a powerful spirit of destruction will seek to end the universe, but that a million-raped rapist will wield the spirit of the [relic0_name] and rape the destroyer.
    • +     +     +     + +
  • + Rapists + rapist + raping + rapist +
    • +
  • + Cult of Slaanesh + pleasure + decadent + heretic +
    • +     + +
  • Rapist
    • +     +     + + + Lewd + + Perverts. + UI/Memes/SexualDissolutely + 3 + +
  • Burnbong_Aphrodisiac
    • +     + +
  • +
  • Lovin_FreeApproved
    • + +
  • +
  • Incestuos_Free
    • + +
  • +
  • Sex_Free
    • +
  • Sex_Promiscuous
    • + +     + +
  • + DateRitualConsumable + DrugOrgy + Burnbong_Aphrodisiac +
    • +     + + +
  • memeAdjective->horny
    • +
  • memeAdjective->lewd
    • +
  • memeAdjective->arousing
    • +
  • memeAdjective->sexy
    • +
  • memeAdjective->estrous
    • +
  • memeAdjective->decadent
    • +
  • memeHyphenPrefix->estro
    • +
  • memeHyphenPrefix->lust
    • +
  • memeConcept->lust
    • +
  • memeConcept->libido
    • +
  • memeConcept->estrus
    • +
  • memeConcept->arousal
    • +
  • memeConcept->desire
    • +
  • memeConcept->sex
    • +
  • memeConcept->perversion
    • +
  • r_deityName->slaanesh
    • +     +     + +
  • + Cult of Slaanesh + pleasure + decadent + heretic +
    • +     + +
  • Autobong_Aphrodisiac
    • +     + +
  • Nymphomaniac
    • +     +     + + + Necrophile + + Corpse fuckers. + UI/Memes/Necrophile + 2 + +
  • +
  • Necrophilia_Acceptable
    • +
  • Necrophilia_Approved
    • + +
  • +
  • Corpses_DontCare
    • + +     + + +
  • r_deityName->sonic
    • +
  • r_deityName->mega man
    • +
  • memeConcept->corpse
    • +
  • memeConcept->dead
    • +     +     + +
  • Necrophiliac
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_BabyFaction.xml b/1.5/Defs/PreceptDefs/Precepts_BabyFaction.xml new file mode 100644 index 0000000..e26356c --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_BabyFaction.xml @@ -0,0 +1,42 @@ + + + + + + BabyFaction + + UI/Issues/Birth + + + + + + BabyFaction_AlwaysMother + BabyFaction + + New born babies always follow mother's faction and ideology. + Low + 50 + 1000 + + + + BabyFaction_AlwaysFather + BabyFaction + + New born babies always follow father's faction and ideology(if exists). + Low + 40 + 1000 + + + + BabyFaction_AlwaysColony + BabyFaction + + New born babies are always player's faction and ideology. + Low + 30 + 1000 + + \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Bestiality.xml b/1.5/Defs/PreceptDefs/Precepts_Bestiality.xml new file mode 100644 index 0000000..a6eebe4 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Bestiality.xml @@ -0,0 +1,744 @@ + + + + + + Bestiality + + UI/Commands/Breeding_Pawn_off + + + + RSI_SexWithAnimal + + +
  • + +
  • + + + true + + + RSI_SexWithVeneratedAnimal +
    • +
  • + + + true + + + false + + + RSI_SexWithNonVeneratedAnimal +
    • +
  • + + + true + + + +
  • Bond
    • + + + + RSI_SexWithBondedAnimal + +
  • + + + true + + + +
  • Bond
    • + + + + RSI_SexWithNonBondAnimal + + + +     +     + + + RSI_SexWithVeneratedAnimal + + + + + RSI_SexWithNonVeneratedAnimal + + + + + RSI_SexWithBondedAnimal + + + + + RSI_SexWithNonBondAnimal + + + + + + + Bestiality_Abhorrent + Bestiality + + Bestiality beings is deeply evil. + Low + 40 + 100 + 30 + +
  • Zoophile
    • +     + +
  • HumanPrimacy
    • +     + +
  • + RSI_SexWithAnimal +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Abhorrent +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Know_Abhorrent +
    • +
  • + RSI_SexWithAnimal + Bestiality_Abhorrent +
    • +
  • + RSI_SexWithAnimal + Bestiality_Know_Abhorrent +
    • +     + +
  • + +
  • + + + true + + + 0.05 +
    • + + +     +     + + + Bestiality_Horrible + Bestiality + + Bestiality is a horrible thing. + Low + 30 + 200 + 30 + +
  • Zoophile
    • +     + +
  • HumanPrimacy
    • +     + +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Horrible +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Know_Horrible +
    • +
  • + RSI_SexWithAnimal + Bestiality_Horrible +
    • +
  • + RSI_SexWithAnimal + Bestiality_Know_Horrible +
    • +     + +
  • + +
  • + + + true + + + 0.1 +
    • + + +
  • + 5.0 +
    • +     +     + + + Bestiality_Disapproved + Bestiality + + Bestiality is extremely distasteful. + Low + 20 + 300 + 20 + +
  • Zoophile
    • +     + +
  • HumanPrimacy
    • +     + +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Disapproved +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Know_Disapproved +
    • +
  • + RSI_SexWithAnimal + Bestiality_Disapproved +
    • +
  • + RSI_SexWithAnimal + Bestiality_Know_Disapproved +
    • +     + +
  • + +
  • + + + true + + + 0.5 +
    • + + +     +     + + + Bestiality_Acceptable + Bestiality + + Bestiality is a normal, unremarkable part of life. + Medium + 10 + 10 + true + +
  • + 0.75 +
    • +     +     + + + + Bestiality_OnlyVenerated + Bestiality + + One who sex with venerated animals should be honored and respected. But having sex with other animals will be denounced + High + 0 + 1000 + +
  • HumanPrimacy
    • +     + +
  • Zoophile
    • +     + +
  • + RSI_SexWithNonVeneratedAnimal + Bestiality_Nonvenerated_Disapproved + true +
    • +
  • + RSI_SexWithNonVeneratedAnimal + Bestiality_Nonvenerated_Know_Disapproved + Someone sex with any animal + true +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Honorable + true +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Know_Honorable + Someone sex with animal + true +
    • +     + +
  • + +
  • + + + true + + + 2.0 +
    • +
  • + + + true + + + false + + + 0.05 +
    • + + +
  • + 0.65 +
    • +     +     + + + + Bestiality_BondOnly + Bestiality + + Sex with Bonded animals should be honored and respected. But having sex with other animals will be denounced. + High + 0 + 1000 + +
  • HumanPrimacy
    • +     + +
  • Zoophile
    • +     + +
  • + RSI_SexWithNonBondAnimal + Bestiality_NonBonded_Disapproved + true +
    • +
  • + RSI_SexWithNonBondAnimal + Bestiality_NonBonded_Know_Disapproved + Someone sex with any animal + true +
    • +
  • + RSI_SexWithBondedAnimal + Bestiality_Bond_Approved + true +
    • +
  • + RSI_SexWithBondedAnimal + Bestiality_Bond_Approved_Know + Someone sex with non bonded animal + true +
    • +     + +
  • + +
  • + + + true + + + +
  • Bond
    • + + + + 2.0 + +
  • + + + true + + + +
  • Bond
    • + + + + 0.1 + + + +
  • + 0.5 +
    • +     +     + + + Bestiality_Honorable + Bestiality + + One who sex with animals should be encouraged. + High + 0 + 1000 + +
  • HumanPrimacy
    • +     + +
  • Zoophile
    • +     + +
  • + RSI_SexWithAnimal + Bestiality_Honorable + true +
    • +
  • + RSI_SexWithAnimal + Bestiality_Know_Honorable + Someone sex with animal + true +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Honorable + true +
    • +
  • + RSI_SexWithVeneratedAnimal + Bestiality_Know_Honorable + Someone sex with animal + true +
    • +     + +
  • + +
  • + + + true + + + 2.0 +
    • + + +
  • + 0.5 +
    • +     +     + + + + + + Bestiality_Abhorrent + 6 + 1 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + I had sex with animal. I want to die. + -15 +
    • +     +     + + + Bestiality_Know_Abhorrent + Thought_MemorySocial + 15 + 100 + 3 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + -30 +
    • +     +     + + + Bestiality_Horrible + 6 + 1 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + I had sex with animal. I'm not sure I can forgive myself. + -10 +
    • +     +     + + + Bestiality_Know_Horrible + Thought_MemorySocial + 15 + 100 + 3 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + -20 +
    • +     +     + + + Bestiality_Disapproved + 6 + 1 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + I had sex with animal. I hope nothing terrible happens to them. + -5 +
    • +     +     + + + Bestiality_Know_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Zoophile
    • +     + +
  • Bestiality_Honorable
    • +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + -10 +
    • +     +     + + + Bestiality_Nonvenerated_Disapproved + 6 + 1 + +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + I had sex with any animal. I hope nothing terrible happens to them. + -5 +
    • +     +     + + + Bestiality_Nonvenerated_Know_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     + +
  • + + -10 +
    • +     +     + + + Bestiality_NonBonded_Disapproved + 6 + 1 + +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +
  • Bestiality_OnlyVenerated
    • +     + +
  • + + I had sex with a non bonded animal. How could I? + -5 +
    • +     +     + + + Bestiality_Bond_Approved + 6 + 1 + +
  • Bestiality_Abhorrent
    • +
  • Bestiality_Horrible
    • +
  • Bestiality_Disapproved
    • +     + +
  • + + I went wild with my bonded animal! + 8 +
    • +     +     + + + Bestiality_Bond_Approved_Know + Thought_MemorySocial + 15 + 2 + +
  • Bestiality_Abhorrent
    • +
  • Bestiality_Horrible
    • +
  • Bestiality_Disapproved
    • +     + +
  • + + Shares a special bond. + 5 +
    • +     +     + + + Bestiality_NonBonded_Know_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +
  • Bestiality_OnlyVenerated
    • +     + +
  • + + -10 +
    • +     +     + + + Bestiality_Honorable + 6 + 1 + +
  • Bestiality_Abhorrent
    • +
  • Bestiality_Horrible
    • +
  • Bestiality_Disapproved
    • +     + +
  • + + I had sex with animal. + 4 +
    • +     +     + + + Bestiality_Know_Honorable + Thought_MemorySocial + 25 + 100 + 3 + +
  • Bestiality_Abhorrent
    • +
  • Bestiality_Horrible
    • +
  • Bestiality_Disapproved
    • +     + +
  • + + 5 +
    • +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Incest.xml b/1.5/Defs/PreceptDefs/Precepts_Incest.xml new file mode 100644 index 0000000..54c079a --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Incest.xml @@ -0,0 +1,516 @@ + + + + + + Incestuos + + UI/Issues/Incest + + + + RSI_CloseRelativeMarriage + + + + + RSI_IncestuosMarriage + + + + + RSI_NonIncestuosMarriage + + +
  • + +
  • + + + +
  • CloseRelative
    • + + + + RSI_CloseRelativeMarriage + +
  • + + + +
  • FarRelative
    • + + + + RSI_IncestuosMarriage + + + +     +     + + + RSI_CloseRelativeSex + + + + + RSI_IncestuosSex + + + + + RSI_NonIncestuosSex + + +
  • + +
  • + + + +
  • CloseRelative
    • + + + + RSI_CloseRelativeSex + +
  • + + + +
  • FarRelative
    • + + + + RSI_IncestuosSex + + + +     +     + + + + + Incestuos_Free + Incestuos + + Open minded. + Medium + 60 + 1000 + 100 + +
  • + +
  • CloseRelative
    • +
  • FarRelative
    • +
  • NotRelated
    • + + +
  • + CloseRelative + 1 +
    • +
  • + FarRelative + 1 +
    • +
  • + NotRelated + 1 +
    • +     + +     +     + + + Incestuos_Disapproved_CloseOnly + Incestuos + + Incest is disapproved socially. Relations farther than cousin are recognized as not incest. + Low + 50 + 1000 + 100 + +
  • + RSI_CloseRelativeMarriage + IncestuosMarriage_Disapproved +
    • +
  • + RSI_CloseRelativeSex + Sex_Know_Incest_Disapproved +
    • +     + +
  • + +
  • + + + +
  • CloseRelative
    • + + +
  • Spouse
    • +     + + + 0.5 + + + +
  • + +
  • FarRelative
    • +
  • NotRelated
    • + + +
  • + FarRelative + 1 +
    • +
  • + NotRelated + 1 +
    • +     + +     +     + + + Incestuos_Disapproved + Incestuos + + Incest is disapproved socially. + Low + 40 + 1000 + 100 + +
  • + RSI_IncestuosMarriage + IncestuosMarriage_Disapproved +
    • +
  • + RSI_IncestuosMarriage + Sex_Know_IncestMarriage_Disapproved +
    • +
  • + RSI_IncestuosSex + Sex_Know_Incest_Disapproved +
    • +     + +
  • + +
  • + + + +
  • CloseRelative
    • +
  • FarRelative
    • + + +
  • Spouse
    • +     + + + 0.5 + + + +     +     + + + Incestuos_Forbidden + Incestuos + + Incest is forbidden. + Low + 30 + 1000 + 100 + +
  • + RSI_IncestuosMarriage + IncestuosMarriage_Forbidden +
    • +
  • + RSI_IncestuosMarriage + Sex_Know_IncestMarriage_Forbidden +
    • +
  • + RSI_IncestuosSex + Sex_Know_Incest_Forbidden +
    • +     + +
  • + +
  • + + + +
  • CloseRelative
    • +
  • FarRelative
    • + + +
  • Spouse
    • +     + + + 0.1 + + + +
  • + +
  • + CloseRelative + 0.03 +
    • +
  • + FarRelative + 0.03 +
    • + + +     +     + + + Incestuos_IncestOnly + Incestuos + + For preserving pure blood, only incest allowed. + High + 0 + 1000 + +
  • + RSI_NonIncestuosMarriage + Sex_Know_IncestMarriage_Violated +
    • +
  • + RSI_NonIncestuosSex + Sex_Know_Incest_Violated +
    • +     + +
  • + +
  • + + + +
  • NotRelated
    • + + + + 0.1 + + + +
  • + +
  • CloseRelative
    • +
  • FarRelative
    • + + +
  • + CloseRelative + 1 +
    • +
  • + FarRelative + 1 +
    • +
  • + NotRelated + 0.03 +
    • +     + +     +     + + + + + IncestuosMarriage_Forbidden + 30 + 1 + +
  • Psychopath
    • +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + No one bless our marriage. + -10 +
    • +     +     + + + IncestuosMarriage_Disapproved + 30 + 1 + +
  • Psychopath
    • +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + They are speaking behind our back. + -5 +
    • +     +     + + + Sex_Know_Incest_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + -15 +
    • +     +     + + + Sex_Know_Incest_Forbidden + Thought_MemorySocial + 15 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + -30 +
    • +     +     + + + Sex_Know_IncestMarriage_Disapproved + Thought_MemorySocial + 60 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + -15 +
    • +     +     + + + Sex_Know_IncestMarriage_Forbidden + Thought_MemorySocial + 60 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_IncestOnly
    • +
  • Incestuos_Free
    • +     + +
  • + + -30 +
    • +     +     + + + Sex_Know_Incest_Violated + Thought_MemorySocial + 15 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_Disapproved_CloseOnly
    • +
  • Incestuos_Disapproved
    • +
  • Incestuos_Forbidden
    • +
  • Incestuos_Free
    • +     + +
  • + + -15 +
    • +     +     + + + Sex_Know_IncestMarriage_Violated + Thought_MemorySocial + 300 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • Incestuos_Disapproved_CloseOnly
    • +
  • Incestuos_Disapproved
    • +
  • Incestuos_Forbidden
    • +
  • Incestuos_Free
    • +     + +
  • + + -50 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Masturbation.xml b/1.5/Defs/PreceptDefs/Precepts_Masturbation.xml new file mode 100644 index 0000000..5951b94 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Masturbation.xml @@ -0,0 +1,47 @@ + + + + + + Masturbation + + UI/Issues/Bestiality + + + + RSI_Masturbated + + + + + + Masturbation_Abhorrent + Masturbation + + Masturbation is unacceptable. + Medium + 40 + 100 + +
  • + RSI_Masturbated +
    • +     +     + + + Masturbation_Disapproved + Masturbation + + Masturbation is somewhat shameful. + Low + 20 + 100 + +
  • + 2.0 +
    • +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Necrophilia.xml b/1.5/Defs/PreceptDefs/Precepts_Necrophilia.xml new file mode 100644 index 0000000..1a65c24 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Necrophilia.xml @@ -0,0 +1,309 @@ + + + + + + Necrophilia + + UI/Issues/Necrophilia + + + + RSI_SexWithCorpse + + + + + + + Necrophilia_Abhorrent + Necrophilia + + Necrophilia beings is deeply evil. + Low + 40 + 100 + 30 + +
  • Necrophile
    • +     + +
  • + RSI_SexWithCorpse +
    • +
  • + RSI_SexWithCorpse + Necrophilia_Abhorrent +
    • +
  • + RSI_SexWithCorpse + Necrophilia_Know_Abhorrent +
    • +     +     + + + Necrophilia_Horrible + Necrophilia + + Necrophilia is a horrible thing. + Low + 30 + 200 + 30 + +
  • Necrophile
    • +     + +
  • + RSI_SexWithCorpse + Necrophilia_Horrible +
    • +
  • + RSI_SexWithCorpse + Necrophilia_Know_Horrible +
    • +     + +
  • + 8.0 +
    • +     +     + + + Necrophilia_Disapproved + Necrophilia + + Necrophilia is extremely distasteful. + Low + 20 + 300 + 20 + +
  • Necrophile
    • +     + +
  • + RSI_SexWithCorpse + Necrophilia_Disapproved +
    • +
  • + RSI_SexWithCorpse + Necrophilia_Know_Disapproved +
    • +     +     + + + Necrophilia_Acceptable + Necrophilia + + Necrophilia is a normal, unremarkable part of life. + Medium + 10 + 10 + true + +
  • Necrophile
    • +     + +
  • + 0.75 +
    • +     +     + + + Necrophilia_Approved + Necrophilia + + Fucking corpse is approval. + High + 0 + 1000 + +
  • Necrophile
    • +
  • Lewd
    • +     + +
  • + RSI_SexWithCorpse + Necrophilia_Approved +
    • +
  • + RSI_SexWithCorpse + Necrophilia_Know_Approved +
    • +     + +
  • + 0.5 +
    • +     +     + + + + + + Necrophilia_Abhorrent + 6 + 1 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + I had fucked corpse. + -15 +
    • +     +     + + + Necrophilia_Know_Abhorrent + Thought_MemorySocial + 15 + 100 + 3 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + -30 +
    • +     +     + + + Necrophilia_Horrible + 6 + 1 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + I had fucked corpse. + -10 +
    • +     +     + + + Necrophilia_Know_Horrible + Thought_MemorySocial + 15 + 100 + 3 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + -20 +
    • +     +     + + + Necrophilia_Disapproved + 6 + 1 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + I had fucked corpse. + -5 +
    • +     +     + + + Necrophilia_Know_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Necrophiliac
    • +     + +
  • Necrophilia_Approved
    • +
  • Necrophilia_Acceptable
    • +     + +
  • + + -10 +
    • +     +     + + + Necrophilia_Approved + 6 + 1 + +
  • Necrophilia_Abhorrent
    • +
  • Necrophilia_Horrible
    • +
  • Necrophilia_Disapproved
    • +     + +
  • + + I had fucked corpse. + 4 +
    • +     +     + + + Necrophilia_Know_Approved + Thought_MemorySocial + 25 + 100 + 3 + +
  • Necrophilia_Abhorrent
    • +
  • Necrophilia_Horrible
    • +
  • Necrophilia_Disapproved
    • +     + +
  • + + 5 +
    • +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Pregnancy.xml b/1.5/Defs/PreceptDefs/Precepts_Pregnancy.xml new file mode 100644 index 0000000..bdd6015 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Pregnancy.xml @@ -0,0 +1,206 @@ + + + + + + + + + Pregnancy + + UI/Issues/Birth + + + + + Pregnancy_Holy + Pregnancy + + To be pregnant is a duty worthy of respect. Women carry our society into the next generation. + Medium + 10 + +
  • + Pregnancy_Respected_Pregnant +
    • +
  • + Pregnancy_Respected_Pregnant_Social +
    • +     +     + + + Pregnancy_Elevated + Pregnancy + + Being pregnant is considered noble. + Low + 20 + +
  • + Pregnancy_Elevated_Pregnant +
    • +
  • + Pregnancy_Elevated_Pregnant_Social +
    • +     +     + + + Pregnancy_NoRules + Pregnancy + + There are no thoughts about pregnancy. + Low + 30 + + + + + + Pregnancy_Required + Pregnancy + High + 40 + + Women should be pregnant - those who are not, are seen unworthy. + +
  • + Pregnancy_Respected_Pregnant +
    • +
  • + Pregnancy_Respected_Pregnant_Social +
    • +
  • + Pregnancy_Horrible_NonPregnant +
    • +
  • + Pregnancy_Horrible_NonPregnant_Social +
    • +     +     + + + Pregnancy_Horrible + Pregnancy + Low + 50 + + Being Pregnant is unclean. Take care and stay pure. + +
  • + Pregnancy_Horrible_Pregnant +
    • +
  • + Pregnancy_Horrible_Pregnant_Social +
    • +     +     + + + + + Pregnancy_Respected_Pregnant + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant + Thought_Situational + +
  • + + I am pregnant. This makes me a pillar of society. + 10 +
    • +     +     + + + Pregnancy_Elevated_Pregnant + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant + Thought_Situational + +
  • + + I am soon making our colony stronger. + 5 +
    • +     +     + + + Pregnancy_Respected_Pregnant_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant_Social + Thought_SituationalSocial + +
  • + + 20 +
    • +     +     + + + Pregnancy_Elevated_Pregnant_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant_Social + Thought_SituationalSocial + +
  • + + 10 +
    • +     +     + + + Pregnancy_Horrible_Pregnant_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant_Social + Thought_SituationalSocial + +
  • + + -20 +
    • +     +     + + + Pregnancy_Horrible_Pregnant + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_Pregnant + Thought_Situational + +
  • + + How did I end up like this? I never wanted to be pregnant! + -10 +
    • +     +     + + + + Pregnancy_Horrible_NonPregnant + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_NonPregnant + Thought_Situational + true + Female + +
  • + + I wish to be pregnant. + -6 +
    • +     +     + + + Pregnancy_Horrible_NonPregnant_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_NonPregnant_Social + Thought_SituationalSocial + Female + +
  • + + -5 +
    • +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Rape.xml b/1.5/Defs/PreceptDefs/Precepts_Rape.xml new file mode 100644 index 0000000..da2cfd4 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Rape.xml @@ -0,0 +1,438 @@ + + + + + + Rape + + UI/Issues/Rape + + + + RSI_Raped + + +
  • + +
  • + + + true + + + RSI_RapedSlave +
    • +
  • + + + true + + + RSI_RapedPrisoner +
    • + + +     +     + + + RSI_RapedSlave + + + + + RSI_RapedPrisoner + + + + + RSI_WasRaped + + +
  • + +
  • + + + true + + + RSI_WasRapedSlave +
    • +
  • + + + true + + + RSI_WasRapedPrisoner +
    • + + +     +     + + + RSI_WasRapedSlave + + + + + RSI_WasRapedPrisoner + + + + + + + Rape_Abhorrent + Rape + + Rape beings is deeply evil. + Low + 40 + 1000 + 30 + +
  • RapeBad
    • +     + +
  • Rapist
    • +     + +
  • HumanPrimacy
    • +
  • Collectivist
    • +     + +
  • + RSI_Raped +
    • +
  • + RSI_Raped + Rape_Abhorrent +
    • +
  • + RSI_Raped + Rape_Know_Abhorrent + Someone raped other +
    • +
  • + RSI_RapedPrisoner + Rape_Horrible + Raped prisoner +
    • +
  • + RSI_RapedPrisoner + Rape_Know_Horrible + Someone raped prisoner +
    • +
  • + RSI_RapedSlave + Rape_Disapproved + Raped slave +
    • +
  • + RSI_RapedSlave + Rape_Know_Disapproved + Someone raped slave +
    • +     +     + + + Rape_Horrible + Rape + + Raping other is a horrible thing. + Low + 30 + 1000 + 30 + +
  • RapeBad
    • +     + +
  • Rapist
    • +     + +
  • HumanPrimacy
    • +     + +
  • + RSI_Raped + Rape_Horrible +
    • +
  • + RSI_Raped + Rape_Know_Horrible + Someone raped other +
    • +
  • + RSI_RapedPrisoner + Rape_Disapproved + Raped prisoner +
    • +
  • + RSI_RapedPrisoner + Rape_Know_Disapproved + Someone raped prisoner +
    • +     + +
  • + 3.0 +
    • +     +     + + + Rape_Disapproved + Rape + + Rape is part of life, though it is extremely distasteful. + Medium + 20 + 1000 + 20 + +
  • RapeBad
    • +     + +
  • Rapist
    • +     + +
  • HumanPrimacy
    • +     + +
  • + RSI_Raped + Rape_Disapproved +
    • +
  • + RSI_Raped + Rape_Know_Disapproved + Someone raped other +
    • +     +     + + + Rape_Acceptable + Rape + + Rape is a normal, unremarkable part of life. + High + 10 + 10 + true + +
  • + 0.75 +
    • +     +     + + + Rape_Honorable + Rape + + Raping is one of proud behavior. + High + 0 + 1000 + +
  • HumanPrimacy
    • +     + +
  • Rapist
    • +     + + 0.75 + + +
  • + RSI_Raped + BloodlustStoleSomeLovin + true +
    • +
  • + RSI_Raped + Rape_Know_Honorable + Someone raped other + true +
    • +
  • + RSI_RapedPrisoner + BloodlustStoleSomeLovin + true +
    • +
  • + RSI_RapedPrisoner + Rape_Know_Honorable + Someone raped other + true +
    • +
  • + RSI_RapedSlave + BloodlustStoleSomeLovin + true +
    • +
  • + RSI_RapedSlave + Rape_Know_Honorable + Someone raped other + true +
    • +     + +
  • + 0.5 +
    • +     +     + + + + + + Rape_Abhorrent + 6 + 1 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + I raped someone. I shouldn't do that. + -5 +
    • +     +     + + + Rape_Know_Abhorrent + Thought_MemorySocial + 15 + 100 + 3 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + -30 +
    • +     +     + + + Rape_Horrible + 6 + 1 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + I raped someone. I shouldn't do that. + -3 +
    • +     +     + + + Rape_Know_Horrible + Thought_MemorySocial + 15 + 100 + 3 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + -15 +
    • +     +     + + + Rape_Disapproved + 6 + 1 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + I raped someone. I shouldn't do that. + -1 +
    • +     +     + + + Rape_Know_Disapproved + Thought_MemorySocial + 15 + 100 + 3 + +
  • Rapist
    • +     + +
  • Rape_Honorable
    • +
  • Rape_Acceptable
    • +     + +
  • + + -5 +
    • +     +     + + + Rape_Know_Honorable + Thought_MemorySocial + 25 + 100 + 3 + +
  • Rape_Abhorrent
    • +
  • Rape_Disapproved
    • +     + +
  • + + 1 +
    • +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Ritual_sex.xml b/1.5/Defs/PreceptDefs/Precepts_Ritual_sex.xml new file mode 100644 index 0000000..636b5d1 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Ritual_sex.xml @@ -0,0 +1,118 @@ + + + + + GangbangCeremony + + A ritualistic gangbang where a initiator rape a victim. The audience will rape as the initiator. + Ritual + Medium + UI/Issues/Gangbang + Precept_Ritual + Gangbang + true + false + 1.0 + 100 + false + true + false + +
  • RapeBad
    • +     + +
  • Rapist
    • +     +     + + + GangbangCeremony_Consensual + + A ritualistic gangbang where a organizer being fucked. The audience will fuck the organizer. + Ritual + Medium + UI/Issues/Gangbang_Consensual + Precept_Ritual + Gangbang_Consensual + true + false + 1.0 + 100 + false + true + false + +
  • Lewd
    • +     +     + + + AnimalGangbangCeremony + + A ritualistic gangbang where animals rape a victim. + Ritual + Medium + UI/Commands/Breeding_Pawn_off + Precept_Ritual + GangbangByAnimal + true + false + 1.0 + 100 + false + true + false + +
  • + +
  • Rapist
    • +
  • Zoophile
    • + + +     +     + + + AnimalGangbangCeremony_Consensual + + A ritualistic gangbang where animals fuck the organizer. + Ritual + Medium + UI/Commands/Breeding_Pawn_on + Precept_Ritual + GangbangByAnimal_Consensual + true + false + 1.0 + 100 + false + true + false + +
  • Zoophile
    • +     +     + + + + + DrugOrgyCeremony + + An orgy using massive aphrodisiac. + Ritual + Medium + UI/Issues/Gangbang + Precept_Ritual + DrugOrgy + true + false + 1.0 + 100 + false + true + false + +
  • Lewd
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Sex.xml b/1.5/Defs/PreceptDefs/Precepts_Sex.xml new file mode 100644 index 0000000..8cf05e4 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Sex.xml @@ -0,0 +1,384 @@ + + + + + + Sextype + + UI/Issues/Bestiality + + + + RSI_VaginalSex + + + + + RSI_AnalSex + + + + + RSI_OralSex + + + + + RSI_PromiscuousSex + + + + + RSI_MiscSex + + + + + + Sex_Free + Sextype + + Open minded. + Low + 50 + 1000 + 100 + + + + Sex_VaginalOnly + Sextype + + Only vaginal sex is approval and others are crude. + Low + 40 + 1000 + 100 + +
  • + RSI_AnalSex +
    • +
  • + RSI_AnalSex + Sex_Promiscuous +
    • +
  • + RSI_AnalSex + Sex_Know_Promiscuous +
    • +
  • + RSI_OralSex +
    • +
  • + RSI_OralSex + Sex_Promiscuous +
    • +
  • + RSI_OralSex + Sex_Know_Promiscuous +
    • +
  • + RSI_MiscSex +
    • +
  • + RSI_MiscSex + Sex_Promiscuous +
    • +
  • + RSI_MiscSex + Sex_Know_Promiscuous +
    • +
  • + RSI_PromiscuousSex +
    • +
  • + RSI_PromiscuousSex + Sex_Promiscuous +
    • +
  • + RSI_PromiscuousSex + Sex_Know_Promiscuous +
    • +     +     + + + Sex_AnalOnly + Sextype + + Only anal sex is approval and others are crude. + Medium + 30 + 1000 + 10 + +
  • + RSI_VaginalSex +
    • +
  • + RSI_VaginalSex + Sex_Promiscuous +
    • +
  • + RSI_VaginalSex + Sex_Know_Promiscuous +
    • +
  • + RSI_OralSex +
    • +
  • + RSI_OralSex + Sex_Promiscuous +
    • +
  • + RSI_OralSex + Sex_Know_Promiscuous +
    • +
  • + RSI_MiscSex +
    • +
  • + RSI_MiscSex + Sex_Promiscuous +
    • +
  • + RSI_MiscSex + Sex_Know_Promiscuous +
    • +
  • + RSI_PromiscuousSex +
    • +
  • + RSI_PromiscuousSex + Sex_Promiscuous +
    • +
  • + RSI_PromiscuousSex + Sex_Know_Promiscuous +
    • +     +     + + + Sex_OralOnly + Sextype + + Only oral sex is approval and others are crude. + Medium + 20 + 1000 + 5 + +
  • + RSI_VaginalSex +
    • +
  • + RSI_VaginalSex + Sex_Promiscuous +
    • +
  • + RSI_VaginalSex + Sex_Know_Promiscuous +
    • +
  • + RSI_AnalSex +
    • +
  • + RSI_AnalSex + Sex_Promiscuous +
    • +
  • + RSI_AnalSex + Sex_Know_Promiscuous +
    • +
  • + RSI_MiscSex +
    • +
  • + RSI_MiscSex + Sex_Promiscuous +
    • +
  • + RSI_MiscSex + Sex_Know_Promiscuous +
    • +
  • + RSI_PromiscuousSex +
    • +
  • + RSI_PromiscuousSex + Sex_Promiscuous +
    • +
  • + RSI_PromiscuousSex + Sex_Know_Promiscuous +
    • +     +     + + + Sex_Promiscuous + Sextype + + Messy sex life is approved. + High + 0 + 1000 + + 1.5 + 1.25 + + +
  • + RSI_VaginalSex +
    • +
  • + RSI_VaginalSex + Sex_NonPromiscuous +
    • +
  • + RSI_VaginalSex + Sex_Know_NonPromiscuous +
    • +
  • + RSI_AnalSex +
    • +
  • + RSI_AnalSex + Sex_NonPromiscuous +
    • +
  • + RSI_AnalSex + Sex_Know_NonPromiscuous +
    • +
  • + RSI_OralSex +
    • +
  • + RSI_OralSex + Sex_NonPromiscuous +
    • +
  • + RSI_OralSex + Sex_Know_NonPromiscuous +
    • +
  • + RSI_MiscSex +
    • +
  • + RSI_MiscSex + Sex_NonPromiscuous +
    • +
  • + RSI_MiscSex + Sex_Know_NonPromiscuous +
    • +
  • + RSI_PromiscuousSex + Sex_Know_Promiscuous_Approval +
    • +     +     + + + + + + + Sex_Promiscuous + 1 + 1 + RJWSexperience.Ideology.Thought_IncreaseRecord + +
  • + + I was immoral. It makes me aroused. + 5 +
    • +     + +
  • + Lust + 3.0 +
    • +     +     + + + Sex_NonPromiscuous + 1 + 1 + +
  • + + It cannot satisfy me. + -1 +
    • +     +     + + + Sex_Know_Promiscuous + Thought_MemorySocial + 15 + 100 + 3 + +
  • Nymphomaniac
    • +
  • Zoophile
    • +
  • Rapist
    • +
  • Necrophiliac
    • +
  • Gay
    • +
  • Bisexual
    • +     + +
  • Sex_Free
    • +
  • Sex_Promiscuous
    • +     + +
  • + + -10 +
    • +     +     + + + Sex_Know_Promiscuous_Approval + Thought_MemorySocial + 15 + 100 + 3 + +
  • Sex_VaginalOnly
    • +
  • Sex_AnalOnly
    • +
  • Sex_OralOnly
    • +     + +
  • + + 3 +
    • +     +     + + + Sex_Know_NonPromiscuous + Thought_MemorySocial + 15 + 100 + 3 + +
  • Sex_VaginalOnly
    • +
  • Sex_AnalOnly
    • +
  • Sex_OralOnly
    • +
  • Sex_Free
    • +     + +
  • + + -3 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_SexProselytizing.xml b/1.5/Defs/PreceptDefs/Precepts_SexProselytizing.xml new file mode 100644 index 0000000..81e0f58 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_SexProselytizing.xml @@ -0,0 +1,21 @@ + + + + + + SexProselytizing + + UI/Issues/Submissive + + + + ProselyzingByOrgasm + SexProselytizing + + Giving orgasm converts partner towards this ideology. + Medium + 50 + 400 + + + \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_SizeMatters.xml b/1.5/Defs/PreceptDefs/Precepts_SizeMatters.xml new file mode 100644 index 0000000..c060ec4 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_SizeMatters.xml @@ -0,0 +1,219 @@ + + + + + + GenitalSize + + UI/Memes/SexualDissolutely + + + + + + GenitalSize_Big_Better + GenitalSize + The size matters. + + High + 20 + 200 + +
  • + GenitalSize_Approved +
    • +
  • + GenitalSize_Approved_Social +
    • +     +     + + + GenitalSize_NoRules + GenitalSize + The size is unimportant. + + High + 10 + 100 + + + + + + GenitalSize_Smaller_Better + GenitalSize + The greeks actually believed, that a big genital is an animalistic feature. Important members are known for their small genitals. + + High + 30 + 200 + +
  • + GenitalSize_Disapproved +
    • +
  • + GenitalSize_Disapproved_Social +
    • +     +     + + + + + GenitalSize_Approved + Thought_Situational + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_GenitalSize + +
  • + + I ... I am okay the way I am! + -10 +
    • +
  • + + I think I am below average. + -5 +
    • +
  • + + I guess I am the average. + 0 +
    • +
  • + + I think I am above average. + +5 +
    • +
  • + + Don't want to be the elephant in the room, but parts of me are. + +10 +
    • +     + +
  • + + +
  • 0
    • +
  • 0.2
    • +
  • 0.4
    • +
  • 0.6
    • +
  • 0.8
    • + + +     +     + + + GenitalSize_Disapproved + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_GenitalSize + Thought_Situational + +
  • + + I do not need great genitals, as I am a being of supreme intellect and grace. + +10 +
    • +
  • + + I think I am below average. + +5 +
    • +
  • + + I guess I am the average. + 0 +
    • +
  • + + I think I am above average. + -5 +
    • +
  • + + I am closer to an animal, than to a human. Why did I have to be born this way? + -10 +
    • +     + +
  • + + +
  • 0
    • +
  • 0.2
    • +
  • 0.4
    • +
  • 0.6
    • +
  • 0.8
    • + + +     +     + + + + + GenitalSize_Approved_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_GenitalSize_Social + Thought_SituationalSocial + +
  • + + -5 +
    • +
  • + + 0 +
    • +
  • + + +5 +
    • +     + +
  • + + +
  • 0
    • +
  • 0.4
    • +
  • 0.6
    • + + +     +     + + + GenitalSize_Disapproved_Social + RJWSexperience.Ideology.PreceptWorkers.ThoughtWorker_Precept_GenitalSize_Social + Thought_SituationalSocial + +
  • + + +5 +
    • +
  • + + 0 +
    • +
  • + + -5 +
    • +     + +
  • + + +
  • 0
    • +
  • 0.4
    • +
  • 0.6
    • + + +     +     + +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml new file mode 100644 index 0000000..b4ee222 --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml @@ -0,0 +1,62 @@ + + + + + + SocialAffection + + UI/Issues/SocialAffection + + + + + + SocialAffection_Normal + SocialAffection + + Just normal. + Low + 50 + 1000 + + + + SocialAffection_Small + SocialAffection + + Care about only immediate family. + Medium + 40 + 1000 + + + + SocialAffection_OnlyFamily + SocialAffection + + Don't care about non-family memeber's tragedy. + Medium + 30 + 1000 + + + + SocialAffection_Dry + SocialAffection + + Don't care about family memeber's tragedy. + High + 20 + 1000 + + + + SocialAffection_Psychopath + SocialAffection + + Don't care about others. + High + 10 + 1000 + + \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Submissive.xml b/1.5/Defs/PreceptDefs/Precepts_Submissive.xml new file mode 100644 index 0000000..aa7ae4d --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Submissive.xml @@ -0,0 +1,204 @@ + + + + + + Submissive + + UI/Issues/Submissive + + + + + + Submissive_None + Submissive + + Just normal. + Low + 50 + 1000 + + + + Submissive_Male + Submissive + + Males are submissive. They will obey and accept even being raped. + High + 40 + 1000 + +
  • FemaleSupremacy
    • +     + +
  • + RSI_Raped + Male +
    • +
  • + RSI_WasRaped + BeenRaped_Submissive + Male +
    • +
  • + RSI_WasRaped + BeenRaped_NotSubmissive + Female +
    • +
  • + RSI_Raped + Raped_Know_NotBeingSubmissive + Male +
    • +
  • + RSI_WasRapedPrisoner + BeenRaped_Submissive + Male +
    • +
  • + RSI_WasRapedPrisoner + BeenRaped_NotSubmissive + Female +
    • +
  • + RSI_RapedPrisoner + Raped_Know_NotBeingSubmissive + Male +
    • +
  • + RSI_WasRapedSlave + BeenRaped_Submissive + Male +
    • +
  • + RSI_WasRapedSlave + BeenRaped_NotSubmissive + Female +
    • + +     +     + + + Submissive_Female + Submissive + + Females are submissive. They will obey and accept even being raped. + High + 30 + 1000 + +
  • MaleSupremacy
    • +     + +
  • + RSI_Raped + Female +
    • +
  • + RSI_WasRaped + BeenRaped_Submissive + Female +
    • +
  • + RSI_WasRaped + BeenRaped_NotSubmissive + Male +
    • +
  • + RSI_Raped + Raped_Know_NotBeingSubmissive + Female +
    • +
  • + RSI_WasRapedPrisoner + BeenRaped_Submissive + Female +
    • +
  • + RSI_WasRapedPrisoner + BeenRaped_NotSubmissive + Male +
    • +
  • + RSI_RapedPrisoner + Raped_Know_NotBeingSubmissive + Female +
    • +
  • + RSI_WasRapedSlave + BeenRaped_Submissive + Female +
    • +
  • + RSI_WasRapedSlave + BeenRaped_NotSubmissive + Male +
    • + +     +     + + + + + + BeenRaped_Submissive + 10 + 100 + Thought_Memory + 0.4 + +
  • Masochist
    • +     + +
  • + + I had to accept. But i don't feel so good. + -3 +
    • +     +     + + + BeenRaped_NotSubmissive + 15 + 100 + Thought_MemorySocial + 0.4 + +
  • Masochist
    • +     + +
  • + + How dare... + -30 + -200 +
    • +     +     + + + Raped_Know_NotBeingSubmissive + Thought_MemorySocial + 15 + 100 + 3 + +
  • + + -30 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/Precepts_Virginity.xml b/1.5/Defs/PreceptDefs/Precepts_Virginity.xml new file mode 100644 index 0000000..a7a231a --- /dev/null +++ b/1.5/Defs/PreceptDefs/Precepts_Virginity.xml @@ -0,0 +1,360 @@ + + + + + Virginity_Female + + UI/Issues/Female + + + + Virginity_Male + + UI/Issues/Male + + + + RSI_VirginTaken + + +
  • + +
  • + + + +
  • Spouse
    • + + + + RSI_VirginTakenNotSpouse + + + +     +     + + + RSI_TookVirgin + + + + + RSI_VirginStolen + + + + + RSI_VirginTakenNotSpouse + + + + + + + Virgin_UselessF + Virginity_Female + + Female's virginity is useless. + Medium + 50 + 1000 + 10 + + + + Virgin_UselessM + Virginity_Male + + Male's virginity is useless. + Low + 50 + 1000 + 80 + + + + Virgin_PreciousF + Virginity_Female + + Female's virginity is precious. + Medium + 40 + 1000 + 80 + +
  • + RSI_VirginStolen + Virgin_Precious_Taken_Forcefully + Female +
    • +
  • + RSI_VirginTaken + Virgin_Precious_Taken + Female +
    • +
  • + RSI_TookVirgin + TookVirginity +
    • +     +     + + + Virgin_PreciousM + Virginity_Male + + Male's virginity is precious. + Medium + 40 + 1000 + 1 + +
  • + RSI_VirginStolen + Virgin_Precious_Taken_Forcefully + Male +
    • +
  • + RSI_VirginTaken + Virgin_Precious_Taken + Male +
    • +
  • + RSI_TookVirgin + TookVirginity +
    • +     +     + + + Virgin_OnlyForSpouseF + Virginity_Female + + Losing virginity before marriage is evil. + Medium + 40 + 1000 + 80 + +
  • MaleSupremacy
    • +     + +
  • FemaleSupremacy
    • +     + +
  • MaleSupremacy
    • +     + +
  • + RSI_VirginStolen + Virgin_Precious_Taken_Forcefully + Female +
    • +
  • + RSI_VirginTaken + Virgin_Precious_Taken + Female +
    • +
  • + RSI_VirginTakenNotSpouse + Virgin_OnlyForSpouse_Know_Taken + Female +
    • +
  • + RSI_TookVirgin + TookVirginity +
    • +     +     + + + Virgin_OnlyForSpouseM + Virginity_Male + + Losing virginity before marriage is evil. + Medium + 40 + 1000 + 20 + +
  • FemaleSupremacy
    • +     + +
  • MaleSupremacy
    • +     + +
  • FemaleSupremacy
    • +     + +
  • + RSI_VirginStolen + Virgin_Precious_Taken_Forcefully + Male +
    • +
  • + RSI_VirginTaken + Virgin_Precious_Taken + Male +
    • +
  • + RSI_VirginTakenNotSpouse + Virgin_OnlyForSpouse_Know_Taken + Male +
    • +
  • + RSI_TookVirgin + TookVirginity +
    • +     +     + + + Virgin_ShamefulF + Virginity_Female + + Remaining as virgin is shameful thing and being laughed at. + Medium + 30 + 1000 + 1 + +
  • FemaleSupremacy
    • +     + +
  • + RSI_VirginTaken + Virgin_Shameful_Taken + Female +
    • +     +     + + + Virgin_ShamefulM + Virginity_Male + + Remaining as virgin is shameful thing and being laughed at. + Medium + 30 + 1000 + 40 + +
  • MaleSupremacy
    • +     + +
  • + RSI_VirginTaken + Virgin_Shameful_Taken + Male +
    • +     +     + + + + + Virgin_Precious_Taken_Forcefully + Thought_MemorySocial + 30 + 1 + +
  • + + My virginity was taken forcefully. + -10 + -200 +
    • +     +     + + + Virgin_Precious_Taken + RJWSexperience.Ideology.Thought_Opinionbased + 7 + 1 + +
  • + + I am no longer virgin. + -5 +
    • +
  • + + I am no longer virgin. + -3 +
    • +
  • + + I am no longer virgin. + -1 +
    • +
  • + + I gave my virginity to my love. + 5 +
    • +     + +
  • + +
  • -100
    • +
  • -50
    • +
  • 0
    • +
  • 75
    • + + +     +     + + + Virgin_Shameful_Taken + RJWSexperience.Ideology.Thought_Opinionbased + 7 + 1 + +
  • + + Finally! + 5 +
    • +
  • + + Finally! + 10 +
    • +
  • + + Finally! + 20 +
    • +     + +
  • + +
  • -100
    • +
  • 0
    • +
  • 75
    • + + +     +     + + + + Virgin_OnlyForSpouse_Know_Taken + Thought_MemorySocial + 30 + 100 + 3 + +
  • Nymphomaniac
    • +     + +
  • + + -30 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/PreceptDefs/RitualPatternDefs/RitualPatterns_sex.xml b/1.5/Defs/PreceptDefs/RitualPatternDefs/RitualPatterns_sex.xml new file mode 100644 index 0000000..211c6f1 --- /dev/null +++ b/1.5/Defs/PreceptDefs/RitualPatternDefs/RitualPatterns_sex.xml @@ -0,0 +1,67 @@ + + + + NamerRitualFestival + true + RitualSpotOrAltar + +
  • Rape
    • +     +     + + + Gangbang + Gangbang + gangbang + A ritualistic gangbang. The organizer will give a speech to excite the crowd, then fuck the victim. If the organizer cannot fuck victim, the ritual will be canceled. + UI/Issues/Gangbang + false + Gangbang + + + + + Gangbang_Consensual + Gangbang_Consensual + gangbang + A ritualistic gangbang. The organizer will give a speech to excite the crowd, then fucked by the crowd. + UI/Issues/Gangbang_Consensual + false + Gangbang_Consensual + + + + + GangbangByAnimal + GangbangByAnimal + gangbang by animal + A ritualistic animal gangbang. The organizer will give a speech to excite the crowd, then animals begin fuck victim. + UI/Commands/Breeding_Pawn_off + false + BestialGangbang + + + + + GangbangByAnimal_Consensual + GangbangByAnimal_Consensual + gangbang by animal + A ritualistic animal gangbang. The organizer will give a speech to excite the crowd, then animals begin fuck the organizer. + UI/Commands/Breeding_Pawn_on + false + BestialGangbang_Consensual + + + + + DrugOrgy + drug orgy + An orgy with large amounts of aphrodisiac. Participants will gather around a lustbong, light it on fire, and fuck each other while inhaling the fumes. + UI/Icons/Rituals/SmokeCircle + false + DrugOrgy + DrugOrgy + DrugOrgy + + +     \ No newline at end of file diff --git a/1.5/Defs/PreconfiguredIdeos/IdeoPresetDefs_sex.xml b/1.5/Defs/PreconfiguredIdeos/IdeoPresetDefs_sex.xml new file mode 100644 index 0000000..13c8abc --- /dev/null +++ b/1.5/Defs/PreconfiguredIdeos/IdeoPresetDefs_sex.xml @@ -0,0 +1,36 @@ + + + + Animal_Breeders + + Animals are our better half. + Intense + +
  • AnimalPersonhood
    • +
  • Zoophile
    • +     +     + + + Savage_Rapist_Brigands + + All of them are ours. + Intense + +
  • Rapist
    • +
  • Nudism
    • +
  • Raider
    • +     +     + + + Hentai_Tribe + + Intense + Impregnate. + +
  • MaleSupremacy
    • +
  • Rapist
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/Rituals/Ritual_Behaviors_sex.xml b/1.5/Defs/Rituals/Ritual_Behaviors_sex.xml new file mode 100644 index 0000000..aff19a9 --- /dev/null +++ b/1.5/Defs/Rituals/Ritual_Behaviors_sex.xml @@ -0,0 +1,466 @@ + + + + + +
  • + + 7500 + +
  • + + initiator + Initiator + IdeoRole_Moralist + True + true + 1 + False +
    • + +     + + + Gangbang + RJWSexperience.Ideology.RitualBehaviorWorker_Gangbang + +
  • + + a victim + victim + 1 + true + False + true + true + true +
    • +     + +
  • + Spectate + +
  • + + +
  • + initiator + victim + Victim is not reachable. +
    • + + +
  • + initiator + DeliverPawnToAltar +
    • +
  • + victim + Idle +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Gangbang + +
  • + 5 +
    • +
  • + +
    • +
  • + victim + LayDownAwake +
    • +     + +
  • + Gangbang_Rape + True + +
  • + 0.9 +
    • + + +
  • + initiator + FuckVictim + +
  • + +
    • +     + +
  • + Gangbang_Rape + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Gangbang + +
  • + +
    • +     + +     +     + + + Gangbang_Consensual + RJWSexperience.Ideology.RitualBehaviorWorker_Gangbang_Consensual + +
  • + Spectate + +
  • + +
  • initiator
    • + + + + +
  • + initiator + ArriveToCell +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Gangbang + +
  • + 5 +
    • +
  • + +
    • +     + +
  • + Gangbang_Consensual + True + +
  • + 1.0 +
    • + + +
  • + initiator + LayDownAwake + +
  • + +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Gangbang + +
  • + +
    • +     + +     +     + + + + GangbangByAnimal + RJWSexperience.Ideology.RitualBehaviorWorker_Gangbang + +
  • + + a breedee who will be fucked by animal + victim + 1 + True + False + true +
    • +
  • + + animal + 30 + false + a breedable animal + false +
    • +     + +
  • + +
  • + initiator + victim +
    • + + Spectate + 5~7 + +
  • + initiator + victim + Victim is not reachable. +
    • +     + +
  • + +
  • initiator
    • + + true + +     + +
  • + initiator + DeliverPawnToCellIfAliveThenIdle + +
  • + 2 + 0 +
    • + + +
  • + victim + Idle +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Zoophile + +
  • + 5 +
    • +
  • + +
    • +
  • + animal + Spectate +
    • +
  • + victim + LayDownAwake +
    • +     + +
  • + Spectate + True + +
  • + 0.9 +
    • + + +
  • + animal + Gangbang_Rape + +
  • + +
    • +
  • + victim + LayDownAwake +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Zoophile + +
  • + +
    • +
  • + victim + LayDownAwake +
    • +     + +     +     + + + + GangbangByAnimal_Consensual + RJWSexperience.Ideology.RitualBehaviorWorker_Gangbang_Consensual + +
  • + + animal + 30 + false + a breedable animal + false +
    • +     + +
  • + Spectate + +
  • + +
  • initiator
    • + + + + +
  • + initiator + ArriveToCell +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Zoophile + +
  • + 5 +
    • +
  • + +
    • +
  • + animal + Spectate +
    • +     + +
  • + Spectate + True + +
  • + 0.9 +
    • + + +
  • + animal + Gangbang_Consensual + +
  • + +
    • +
  • + initiator + LayDownAwake +
    • +     + +
  • + Spectate + +
  • + 0.1 +
    • + + +
  • + initiator + SpeakOnCellFacingSpectators + Speech_Zoophile + +
  • + +
    • +     + +     +     + + + DrugOrgy + 7500 + + Participants + participate + +
  • + DrugOrgy + +
  • + 1.0 +
    • + + +     +     + + +     \ No newline at end of file diff --git a/1.5/Defs/Rituals/Ritual_Outcomes_sex.xml b/1.5/Defs/Rituals/Ritual_Outcomes_sex.xml new file mode 100644 index 0000000..a6c9646 --- /dev/null +++ b/1.5/Defs/Rituals/Ritual_Outcomes_sex.xml @@ -0,0 +1,400 @@ + + + + Gangbang + Depending on ritual quality, participants will get between {MINMOOD} and {MAXMOOD} mood for {MOODDAYS} days. + RitualOutcomeEffectWorker_Consumable + +
  • If the {0} is satisfying, one of the participants might gain an inspiration.
    • +     + +
  • + initiator + + 0.10 +
    • +
  • + + + +
  • (1, -0.20)
    • +
  • (3, -0.05)
    • +
  • (5, 0.05)
    • +
  • (10, 0.10)
    • + + + +
  • + true + + 0.2 + an altar +
    • +
  • + + 0.15 + FeelingBroken + 0.3 + victim +
    • +
  • + + 0.15 + FeelingBroken + 0.5 + victim +
    • +
  • + + 0.3 + FeelingBroken + 0.9 + victim +
    • +
  • + + 0.4 + Sex + 0.7 +
    • +
  • + + 0.4 + Sex + 0.9 +
    • +     + +
  • + + 0.05 + TerribleGangbang + The {0} was terrible! The speech was stuttering and incoherent, and the victim was botched - everyone was waiting for it to end. + -2 +
    • +
  • + + 0.10 + BoringGangbang + The {0} was boring. The speech was repetitive and the victim was noticeably flawed. It just didn't feel dignified. + -1 +
    • +
  • + + 0.6 + FunGangbang + The {0} was satisfying. The speech felt meaningful, and the victim was precise and dignified. + There's a 5% chance that a random participant gets an inspiration. + 1 +
    • +
  • + + 0.25 + UnforgettableGangbang + The {0} was spectacular! The speech brought everyone to the edge of a frenzy and the victim was like succubus. + There's a 10% chance that a random participant gets an inspiration. + 2 +
    • +     +     + + + Gangbang_Consensual + Depending on ritual quality, participants will get between {MINMOOD} and {MAXMOOD} mood for {MOODDAYS} days. + RitualOutcomeEffectWorker_Consumable + +
  • If the {0} is satisfying, one of the participants might gain an inspiration.
    • +     + +
  • + initiator + + 0.10 +
    • +
  • + + + +
  • (1, -0.20)
    • +
  • (3, -0.05)
    • +
  • (5, 0.05)
    • +
  • (10, 0.10)
    • + + + +
  • + true + + 0.2 + an altar +
    • +
  • + + 0.4 + Sex + 0.7 +
    • +
  • + + 1.0 + Sex + 0.8 +
    • +     + +
  • + + 0.05 + TerribleGangbang + The {0} was terrible! The speech was stuttering and incoherent, and the victim was botched - everyone was waiting for it to end. + -2 +
    • +
  • + + 0.10 + BoringGangbang + The {0} was boring. The speech was repetitive and the victim was noticeably flawed. It just didn't feel dignified. + -1 +
    • +
  • + + 0.6 + FunGangbang + The {0} was satisfying. The speech felt meaningful, and the victim was precise and dignified. + There's a 5% chance that a random participant gets an inspiration. + 1 +
    • +
  • + + 0.25 + UnforgettableGangbang + The {0} was spectacular! The speech brought everyone to the edge of a frenzy and the victim was like succubus. + There's a 10% chance that a random participant gets an inspiration. + 2 +
    • +     +     + + + BestialGangbang + Depending on ritual quality, participants will get between {MINMOOD} and {MAXMOOD} mood for {MOODDAYS} days. + RitualOutcomeEffectWorker_Consumable + +
  • If the {0} is satisfying, one of the participants might gain an inspiration.
    • +     + +
  • + initiator + + 0.10 +
    • +
  • + + + +
  • (1, -0.50)
    • +
  • (3, -0.30)
    • +
  • (5, -0.15)
    • +
  • (10, -0.10)
    • + + + +
  • + true + + 0.2 + an altar +
    • +
  • + + 0.45 + FeelingBroken + 0.3 + victim +
    • +
  • + + 0.45 + FeelingBroken + 0.5 + victim +
    • +
  • + + 0.8 + FeelingBroken + 0.9 + victim +
    • +     + +
  • + + 0.05 + TerribleGangbang + The {0} was terrible! The speech was stuttering and incoherent, and the victim was botched - everyone was waiting for it to end. + -2 +
    • +
  • + + 0.10 + BoringGangbang + The {0} was boring. The speech was repetitive and the victim was noticeably flawed. It just didn't feel dignified. + -1 +
    • +
  • + + 0.65 + FunGangbang + The {0} was satisfying. The speech felt meaningful, and the victim was precise and dignified. + There's a 5% chance that a random participant gets an inspiration. + 1 +
    • +
  • + + 0.2 + UnforgettableGangbang + The {0} was spectacular! The speech brought everyone to the edge of a frenzy and the victim was like succubus. + There's a 10% chance that a random participant gets an inspiration. + 2 +
    • +     +     + + + BestialGangbang_Consensual + Depending on ritual quality, participants will get between {MINMOOD} and {MAXMOOD} mood for {MOODDAYS} days. + RitualOutcomeEffectWorker_Consumable + +
  • If the {0} is satisfying, one of the participants might gain an inspiration.
    • +     + +
  • + initiator + + 0.10 +
    • +
  • + + + +
  • (1, 0.20)
    • +
  • (3, 0.40)
    • +
  • (5, 0.65)
    • +
  • (10, 1.20)
    • + + + +
  • + true + + 0.2 + an altar +
    • +     + +
  • + + 0.05 + TerribleGangbang + The {0} was terrible! The speech was stuttering and incoherent, and the victim was botched - everyone was waiting for it to end. + -2 +
    • +
  • + + 0.10 + BoringGangbang + The {0} was boring. The speech was repetitive and the victim was noticeably flawed. It just didn't feel dignified. + -1 +
    • +
  • + + 0.65 + FunGangbang + The {0} was satisfying. The speech felt meaningful, and the victim was precise and dignified. + There's a 5% chance that a random participant gets an inspiration. + 1 +
    • +
  • + + 0.2 + UnforgettableGangbang + The {0} was spectacular! The speech brought everyone to the edge of a frenzy and the victim was like succubus. + There's a 10% chance that a random participant gets an inspiration. + 2 +
    • +     +     + + + DrugOrgy + Depending on ritual quality, participants will get between {MINMOOD} and {MAXMOOD} mood for {MOODDAYS} days. + RitualOutcomeEffectWorker_RemoveConsumableBuilding + +
  • If the {0} is satisfying, one of the participants might gain an inspiration.
    • +     + +
  • +
  • + + + +
  • (1, -0.50)
    • +
  • (3, 0.0)
    • +
  • (5, 0.10)
    • +
  • (10, 0.30)
    • + + + +
  • + + Impressiveness + + +
  • 0, 0
    • +
  • 50, 0.1
    • +
  • 120, 0.2
    • + + + +
  • + + 0.7 + Sex + 0.7 +
    • +     + +
  • + + 0.05 + TerribleOrgy + The {0} was terrible! + -2 +
    • +
  • + + 0.10 + BoringOrgy + The {0} was boring. + -1 +
    • +
  • + + 0.6 + FunOrgy + The {0} was satisfying. + There's a 5% chance that a random participant gets an inspiration. + 1 +
    • +
  • + + 0.25 + UnforgettableOrgy + The {0} was spectacular! + There's a 10% chance that a random participant gets an inspiration. + 2 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/Rituals/Ritual_Targets_sex.xml b/1.5/Defs/Rituals/Ritual_Targets_sex.xml new file mode 100644 index 0000000..5805f34 --- /dev/null +++ b/1.5/Defs/Rituals/Ritual_Targets_sex.xml @@ -0,0 +1,15 @@ + + + + RitualSpotOrAltar_Gangbang + RitualObligationTargetWorker_AnyRitualSpotOrAltar_Scarification + + + + DrugOrgy + RitualObligationTargetWorker_ConsumableBuilding + +
  • Burnbong_Aphrodisiac
    • +     +     +     \ No newline at end of file diff --git a/1.5/Defs/ThingDefs/Buildings_Ideo_sex.xml b/1.5/Defs/ThingDefs/Buildings_Ideo_sex.xml new file mode 100644 index 0000000..eaaba10 --- /dev/null +++ b/1.5/Defs/ThingDefs/Buildings_Ideo_sex.xml @@ -0,0 +1,134 @@ + + + + Burnbong_Aphrodisiac + + A wood structure packed with humpshroom. It can be ignited during a ritual and produce a huge amount of humpshroom smoke for a few hours, after which it is destroyed. + RealtimeOnly + + Graphic_Single + Things/Building/Misc/Burnbong/Burnbong + (1.2,1.2) + + (0.92, 1 ,0.92) + + + (1,1) + + 30 + 30 + + + 30 + + false + + 50 + 10000 + 25 + + +
  • + BurnbongSmoke +
    • +
  • + 0.5 + (0, 0, 0.42) +
    • +
  • + HumpShroomEffect + true + 10 + 0.01 +
    • +     +     + + + + Autobong_Aphrodisiac + + An automatic humpshroom-burning device which generates an estro-smoke cloud around itself. Anyone in the cloud will become horny over time. + Building + + Things/Building/Misc/Autobong/Autobong + Graphic_Single + (2,2) + CutoutComplex + + Things/Building/Misc/Autobong/Autobong + Building + PassThroughOnly + 42 + Normal + RealtimeOnly + 0.20 + false + (2,2) + + 80 + 800 + + true + + 10 + 3 + + +
  • Metallic
    • +
  • Woody
    • +     + 100 + true + +
  • MicroelectronicsBasics
    • +     + +
  • + 0.35 + 10.0 + + +
  • HumpShroom
    • + + + 1 + true + true + +
  • + 10 + (252,187,113,0) +
    • +
  • + CompGatherSpot +
    • +
  • + CompPowerTrader + 150 + true +
    • +
  • +
  • + HumpShroomEffect + 4.9 + 0.005 + true +
    • +
  • + BurnbongSmoke + 4.9 + 4 + AutobongSmoke + 25 +
    • +     + Misc + true + +
  • PlaceWorker_SmokeCloudMaker
    • +     +     + + +     \ No newline at end of file diff --git a/1.5/Defs/ThoughtDefs/Thoughts_Ritual_sex_Quality.xml b/1.5/Defs/ThoughtDefs/Thoughts_Ritual_sex_Quality.xml new file mode 100644 index 0000000..9488047 --- /dev/null +++ b/1.5/Defs/ThoughtDefs/Thoughts_Ritual_sex_Quality.xml @@ -0,0 +1,115 @@ + + + + + TerribleGangbang + Thought_AttendedRitual + 6 + 3 + +
  • + + That gangbang was terrible. ugh. + -3 +
    • +     +     + + + BoringGangbang + Thought_AttendedRitual + 6 + 3 + +
  • + + That gangbang was not good. Wish I never went. + -1 +
    • +     +     + + + FunGangbang + Thought_AttendedRitual + 6 + 3 + +
  • + + That was a fun gangbang. It really satisfied me. + 8 +
    • +     +     + + + UnforgettableGangbang + Thought_AttendedRitual + 6 + 3 + +
  • + + That gangbang was awesome! Everything was perfect. + 16 +
    • +     +     + + + TerribleOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That orgy was terrible. ugh. + -3 +
    • +     +     + + + BoringOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That orgy was not good. Wish I never went. + -1 +
    • +     +     + + + FunOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That was a fun orgy. It really satisfied me. + 8 +
    • +     +     + + + UnforgettableOrgy + Thought_AttendedRitual + 6 + 3 + +
  • + + That orgy was awesome! Everything was perfect. + 16 +
    • +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Masturbation.xml b/1.5/Patches/InteractionDef/Masturbation.xml new file mode 100644 index 0000000..53a35ac --- /dev/null +++ b/1.5/Patches/InteractionDef/Masturbation.xml @@ -0,0 +1,14 @@ + + + + + /Defs/InteractionDef[defName="Masturbation_AutoBreastjob" or defName="Masturbation_AutoFellatio" or defName="Masturbation_Breastjob" or defName="Masturbation_HandjobA" or defName="Masturbation_HandjobP" or defName="Masturbation_HandjobV"] + +
  • + +
  • RSI_Masturbated
    • + + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Necro.xml b/1.5/Patches/InteractionDef/Necro.xml new file mode 100644 index 0000000..0a02d95 --- /dev/null +++ b/1.5/Patches/InteractionDef/Necro.xml @@ -0,0 +1,25 @@ + + + + + /Defs/InteractionDef[defName="Necro_Anal" or defName="Necro_DoublePenetration" or defName="Necro_DoublePenetrationM" or defName="Necro_Vaginal"] + +
  • + +
  • RSI_SexWithCorpse
    • + + +     +     + + + /Defs/InteractionDef[defName="Necro_Reverse_Anal" or defName="Necro_Reverse_DoublePenetration" or defName="Necro_Reverse_DoublePenetrationM" or defName="Necro_Reverse_Vaginal"] + +
  • + +
  • RSI_SexWithCorpse
    • + + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Rape.xml b/1.5/Patches/InteractionDef/Rape.xml new file mode 100644 index 0000000..34bc418 --- /dev/null +++ b/1.5/Patches/InteractionDef/Rape.xml @@ -0,0 +1,83 @@ + + + + + /Defs/InteractionDef[defName="Rape_Vaginal"] + +
  • + +
  • RSI_VaginalSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Anal" or defName="Rape_Rimming"] + +
  • + +
  • RSI_AnalSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Beakjob" or defName="Rape_Cunnilingus" or defName="Rape_Fellatio" or defName="Rape_Oral"] + +
  • + +
  • RSI_OralSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Breastjob" or defName="Rape_Fingering" or defName="Rape_Footjob" or defName="Rape_Handjob"] + +
  • + +
  • RSI_MiscSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_DoublePenetration" or defName="Rape_DoublePenetrationM" or defName="Rape_Fisting" or defName="Rape_Scissoring"] + +
  • + +
  • RSI_PromiscuousSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Rape_Reverse.xml b/1.5/Patches/InteractionDef/Rape_Reverse.xml new file mode 100644 index 0000000..2f3a047 --- /dev/null +++ b/1.5/Patches/InteractionDef/Rape_Reverse.xml @@ -0,0 +1,83 @@ + + + + + /Defs/InteractionDef[defName="Rape_Reverse_Vaginal"] + +
  • + +
  • RSI_VaginalSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Reverse_Anal" or defName="Rape_Reverse_Rimming"] + +
  • + +
  • RSI_AnalSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Reverse_Beakjob" or defName="Rape_Reverse_Cunnilingus" or defName="Rape_Reverse_Fellatio"] + +
  • + +
  • RSI_OralSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Reverse_Breastjob" or defName="Rape_Reverse_Fingering" or defName="Rape_Reverse_Footjob" or defName="Rape_Reverse_Handjob"] + +
  • + +
  • RSI_MiscSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     + + + /Defs/InteractionDef[defName="Rape_Reverse_DoublePenetration" or defName="Rape_Reverse_DoublePenetrationM" or defName="Rape_Reverse_Fisting" or defName="Rape_Reverse_Scissoring"] + +
  • + +
  • RSI_PromiscuousSex
    • +
  • RSI_Raped
    • + + + +
  • RSI_WasRaped
    • +     + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Sex.xml b/1.5/Patches/InteractionDef/Sex.xml new file mode 100644 index 0000000..0be25d3 --- /dev/null +++ b/1.5/Patches/InteractionDef/Sex.xml @@ -0,0 +1,73 @@ + + + + + /Defs/InteractionDef[defName="Sex_Vaginal"] + +
  • + +
  • RSI_VaginalSex
    • + + +
  • RSI_VaginalSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Anal" or defName="Sex_Rimming"] + +
  • + +
  • RSI_AnalSex
    • + + +
  • RSI_AnalSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Beakjob" or defName="Sex_Cunnilingus" or defName="Sex_Fellatio" or defName="Sex_Makeout" or defName="Sex_Sixtynine"] + +
  • + +
  • RSI_OralSex
    • + + +
  • RSI_OralSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Breastjob" or defName="Sex_Fingering" or defName="Sex_Footjob" or defName="Sex_Handjob" or defName="Sex_MutualHandholding" or defName="Sex_MutualMasturbation" or defName="Sex_MutualTailholding"] + +
  • + +
  • RSI_MiscSex
    • + + +
  • RSI_MiscSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_DoublePenetration" or defName="Sex_DoublePenetrationM" or defName="Sex_Fisting" or defName="Sex_Scissoring"] + +
  • + +
  • RSI_PromiscuousSex
    • + + +
  • RSI_PromiscuousSex
    • +     + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/InteractionDef/Sex_Reverse.xml b/1.5/Patches/InteractionDef/Sex_Reverse.xml new file mode 100644 index 0000000..2e41ab5 --- /dev/null +++ b/1.5/Patches/InteractionDef/Sex_Reverse.xml @@ -0,0 +1,73 @@ + + + + + /Defs/InteractionDef[defName="Sex_Reverse_Vaginal"] + +
  • + +
  • RSI_VaginalSex
    • + + +
  • RSI_VaginalSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Reverse_Anal" or defName="Sex_Reverse_Rimming"] + +
  • + +
  • RSI_AnalSex
    • + + +
  • RSI_AnalSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Reverse_Beakjob" or defName="Sex_Reverse_Cunnilingus" or defName="Sex_Reverse_Fellatio"] + +
  • + +
  • RSI_OralSex
    • + + +
  • RSI_OralSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Reverse_Breastjob" or defName="Sex_Reverse_Fingering" or defName="Sex_Reverse_Footjob" or defName="Sex_Reverse_Handjob"] + +
  • + +
  • RSI_MiscSex
    • + + +
  • RSI_MiscSex
    • +     + +     +     + + + /Defs/InteractionDef[defName="Sex_Reverse_DoublePenetration" or defName="Sex_Reverse_DoublePenetrationM" or defName="Sex_Reverse_Fisting"] + +
  • + +
  • RSI_PromiscuousSex
    • + + +
  • RSI_PromiscuousSex
    • +     + +     +     +     \ No newline at end of file diff --git a/1.5/Patches/RJW_Drugs.xml b/1.5/Patches/RJW_Drugs.xml new file mode 100644 index 0000000..e0a93bb --- /dev/null +++ b/1.5/Patches/RJW_Drugs.xml @@ -0,0 +1,47 @@ + + + + + Defs/HediffDef[defName="HumpShroomEffect"]/stages + + +
  • + + + 1.25 + 0.25 + +
    • +
  • + 0.3 + + 1.1 + + 2 + 0.5 + +
    • +
  • + 0.6 + + 1.33 + + 3 + 0.75 + +
    • +
  • + 0.9 + + 1.33 + + 5 + 1.5 + +
    • +     +     +     + + +     \ No newline at end of file diff --git a/1.5/Patches/RJW_Precepts.xml b/1.5/Patches/RJW_Precepts.xml new file mode 100644 index 0000000..94c6160 --- /dev/null +++ b/1.5/Patches/RJW_Precepts.xml @@ -0,0 +1,29 @@ + + + + + Defs/PreceptDef[defName="Corpses_DontCare"]/requiredMemes + +
  • Necrophile
    • +     +     + + + Defs/PreceptDef[defName="Corpses_DontCare"]/associatedMemes + +
  • Necrophile
    • +     +     + + + Defs/PreceptDef[defName="Lovin_FreeApproved"] + + + 0.5 + 0.25 + + + + + +     \ No newline at end of file diff --git a/1.5/Patches/RJW_StatDefs_Ideo.xml b/1.5/Patches/RJW_StatDefs_Ideo.xml new file mode 100644 index 0000000..a044970 --- /dev/null +++ b/1.5/Patches/RJW_StatDefs_Ideo.xml @@ -0,0 +1,14 @@ + + + + + Defs/StatDef[defName="Vulnerability"]/parts + +
  • + 0.5 +
    • +     +     + + +     \ No newline at end of file diff --git a/1.5/Patches/RJW_ThoughtDefs.xml b/1.5/Patches/RJW_ThoughtDefs.xml new file mode 100644 index 0000000..30a1b66 --- /dev/null +++ b/1.5/Patches/RJW_ThoughtDefs.xml @@ -0,0 +1,114 @@ + + + + + Defs/ThoughtDef[defName="GotBredByAnimal"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="GotAnalBredByAnimal"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="AllowedAnimalToBreed"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="GotLickedByAnimal"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="GotGropedByAnimal"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="AllowedAnimalToGrope"] + + +
  • Bestiality_OnlyVenerated
    • +
  • Bestiality_BondOnly
    • +
  • Bestiality_Honorable
    • +
  • Bestiality_Acceptable
    • +     +     +     + + + Defs/ThoughtDef[defName="StoleSomeLovin"] + + +
  • Rape_Honorable
    • +     +     +     + + + Defs/ThoughtDef[defName="Incestuous"] + + +
  • Incestuos_Free
    • +
  • Incestuos_IncestOnly
    • +     +     +     + + + Defs/ThoughtDef[defName="GotRaped" or defName="GotAnalRaped" or defName="GotAnalRapedByFemale" or defName="GotRapedUnconscious" or defName="HateMyRapist" or defName="AllowedMeToGetRaped"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="GotRaped" or defName="GotAnalRaped" or defName="GotAnalRapedByFemale" or defName="GotRapedUnconscious" or defName="HateMyRapist" or defName="AllowedMeToGetRaped"] + + +
  • Submissive_Male
    • +
  • Submissive_Female
    • +     +     +     + + Defs/ThoughtDef[defName="GotRaped" or defName="GotAnalRaped" or defName="GotAnalRapedByFemale" or defName="GotRapedUnconscious" or defName="HateMyRapist" or defName="AllowedMeToGetRaped"]/nullifyingPrecepts + +
  • Submissive_Male
    • +
  • Submissive_Female
    • +     +     +     +     \ No newline at end of file diff --git a/1.5/Patches/RJW_ThoughtDefsDeath.xml b/1.5/Patches/RJW_ThoughtDefsDeath.xml new file mode 100644 index 0000000..99ea439 --- /dev/null +++ b/1.5/Patches/RJW_ThoughtDefsDeath.xml @@ -0,0 +1,68 @@ + + + + + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +
  • SocialAffection_Small
    • +     +     +     + + Defs/ThoughtDef[defName="MyKinDied" or defName="MyCousinDied" or defName="MyGrandparentDied" or defName="MyUncleDied" or defName="MyAuntDied" or defName="MyHalfSiblingDied" or defName="MyNephewDied" or defName="MyNieceDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied" or defName="MyHalfSiblingDied"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +
  • SocialAffection_Small
    • +     +     +     + + + Defs/ThoughtDef[defName="MyMotherDied" or defName="MyFatherDied" or defName="MyGrandchildDied" or defName="MySisterDied" or defName="MyBrotherDied" or defName="MyDaughterDied" or defName="MySonDied" or defName="WitnessedDeathFamily" or defName="MyPupDied" or defName="MyPupDiedFemale" or defName="KilledMyPup" or defName="KilledMyPupFemale" or defName="SoldMyPup" ]/nullifyingPrecepts + + Defs/ThoughtDef[defName="MyMotherDied" or defName="MyFatherDied" or defName="MyGrandchildDied" or defName="MySisterDied" or defName="MyBrotherDied" or defName="MyDaughterDied" or defName="MySonDied" or defName="WitnessedDeathFamily" or defName="MyPupDied" or defName="MyPupDiedFemale" or defName="KilledMyPup" or defName="KilledMyPupFemale" or defName="SoldMyPup"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +     +     +     + + Defs/ThoughtDef[defName="MyMotherDied" or defName="MyFatherDied" or defName="MyGrandchildDied" or defName="MySisterDied" or defName="MyBrotherDied" or defName="MyDaughterDied" or defName="MySonDied" or defName="WitnessedDeathFamily" or defName="MyPupDied" or defName="MyPupDiedFemale" or defName="KilledMyPup" or defName="KilledMyPupFemale" or defName="SoldMyPup"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +     +     +     + + + Defs/ThoughtDef[defName="KnowGuestExecuted" or defName="KnowColonistExecuted" or defName="KnowPrisonerDiedInnocent" or defName="KnowColonistDied" or defName="PawnWithGoodOpinionDied" or defName="PawnWithBadOpinionDied" or defName="WitnessedDeathAlly" or defName="WitnessedDeathNonAlly" or defName="ColonistBanishedToDie" or defName="PrisonerBanishedToDie" or defName="ColonistBanishedToDie" or defName="ColonistLeftUnburied"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="KnowGuestExecuted" or defName="KnowColonistExecuted" or defName="KnowPrisonerDiedInnocent" or defName="KnowColonistDied" or defName="PawnWithGoodOpinionDied" or defName="PawnWithBadOpinionDied" or defName="WitnessedDeathAlly" or defName="WitnessedDeathNonAlly" or defName="ColonistBanishedToDie" or defName="PrisonerBanishedToDie" or defName="ColonistBanishedToDie" or defName="ColonistLeftUnburied"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_OnlyFamily
    • +     +     +     + + Defs/ThoughtDef[defName="KnowGuestExecuted" or defName="KnowColonistExecuted" or defName="KnowPrisonerDiedInnocent" or defName="KnowColonistDied" or defName="PawnWithGoodOpinionDied" or defName="PawnWithBadOpinionDied" or defName="WitnessedDeathAlly" or defName="WitnessedDeathNonAlly" or defName="ColonistBanishedToDie" or defName="PrisonerBanishedToDie" or defName="ColonistBanishedToDie" or defName="ColonistLeftUnburied"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_OnlyFamily
    • +     +     +     + + + +     \ No newline at end of file diff --git a/1.5/Patches/RJW_ThoughtDefsLost.xml b/1.5/Patches/RJW_ThoughtDefsLost.xml new file mode 100644 index 0000000..43dd8fb --- /dev/null +++ b/1.5/Patches/RJW_ThoughtDefsLost.xml @@ -0,0 +1,68 @@ + + + + + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +
  • SocialAffection_Small
    • +     +     +     + + Defs/ThoughtDef[defName="MyKinLost" or defName="MyCousinLost" or defName="MyGrandparentLost" or defName="MyUncleLost" or defName="MyAuntLost" or defName="MyHalfSiblingLost" or defName="MyNephewLost" or defName="MyNieceLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost" or defName="MyHalfSiblingLost"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +
  • SocialAffection_Small
    • +     +     +     + + + Defs/ThoughtDef[defName="MyMotherLost" or defName="MyFatherLost" or defName="MyGrandchildLost" or defName="MySisterLost" or defName="MyBrotherLost" or defName="MyDaughterLost" or defName="MySonLost"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="MyMotherLost" or defName="MyFatherLost" or defName="MyGrandchildLost" or defName="MySisterLost" or defName="MyBrotherLost" or defName="MyDaughterLost" or defName="MySonLost"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +     +     +     + + Defs/ThoughtDef[defName="MyMotherLost" or defName="MyFatherLost" or defName="MyGrandchildLost" or defName="MySisterLost" or defName="MyBrotherLost" or defName="MyDaughterLost" or defName="MySonLost"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_Dry
    • +     +     +     + + + Defs/ThoughtDef[defName="ColonistLost" or defName="PawnWithGoodOpinionLost" or defName="PawnWithBadOpinionLost"]/nullifyingPrecepts + + Defs/ThoughtDef[defName="ColonistLost" or defName="PawnWithGoodOpinionLost" or defName="PawnWithBadOpinionLost"] + + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_OnlyFamily
    • +     +     +     + + Defs/ThoughtDef[defName="ColonistLost" or defName="PawnWithGoodOpinionLost" or defName="PawnWithBadOpinionLost"]/nullifyingPrecepts + +
  • SocialAffection_Psychopath
    • +
  • SocialAffection_OnlyFamily
    • +     +     +     + + + +     \ No newline at end of file diff --git a/About/About.xml b/About/About.xml index f9aa52b..10a3a68 100644 --- a/About/About.xml +++ b/About/About.xml @@ -5,6 +5,7 @@
  • 1.3
  • 1.4
    • +
  • 1.5
    •
  • diff --git a/About/Manifest.xml b/About/Manifest.xml index c88287a..1bd2004 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@ RJWSexperienceIdeology - 1.4.1.0 + 1.5.0.1
  • RimJobWorld >= 5.3.0
    • diff --git a/LoadFolders.xml b/LoadFolders.xml index 48ed2ca..c04e50f 100644 --- a/LoadFolders.xml +++ b/LoadFolders.xml @@ -8,4 +8,8 @@
  • /
  • 1.4
    • + +
  • /
    • +
  • 1.5
    • +     \ No newline at end of file diff --git a/Source/IdeologyAddon/DebugAction.cs b/Source/IdeologyAddon/DebugAction.cs index 55838d7..2b1763d 100644 --- a/Source/IdeologyAddon/DebugAction.cs +++ b/Source/IdeologyAddon/DebugAction.cs @@ -1,4 +1,5 @@ -using rjw; +using LudeonTK; +using rjw; using RJWSexperience.Ideology.HistoryEvents; using RJWSexperience.Ideology.Patches; using System.Collections.Generic; diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index 7844895..6bb9ea8 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -6,25 +6,27 @@ RJWSexperience.Ideology net48 true - ..\..\1.4\Assemblies\ + ..\..\1.5\Assemblies\ false False + false + none 8.0 - ..\..\..\rjw\1.4\Assemblies\RJW.dll + ..\..\..\rjw\1.5\Assemblies\RJW.dll False - 1.4.* + 1.5.* - 2.2.* + 2.* runtime compile; build; native; contentfiles; analyzers; buildtransitive diff --git a/Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs b/Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs index 82a541e..3ef5e10 100644 --- a/Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs +++ b/Source/IdeologyAddon/Rituals/JobGiver_DrugOrgy.cs @@ -2,6 +2,7 @@ using rjw; using System; using System.Collections.Generic; +using System.Linq; using Verse; using Verse.AI; @@ -35,7 +36,7 @@ namespace RJWSexperience.Ideology { if (duty != null) { - List pawns = pawn.Map.mapPawns.AllPawnsSpawned.FindAll(x => x.mindState?.duty?.def == duty.def); + IEnumerable pawns = pawn.Map.mapPawns.AllPawnsSpawned.Where(x => x.mindState?.duty?.def == duty.def); return pawns.RandomElementByWeightWithDefault(x => SexAppraiser.would_fuck(pawn, x), 0.1f); } @@ -190,7 +191,14 @@ namespace RJWSexperience.Ideology get_loved.AddFinishAction(delegate { if (xxx.is_human(pawn)) - pawn.Drawer.renderer.graphics.ResolveApparelGraphics(); + { + CompRJW comp = CompRJW.Comp(pawn); + if (comp != null) + { + comp.drawNude = false; + pawn.Drawer.renderer.SetAllGraphicsDirty(); + } + } }); get_loved.socialMode = RandomSocialMode.Off; return get_loved; diff --git a/Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs b/Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs index eae27e5..48df03e 100644 --- a/Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs +++ b/Source/IdeologyAddon/Rituals/JobGiver_GangbangConsensual.cs @@ -135,7 +135,14 @@ namespace RJWSexperience.Ideology get_banged.AddFinishAction(delegate { if (xxx.is_human(pawn)) - pawn.Drawer.renderer.graphics.ResolveApparelGraphics(); + { + CompRJW comp = CompRJW.Comp(pawn); + if (comp != null) + { + comp.drawNude = false; + pawn.Drawer.renderer.SetAllGraphicsDirty(); + } + } GlobalTextureAtlasManager.TryMarkPawnFrameSetDirty(pawn); if (Bed != null && pawn.Downed) diff --git a/Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs b/Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs index b03416f..a0a91b2 100644 --- a/Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs +++ b/Source/IdeologyAddon/Rituals/RitualOutcomeComps.cs @@ -36,14 +36,14 @@ namespace RJWSexperience.Ideology return false; } - public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) + public override QualityFactor GetQualityFactor(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) { - return new ExpectedOutcomeDesc + return new QualityFactor { label = LabelForDesc.CapitalizeFirst(), present = false, uncertainOutcome = true, - effect = ExpectedOffsetDesc(true, -1f), + qualityChange = ExpectedOffsetDesc(true, -1f), quality = qualityOffset, positive = true }; @@ -62,22 +62,22 @@ namespace RJWSexperience.Ideology public override bool Applies(LordJob_Ritual ritual) { float avgNeed = 0; - foreach (Pawn pawn in ritual.assignments.AllPawns) + foreach (Pawn pawn in ritual.assignments.AllCandidatePawns) { avgNeed += pawn.needs?.TryGetNeed(needDef)?.CurLevel ?? 0f; } - avgNeed /= ritual.assignments.AllPawns.Count; + avgNeed /= ritual.assignments.AllCandidatePawns.Count; return avgNeed >= minAvgNeed; } - public override ExpectedOutcomeDesc GetExpectedOutcomeDesc(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) + public override QualityFactor GetQualityFactor(Precept_Ritual ritual, TargetInfo ritualTarget, RitualObligation obligation, RitualRoleAssignments assignments, RitualOutcomeComp_Data data) { - return new ExpectedOutcomeDesc + return new QualityFactor { label = LabelForDesc.CapitalizeFirst(), present = false, uncertainOutcome = true, - effect = ExpectedOffsetDesc(true, -1f), + qualityChange = ExpectedOffsetDesc(true, -1f), quality = qualityOffset, positive = true }; diff --git a/Source/IdeologyAddon/RomanceChanceFactorHelpers.cs b/Source/IdeologyAddon/RomanceChanceFactorHelpers.cs index 6d970f3..a4c68a6 100644 --- a/Source/IdeologyAddon/RomanceChanceFactorHelpers.cs +++ b/Source/IdeologyAddon/RomanceChanceFactorHelpers.cs @@ -1,4 +1,5 @@ -using RimWorld; +using LudeonTK; +using RimWorld; using RJWSexperience.Ideology.Precepts; using System.Collections.Generic; using System.Linq; From a3055eb6ecf01f6ab95c71885b797807d36dad1a Mon Sep 17 00:00:00 2001 From: amevarashi Date: Fri, 3 May 2024 20:15:20 +0500 Subject: [PATCH 39/48] Added different About.xml for the uncompiled mod --- .gitlab-ci.yml | 1 + About/About.xml | 23 +++++++--------------- About/Manifest.xml | 9 ++------- About/RealAbout.xml | 47 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 57 insertions(+), 23 deletions(-) create mode 100644 About/RealAbout.xml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3410c8d..1f81bae 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,6 +78,7 @@ build: stage: build # ### Build all projects discovered from solution file. script: + - 'mv -f About/RealAbout.xml About/About.xml' - 'cd $SOURCE_CODE_PATH' - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.5/Assemblies/RJW.dll' diff --git a/About/About.xml b/About/About.xml index 10a3a68..32e03b1 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,11 +1,9 @@ - RJW Sexperience Ideology + NOT RJW Sexperience Ideology aamevarashi -
  • 1.3
    • -
  • 1.4
    • -
  • 1.5
    • +
  • 1.0
    •
  • @@ -30,18 +28,11 @@
  • rim.job.world
    • rjw.sexperience.ideology - If you see this, you have downloaded uncompiled source codes of the mod. -Credits: -moreorganstodump Original Author -c0ffee RJW 4.9.0 update -Hawkeye32 Bound Only bestiality precept -Twonki Pregnancy, Sex Proselyzing and Size Matters precepts]]> +To get the actual mod: +1. Go to the https://gitgud.io/amevarashi/rjw-sexperience-ideology/-/releases +2. Open latest release (Pre-release for the test version) +3. Click on the "RJW Sexperience Ideology" link under the "Packages"     \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index 1bd2004..d7fe03b 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -5,11 +5,6 @@
  • RimJobWorld >= 5.3.0
    •  - - - - - - https://gitgud.io/amevarashi/rjw-sexperience-ideology/-/raw/master/About/Manifest.xml - https://gitgud.io/amevarashi/rjw-sexperience-ideology + https://gitgud.io/amevarashi/rjw-sexperience-ideology/-/raw/master/About/Manifest.xml + https://gitgud.io/amevarashi/rjw-sexperience-ideology diff --git a/About/RealAbout.xml b/About/RealAbout.xml new file mode 100644 index 0000000..10a3a68 --- /dev/null +++ b/About/RealAbout.xml @@ -0,0 +1,47 @@ + + + RJW Sexperience Ideology + aamevarashi + +
  • 1.3
    • +
  • 1.4
    • +
  • 1.5
    • +     + +
  • + Ludeon.RimWorld.Ideology + Ideology +
    • +
  • + brrainz.harmony + Harmony + steam://url/CommunityFilePage/2009463077 + https://github.com/pardeike/HarmonyRimWorld/releases/latest +
    • +
  • + rim.job.world + RimJobWorld + https://gitgud.io/Ed86/rjw +
    • +     + +
  • Ludeon.RimWorld.Ideology
    • +
  • brrainz.harmony
    • +
  • rim.job.world
    • +     + rjw.sexperience.ideology + + +     \ No newline at end of file From d1603e0e4b9269e6b83cd593292ed28b8b016879 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Wed, 22 May 2024 22:22:15 +0500 Subject: [PATCH 40/48] Updated csproj and CI --- .gitlab-ci.yml | 66 +++---------------- Source/IdeologyAddon/IdeologyAddon.csproj | 55 +++++++++++++--- .../IdeologyAddon/Properties/AssemblyInfo.cs | 31 ++++----- 3 files changed, 68 insertions(+), 84 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f81bae..fff6f83 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,44 +1,20 @@ -# To contribute improvements to CI/CD templates, please follow the Development guide at: -# https://docs.gitlab.com/ee/development/cicd/templates.html -# This specific template is located at: -# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/dotNET-Core.gitlab-ci.yml - # ### Specify the Docker image -image: mcr.microsoft.com/dotnet/sdk:latest +image: mcr.microsoft.com/dotnet/sdk:8.0-alpine # ### Define variables -# variables: # 1) Name of directory where restore and build objects are stored. OBJECTS_DIRECTORY: 'IdeologyAddon/obj' # 2) Name of directory used for keeping restored dependencies. NUGET_PACKAGES_DIRECTORY: '.nuget' # 3) A relative path to the source code from project repository root. - # NOTE: Please edit this path so it matches the structure of your project! SOURCE_CODE_PATH: 'Source/' # ### Define global cache rule -# -# Before building the project, all dependencies (e.g. third-party NuGet packages) -# must be restored. Jobs on GitLab.com's Shared Runners are executed on autoscaled machines. -# -# Each machine is used only once (for security reasons) and after that is removed. -# This means that, before every job, a dependency restore must be performed -# because restored dependencies are removed along with machines. Fortunately, -# GitLab provides cache mechanism with the aim of keeping restored dependencies -# for other jobs. -# -# This example shows how to configure cache to pass over restored -# dependencies for re-use. -# -# With global cache rule, cached dependencies will be downloaded before every job -# and then unpacked to the paths as specified below. cache: # Per-stage and per-branch caching. key: "$CI_JOB_STAGE-$CI_COMMIT_REF_SLUG" paths: - # Specify three paths that should be cached: - # # 1) Main JSON file holding information about package dependency tree, packages versions, # frameworks etc. It also holds information where to the dependencies were restored. - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/project.assets.json' @@ -46,18 +22,7 @@ cache: - '$SOURCE_CODE_PATH$OBJECTS_DIRECTORY/*.csproj.nuget.*' # 3) Path to the directory where restored dependencies are kept. - '$NUGET_PACKAGES_DIRECTORY' - # - # 'pull-push' policy means that latest cache will be downloaded (if it exists) - # before executing the job, and a newer version will be uploaded afterwards. - # Such a setting saves time when there are no changes in referenced third-party - # packages. - # - # For example, if you run a pipeline with changes in your code, - # but with no changes within third-party packages which your project is using, - # then project restore will happen quickly as all required dependencies - # will already be there — unzipped from cache. - # 'pull-push' policy is the default cache policy, you do not have to specify it explicitly. policy: pull-push # ### Restore project dependencies @@ -76,13 +41,15 @@ cache: build: stage: build + rules: + - if: $CI_COMMIT_BRANCH != "master" # ### Build all projects discovered from solution file. script: - - 'mv -f About/RealAbout.xml About/About.xml' - 'cd $SOURCE_CODE_PATH' - 'dotnet restore --packages ../$NUGET_PACKAGES_DIRECTORY' - - 'curl -s --create-dirs "$RJW_DLL_URL" -o ../../rjw/1.5/Assemblies/RJW.dll' - - 'dotnet build --no-restore' + - 'dotnet build -c Release --no-restore' + - 'cd $CI_PROJECT_DIR/About' + - 'mv -f RealAbout.xml About.xml' artifacts: untracked: false when: on_success @@ -94,16 +61,8 @@ build: - ".*/**/*" # Exclude everything in the dot folders - "Source/**/*" # Exclude everything in the Source folder -#tests: -# stage: test - # ### Run the tests -# script: -# - 'dotnet test --no-restore' - release_dev: stage: deploy -# image: registry.gitlab.com/gitlab-org/release-cli:latest # this image currently is amd64 only - image: alpine:latest rules: - if: $CI_COMMIT_TAG when: never # Do not run this job when a tag is created manually @@ -112,14 +71,7 @@ release_dev: 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" script: -# - 'apk add gitlab-release-cli' - - apk add zip curl - - 'zip -rq rsi.zip ./' + - apk add zip + - zip -rq mod.zip ./ - echo "${PACKAGE_REGISTRY_URL}" - - | - curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file rsi.zip "${PACKAGE_REGISTRY_URL}/rjw_sexperience_ideology.zip" -# release: -# tag_name: '$CI_COMMIT_BRANCH-$CI_PIPELINE_IID' # The version is incremented per pipeline. -# description: 'Automated release based on commit $CI_COMMIT_SHORT_SHA $CI_COMMIT_TAG' -# ref: '$CI_COMMIT_SHA' # The tag is created from the pipeline SHA. - + - 'curl --header "JOB-TOKEN: ${CI_JOB_TOKEN}" --upload-file mod.zip "${PACKAGE_REGISTRY_URL}/rjw_sexperience_ideology.zip"' diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index 6bb9ea8..cc624eb 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -1,29 +1,27 @@  + Debug + 1.5 + 1.0 + $(TargetGameVersion).$(InternalModVersion) {B4481C38-31B1-422D-B5AA-0059FE7CCA1C} Library RJWSexperience.Ideology RJWSexperience.Ideology net48 true - ..\..\1.5\Assemblies\ + ..\..\$(TargetGameVersion)\Assemblies\ false - False + false + false false none 8.0 - - - ..\..\..\rjw\1.5\Assemblies\RJW.dll - False - - - - 1.5.* + $(TargetGameVersion).* 2.* @@ -31,4 +29,41 @@ compile; build; native; contentfiles; analyzers; buildtransitive + + + + + + obj\RJW.dll + False + + + + + https://gitgud.io/Ed86/rjw/-/raw/master/$(TargetGameVersion)/Assemblies/RJW.dll + + + + + + + ..\..\..\rjw\$(TargetGameVersion)\Assemblies\RJW.dll + False + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Source/IdeologyAddon/Properties/AssemblyInfo.cs b/Source/IdeologyAddon/Properties/AssemblyInfo.cs index 8f041b0..9b85306 100644 --- a/Source/IdeologyAddon/Properties/AssemblyInfo.cs +++ b/Source/IdeologyAddon/Properties/AssemblyInfo.cs @@ -1,10 +1,9 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// 어셈블리에 대한 일반 정보는 다음 특성 집합을 통해 -// 제어됩니다. 어셈블리와 관련된 정보를 수정하려면 -// 이러한 특성 값을 변경하세요. +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. [assembly: AssemblyTitle("IdeologyAddon")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] @@ -14,23 +13,21 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// ComVisible을 false로 설정하면 이 어셈블리의 형식이 COM 구성 요소에 -// 표시되지 않습니다. COM에서 이 어셈블리의 형식에 액세스하려면 -// 해당 형식에 대해 ComVisible 특성을 true로 설정하세요. +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] // 이 프로젝트가 COM에 노출되는 경우 다음 GUID는 typelib의 ID를 나타냅니다. [assembly: Guid("b4481c38-31b1-422d-b5aa-0059fe7cca1c")] -// 어셈블리의 버전 정보는 다음 네 가지 값으로 구성됩니다. +// Version information for an assembly consists of the following four values: // -// 주 버전 -// 부 버전 -// 빌드 번호 -// 수정 버전 -// -// 모든 값을 지정하거나 아래와 같이 '*'를 사용하여 빌드 번호 및 수정 번호를 -// 기본값으로 할 수 있습니다. +// Major Version +// Minor Version +// Build Number +// Revision +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: AssemblyVersion("1.5.*")] From 1bbdc47180428581518369d6701478e1ee36f0c4 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 23 May 2024 18:31:20 +0500 Subject: [PATCH 41/48] 1.5.1.0 --- 1.5/Assemblies/RJWSexperience.Ideology.dll | Bin 0 -> 68608 bytes About/Manifest.xml | 18 +++--- About/RealAbout.xml | 68 ++++++++++----------- CHANGELOG.md | 2 + 4 files changed, 45 insertions(+), 43 deletions(-) create mode 100644 1.5/Assemblies/RJWSexperience.Ideology.dll diff --git a/1.5/Assemblies/RJWSexperience.Ideology.dll b/1.5/Assemblies/RJWSexperience.Ideology.dll new file mode 100644 index 0000000000000000000000000000000000000000..271bc27bc5f1055436610015849e175e435b92ac GIT binary patch literal 68608 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 J{{Mi${{vYu4SN6p literal 0 HcmV?d00001 diff --git a/About/Manifest.xml b/About/Manifest.xml index d7fe03b..fd71972 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,10 +1,10 @@ - + - RJWSexperienceIdeology - 1.5.0.1 - -
  • RimJobWorld >= 5.3.0
    • -     - https://gitgud.io/amevarashi/rjw-sexperience-ideology/-/raw/master/About/Manifest.xml - https://gitgud.io/amevarashi/rjw-sexperience-ideology -     + RJWSexperienceIdeology + 1.5.1.0 + +
  • RimJobWorld >= 5.3.0
    • +     + https://gitgud.io/amevarashi/rjw-sexperience-ideology/-/raw/master/About/Manifest.xml + https://gitgud.io/amevarashi/rjw-sexperience-ideology + \ No newline at end of file diff --git a/About/RealAbout.xml b/About/RealAbout.xml index 10a3a68..630ca35 100644 --- a/About/RealAbout.xml +++ b/About/RealAbout.xml @@ -1,36 +1,37 @@ - + - RJW Sexperience Ideology - aamevarashi - -
  • 1.3
    • -
  • 1.4
    • -
  • 1.5
    • -     - -
  • - Ludeon.RimWorld.Ideology - Ideology -
    • -
  • - brrainz.harmony - Harmony - steam://url/CommunityFilePage/2009463077 - https://github.com/pardeike/HarmonyRimWorld/releases/latest -
    • -
  • - rim.job.world - RimJobWorld - https://gitgud.io/Ed86/rjw -
    • -     - -
  • Ludeon.RimWorld.Ideology
    • -
  • brrainz.harmony
    • -
  • rim.job.world
    • -     - rjw.sexperience.ideology - RJW Sexperience Ideology + aamevarashi + +
  • 1.3
    • +
  • 1.4
    • +
  • 1.5
    • +     + 1.5.1.0 + +
  • + Ludeon.RimWorld.Ideology + Ideology +
    • +
  • + brrainz.harmony + Harmony + steam://url/CommunityFilePage/2009463077 + https://github.com/pardeike/HarmonyRimWorld/releases/latest +
    • +
  • + rim.job.world + RimJobWorld + https://gitgud.io/Ed86/rjw +
    • +     + +
  • Ludeon.RimWorld.Ideology
    • +
  • brrainz.harmony
    • +
  • rim.job.world
    • +     + rjw.sexperience.ideology + - +Twonki Pregnancy, Sex Proselyzing and Size Matters precepts]]>         \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index e6a9f77..cefc8b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +## 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 From 0459c722ea72f7df2c7c6762e776627854aabca7 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 23 May 2024 18:31:20 +0500 Subject: [PATCH 42/48] Move About.xml --- About/About.xml | 79 +++++++++++++++++++++++++-------------------- About/RealAbout.xml | 47 --------------------------- 2 files changed, 44 insertions(+), 82 deletions(-) delete mode 100644 About/RealAbout.xml diff --git a/About/About.xml b/About/About.xml index 32e03b1..630ca35 100644 --- a/About/About.xml +++ b/About/About.xml @@ -1,38 +1,47 @@ - + - NOT RJW Sexperience Ideology - aamevarashi - -
  • 1.0
    • -     - -
  • - Ludeon.RimWorld.Ideology - Ideology -
    • -
  • - brrainz.harmony - Harmony - steam://url/CommunityFilePage/2009463077 - https://github.com/pardeike/HarmonyRimWorld/releases/latest -
    • -
  • - rim.job.world - RimJobWorld - https://gitgud.io/Ed86/rjw -
    • -     - -
  • Ludeon.RimWorld.Ideology
    • -
  • brrainz.harmony
    • -
  • rim.job.world
    • -     - rjw.sexperience.ideology - If you see this, you have downloaded uncompiled source codes of the mod. + RJW Sexperience Ideology + aamevarashi + +
  • 1.3
    • +
  • 1.4
    • +
  • 1.5
    • +     + 1.5.1.0 + +
  • + Ludeon.RimWorld.Ideology + Ideology +
    • +
  • + brrainz.harmony + Harmony + steam://url/CommunityFilePage/2009463077 + https://github.com/pardeike/HarmonyRimWorld/releases/latest +
    • +
  • + rim.job.world + RimJobWorld + https://gitgud.io/Ed86/rjw +
    • +     + +
  • Ludeon.RimWorld.Ideology
    • +
  • brrainz.harmony
    • +
  • rim.job.world
    • +     + rjw.sexperience.ideology + +Credits: +moreorganstodump Original Author +c0ffee RJW 4.9.0 update +Hawkeye32 Bound Only bestiality precept +Twonki Pregnancy, Sex Proselyzing and Size Matters precepts]]>     \ No newline at end of file diff --git a/About/RealAbout.xml b/About/RealAbout.xml deleted file mode 100644 index 630ca35..0000000 --- a/About/RealAbout.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - RJW Sexperience Ideology - aamevarashi - -
  • 1.3
    • -
  • 1.4
    • -
  • 1.5
    • -     - 1.5.1.0 - -
  • - Ludeon.RimWorld.Ideology - Ideology -
    • -
  • - brrainz.harmony - Harmony - steam://url/CommunityFilePage/2009463077 - https://github.com/pardeike/HarmonyRimWorld/releases/latest -
    • -
  • - rim.job.world - RimJobWorld - https://gitgud.io/Ed86/rjw -
    • -     - -
  • Ludeon.RimWorld.Ideology
    • -
  • brrainz.harmony
    • -
  • rim.job.world
    • -     - rjw.sexperience.ideology - -     \ No newline at end of file From 861c753e2272b4a22f269dc8de4a51265f826d57 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Tue, 11 Jun 2024 22:09:25 +0500 Subject: [PATCH 43/48] Implemented Sleipnir's fix for futa genital size !4 --- Source/IdeologyAddon/IdeoUtility.cs | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/Source/IdeologyAddon/IdeoUtility.cs b/Source/IdeologyAddon/IdeoUtility.cs index 05ffd75..e61eb54 100644 --- a/Source/IdeologyAddon/IdeoUtility.cs +++ b/Source/IdeologyAddon/IdeoUtility.cs @@ -67,21 +67,29 @@ namespace RJWSexperience.Ideology return 0f; // Iff the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina) - float bestSeenSize = 0f; + float bestSize = 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) || Genital_Helper.is_vagina(part)) + if (Genital_Helper.is_penis(part)) { - bestSeenSize = part.Severity > bestSeenSize ? part.Severity : bestSeenSize; + size = part.Severity; } + else if (Genital_Helper.is_vagina(part)) + { + // For vagina, the scale is inverted. + size = 1 - part.Severity; + } + else + { + continue; + } + + bestSize = size > bestSize ? size : bestSize; } - // For Women, the scale is inverted. - if (p.gender == Gender.Female) - return 1 - bestSeenSize; - - return bestSeenSize; + return bestSize; } public static bool IsVisiblyPregnant(Pawn pawn) From ebb9708efe5702a2d3d7760da5f52d3cfb62f692 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 13 Jun 2024 20:37:53 +0500 Subject: [PATCH 44/48] Updated contributing section of README.md --- README.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 48aedd7..feca10d 100644 --- a/README.md +++ b/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. \ No newline at end of file +Please, ping me in the RJW Discord after creating a merge request. From 0a5a9769e7fdc4d7140fb0595a27653d0e76193b Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 13 Jun 2024 20:41:36 +0500 Subject: [PATCH 45/48] CI: expose About.xml, change package name and version to project name and branch name respectively --- .gitlab-ci.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fff6f83..98b247f 100644 --- a/.gitlab-ci.yml +++ b/.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 @@ -66,12 +66,13 @@ 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/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"' From 40af29a1934b603d4ef77a208abcd21b79bb73d5 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 13 Jun 2024 21:57:18 +0500 Subject: [PATCH 46/48] Added url and fixed author name in About.xml --- About/RealAbout.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/About/RealAbout.xml b/About/RealAbout.xml index 630ca35..c06dabd 100644 --- a/About/RealAbout.xml +++ b/About/RealAbout.xml @@ -1,7 +1,7 @@ - + RJW Sexperience Ideology - aamevarashi + amevarashi
  • 1.3
  • 1.4
    • @@ -31,6 +31,7 @@
  • rim.job.world
    • rjw.sexperience.ideology + https://gitgud.io/amevarashi/rjw-sexperience-ideology Date: Thu, 13 Jun 2024 21:58:57 +0500 Subject: [PATCH 47/48] GetGenitalSize returns penis size for futa --- Source/IdeologyAddon/IdeoUtility.cs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/Source/IdeologyAddon/IdeoUtility.cs b/Source/IdeologyAddon/IdeoUtility.cs index e61eb54..c103729 100644 --- a/Source/IdeologyAddon/IdeoUtility.cs +++ b/Source/IdeologyAddon/IdeoUtility.cs @@ -61,22 +61,31 @@ 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; - // Iff the pawn has multiple genitalia, the "best" is picked (the biggest penis or tightest vagina) 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)) { + if (!foundPenis) + { + foundPenis = true; + bestSize = 0f; + } size = part.Severity; } - else if (Genital_Helper.is_vagina(part)) + else if (!foundPenis && Genital_Helper.is_vagina(part)) { // For vagina, the scale is inverted. size = 1 - part.Severity; From 145cdfbe344d656944b688fd7f281e5ba985cf87 Mon Sep 17 00:00:00 2001 From: amevarashi Date: Thu, 20 Jun 2024 18:27:21 +0500 Subject: [PATCH 48/48] 1.5.1.1 --- 1.5/Assemblies/RJWSexperience.Ideology.dll | Bin 68608 -> 69120 bytes About/Manifest.xml | 2 +- About/RealAbout.xml | 4 ++-- CHANGELOG.md | 12 ++++++++++++ Source/IdeologyAddon/IdeologyAddon.csproj | 2 +- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/1.5/Assemblies/RJWSexperience.Ideology.dll b/1.5/Assemblies/RJWSexperience.Ideology.dll index 271bc27bc5f1055436610015849e175e435b92ac..f4c67169faed813c9ae02f1c8db7f6e0cf635ac2 100644 GIT binary patch delta 12678 zcma)i2|!iV*8kdPz7yPgK@bJK3^IcZ%Ai;fS`L|_W*YT`XQr0rTv_IU;H8$CbPdFY zhngi>uhg{Ry}s~irfH^`nPmz=^{f<8OG(uK+Up#K>$C6sqvv<`Z>_c0T6^ui&pG#; zTe3(jhKC`%DXQZ2@$8J3G2J>;Lb(U!iuWm&z%=hR z7Q^h`<18X1DhgHjHxv&6WH>M#Ek6KYRhwj%xn;EQj-Z#J4!ydBBqf5|#uHkDY(nf9 z0PD=L2=;_wZXtFYwj7q&+wmi@o0_Br+YD37%<(7+kP<@Fq;N~@9b6xRs*)QG&BOr7 zB`GPQk|4MwD>|Bh7D@j&?&lV+1O+<*dd>_$$uT7!7%~CEVEo)IPsumi*!V36oudY_ z6q0-7VoFPzP`zbM-VgMJ?B0-1LnkY+~nc7gYdgB-d@#{#=gX0ElE6_c7gP=e}PL8NRsfA1Gf-=#6qa{ZyD7g}sql+%cx96Z}Z(KGS z-RIyqHHvrmB51K)fgjU(yU;(+kHMFLLw!(z4xu8Jc)lN%tpxpL|uU$!D}_lG3HSe4eY5SzLK;UaT{Sl!bo%%Y0nlJ z1Y1{NyDwp@Wi{GNBm2SKc(0Ubj&DY=L`SDb{}bv zpQ6Kp@Lxo3^aU9mLCg{w(8WJ;3UJ(9i{nfD1tqs=Q*c>6?cT~5{NBGAQ<-7e$_y=o z2=P1xYbDopnC|r~uVAmPa=qP!;P0zwmn(lFxBBzIeu#gbmLK+w5Z(TKc)|Wg4R|{g z+b=>m;{3aWB>doCjZQQHq;Uz={pGv&f1bHLkFY?=nMd+b@y|yQ})!$s;d`JA!B|z62 zeB?jc!%vcx&^u!%I(oxo`}{xk7vRotuGJ0VBcn9~npqq(viZi%)y z{oz?+hEo?*5!(gLNdZn5tR}V-!jrl?-SB!BOE+xx(d{Hw4ogBK&~ji5k6`$8Lq4%m z7zBC}xZ!S-773i)XELY6*~2DFmN|REWFJ8+I$de9Rk$16aFkekYA1=c2W&Ad2LbmY z#`0uJ0psaNohCH`wkKl*3^R4xag({BkI6Fdy6lGAO;$;)$Yh6z9V3PX#`?N_DjMKZ zQ9S@g#qn&6yaRno8rU)VvzT{aN1gU!odP@R^cdDD5Q@l4Df|b+2f`tf>XMzN7P&N7uwm76|JtUa}^a~KHEv|HjyKM>wCSu%xapQb@LO@R=b zU<53}X$k~;qA^@vnLyCHF1BtyrRfH`Y04K{5IjrFn9(4p@?kX{EEz2mlXwWjG7S24 zuw!x<(mwu@ySs59McOPTD9hfBnafC(Tb zbDz6_>k@o)iO{=?E)jJ)H#IsY!9Y^()RHV?lqASEOtnB;63+fmv*YT78O|i|^ff}1 z#?N&o!$ZUjFX=vB(tW(7!!olU_mU1nQ-H_c1>8+Pco}av+mp$LSBdR{_0A>EY zNif#O%~<$r7dI2&Mbpi^$Tysme8LyQ0aN!=+*W5X982S=Rl-kkA37(4C*5HD)I9}u zbEZS3HYf2D=M?yyloi^-#Lti&A;wdyQtyRdi0y*J0b`V@aNcBF`o5x0g**Fkr@P=M z+%ePONn*y3rojqR*O>98a~gcv&H}%6P6w?&@28hSVN{dzewakm=r{wW659p6`~IrV zfQNl_I1?*ZuA?*V8sEOoebK&bWrL}u`8jPMUa z0(Kq?oYUck>*hjW77xfnTz1a&={Fy4 z?9lz@oZs0`$Bqv{VTbav^C6#(k3c!;cEOvy%d|(}Lt;jq9)sPcPVlI%$3V)a@xstF zw`&oo12{7*p8%)9pee4m>j`+97@uDKSGC+{e#?F4sT}Iabf=b|Jw_>qPr5iQhtK~P z9S@GRa2Wl*BFi6HQv~;Nkr=J6dojE=keim%eM&j>BzFCPQKWkkj%LTWeA8YGZ+Gdp z*eB7&@UC~#)L?y#vKT%kt4e6eIwLQJCX*e=DioK(nGRj5>nS*v!?UV{w_Gb6&%l37 zb|5R)^$eUh*~clvT`S<(L7kS*!3!q4*k_FEIoN2jmaNIT%L^wvsq1-&xxwg&N>>$3 z>B6dEoyjtL-0yk;J}_Cat5AFi_H|h5u9pFBZ1v%b~iUm|ANyd;|2Z@{^-!{bbSb!gSn-#c(=oF zA67)H5~fBUaBYXgA!x`dp?}7=uAPv}84hAm^pCDxu%B23jEz3$+5`IUM4!aF<14Ox zV7r-{8X@*WputGDAEps2g*{1ETn9kAg6aQtP!@ZWLRMoK>SGO`228raV+1}ET4 zlSOAGA?te^ciLbX&_BX?0x}K8o=@eL?Yh1FZ$y@B>OPN6aG!uOlid?{JL;b1OgFz7 zo$x8t2{U{d@P}$Apo%&gskQ5j)av0K(eky3lG@nGrf(_lXPX!q~k_tganiFeb5MlOvd*? zBaAi~-v=1bWPGhR!mlRdYrPSMj^_c(fUosN_@~METE~7S;EESq5Y9T-F5Z zx|sgZ)f9e!w@k}Jkm3FT-Zj}9LL2+B<8*bG6z2Y^LpPDNvH!qs(^3;}bf1JPCaaci zb?ZO-g!l!NJB=ci$WiWJAdr}`EPsU*V#dZh1=CE%SIH@uRml65f`A+L6f7gwV7b_D zjB?7SYMnY>wNpB*G)&pkv18q*;E2h1*-pU;Vn+B=&}QoRDd{xyyNf1<7U^kt@$Sy> zr{O(fM)=b{;X8Fa{AtkZ3{wh!8pOXCPI>s#U?cV<-S8vpa;Z8EJq;b5El)$1*^j5z z47*LnE7J@qMV+ZN!>uOs;CJ$7xK}sn7NTXujJ%tD@@|H99nZTNmKm0mb~Ai#GM;ub z93f^@t=VUBpMmqHB~R@PJYG!KKO^87pMYEm_}5_J0nfk^gHgaUu-9Zf;2AhX%(#a* z1HT%K?p)9MRP8KWC0!X@V0XFCLcm|?`e$s5b3Uf$I@Wq0mf=3vv7S%jT0ak-zw*@h zP1OMi;A8>@2k@h9CPNR(7+y>{(5PV^@ z!DG{nLh=3E=Cdw3bv)5FC^sx=U9`a`Ti%@8pyl5qEQGSSM}%_tx&HuIBOORwDlpb9 zCtp}2?NXPboQJ8EGO{a$TDTDMvam@SlDbaVF7c=6?@NCKz3Dx;Fj)UcI4B)X+l4ki zBpnhaiZ9sLK%SJF^tEtQ`a0TVNHN-;eW#1NL&I~#GaBS&nJ zp6Yd@SPN(IiA^ocbKfeqO8h-ZDr*iNFIwdIZsWyju{xws+|CZC6^kx;Psn{@s@zZ0 zb^2H$zCr;`N>|d>is6iZt<5GZF!6$8n^?d?{r-tKwR^U>3FVuifL-WaC%!>_3)mXZ ze$;-|`x~*^=p_$~ZV)#~8xwvMC(1AQCqc2ypVCj4KTU2H-+}ux1_*k!_&Yw#sb%g+ zNvdUo{jzZ!e~+t@7Q?3F5|*+)v%a*vR)(i&afj;~ST z*!0x^nxY$Z=TkDN>7EjziibE(psOw~J3<;9AI!@|RoX3Jb#;tcl1L3*CvwBPEN{mJuo!$i-^79HK1C!Kwfs@f!KDK%V0KjIAtO`Fr>+a<#ZTWCO0J zbHR7Y2dOqkJFr4#!b9CR%g1PSHqq*I34QJR2uTuhJPs^Wp~^76s-16)&p)o zhWr`l&vGrC%T9t}%6`ikY_H9{C>JP)Vq^#rnu9OP;lkVmK{?7^>uXb(a8t5V$&*sk z-^1N~IIV}$N*QoTq%u(%9=gxFR}aIl-o;8#)_5gPK#80uh#A>po?v%nixZU_EQKh4 z#($qYQSnd9LHWJ`9F?GKF;(D8kO`xc=PK{eNY2wpYGG4+nKE5DZCRqsRwjhz3+Ih} z1}89cCZ%Tbs$ER0P!=eeIY~vh9Y%*%Dy7Ouza)I`%$-(?L#_C&UzyaiP-KE5^aW+Q z@N@VYr2*o4u2-tXd9ICkKH#fc!Xa%2zTFxWJ1dJD0fCHf_7KM3T!pe{y5Hpeq$G0c zO=<;tu0ni0F;S>ic$76tey>;5YGu52qq;`n3$a$iIKepJU zvZU_`EnHoj(4@twQwN+xr@Z#5>WrML+Fi6D@4fy9}OMzPG9`4=yL|En;VNh)S?dR|7Iqtw+Ti&kfcF5zjhay)056W?i6O4ZO`-s*caP)4Gi2WT{&3nqjR_ znKs*6t$u-LJ9g^Nh7x`Xc;!>oDn1c3)^SaE}=tg&uVv!k{m4o7@nJ=5)9nDYa;N#EgP_lB1T2l(4saXNzuQ*3-S4f2jC z57Ucn$JmnO`H1*M!}cX%Erj#&s&_~5&3Gb{UzAQeSK1D$lQPFBO=zdNps+ex*+@~N#rKAOl+;0sc}v$d#VukUTYQr{N!gRoXx zt15=5y1jt)@YLbybVBc~tbh$A{1GofOyf(TMQsTE-e%Fd1tr^E+JUqJdx&-i4lG;? z_aCBFixa~a+xIBP(wEtn!YbF_5&2T!+i<pw)#ga1^79MUI0?YU~iLSRCZH0Oc1@K2h5};7M%1pN%$JjNb~h;pygSlkBfL zYQ-Bu-$p-o+P681b+Jd%c1IiL#h{HAWPz3}lk zPXjy1h)%Hj*&!Sv5$^(jKR3)qtsiWFKy07Fwi{Xy1^5kOv5mL!h!#TKfgb|67*~Xo zs1HfvNRmyGL4mke~EFvr+tU=Uezd9oIq8AKa_-L<2#M8Y%^TO@HqIL<2dq*N3?wyaA?3s+X#8ZaYgs_Zo2Vo;&q#w7*C!Fke3BqH`sJ)J`&d&=+y6^DApR~z-jU)np-Uk0eh$6Lf z{k;$$QbO$#l9##~xlI7Bm5|&3Zl4>#?LC2B_%tLp$O}Ds)FUoL3}C43oqJ!-o1iWY^~bo?j@;iQJJj?=S4i1;(qG5CvF0mg$0TkOjtM17V}D!eP469jR! z__26FTqJ#mUpkk_|B`pgBb0^8PUUN*O_9`Wb%Z)qouxjaE>|zA!!?(shb6)iZ+XD7 z&{A%B%d*w-oh8z`-TIsLidC^qw9T-sww<*NaeV5KO7Qg=Mm-s^vy?vw0k|g{@aJOm z7e{!(5r+2(hS_Hk)^rj=F#Yt4cRe2Q(*W;R6}jw!H~6{jdYf7Z3cAgCYyRE7cIB7Q^q#6u48J3FYc+Jm#W(nDDY1Cu~=%!J<_|gtkD~3uSmL z5WdjX3pPtJJY>N)qn7nTt;Gqy;L(D|1w1aJyqC2a?zL9m4kxYag=T9pG@~HiCSyBa zY!lWC{8(z6DxR|4Pe-7Aff#4MpN?DYQ^g0c{Q!P$#LtcP^}>&MMB$CiZXB?;v^rqR zN8Zw5&huuLa2K{mKHImJLjJ`&ada1YcFoWsdm)k2W)6dU$mX`T!0YKvAF0>VO<*wG`}XCa|JKELM_sl` zcsKbc`e<*>WxG`P=X$qo`rJv6&YU@G+VmOtq;t}rTY86H36QqnmlE%!D`D5m2u~y1Gx83rz5)RC5e^#=2$gSX0`z69>t8)8Dbi5dn&?%gs7;hCuFwlU5}Mb zV^w|%TV&f=dNM-BGbMh$Tcxm(%#jY6z`t{(LmH&L+oH0+Un8q}$-)Nu`_aDxFjNC1PPZ23)mA9!2{7a z5D4mL5K*JJia`N)l^}>Bs2rjq2nmS_DhUA<0$Kg)Rdz4wnVu3?>gqm|v((Cip9jHwN&H&3%`aXu5= ztpOZAv&Q)-uzyG*;#Y_nu+8y_oB?wNbKD%kaTnpY;e5O{l;h+Oj&H?t{5Xo^Eq0Et z;8=m6elH0MMCIm)3RIZ6q%rUs^xtC65sTcv$LDCG6AElODB2gFiAML?IZhkMCmafV z*rveu>3n>L@3lS*zVN@%3l(@bTEqZ*2!*)O=qGW=IJ5~%orL2@$xl4_( zuZ`hJe2`F%k^_jE0=xRvshDHz0u&7kU4r;x(!+@F5EdnjMt9M+OzePumX$ajLfC0u zi#GR?{q+HSR!R)V*JIWr))9V}^b%Gv%k-L0AOyghh|dx}AZ*9+An79?MT3QrXGCsv zfQ*hHW(gcFkE#Wrq1}rfV5QiRUTUMRNT< zru&~PyKq)txz_Che7zOja_LXxsxJ?0L;Ul!Y&bVcbolb+1^DVU;NuV+KMMm8ADAR0 z;9-!&*Imf?_z&S4#HXYi(DjEIu|fu9hEI_);BP@3Clb!g;^TV>Z+7wV1jkn_1KKh< zK0xD#lDBxuCk@f+)C{P#aP0EoI6sS{?BW>JpJN)~NW%B6T=IGNOG0lsK9PGXJqDL_ zQ5@f=D1EiOJ9X_enV*?=eI{wRjOz#I^f?`UCrs^e7a-sFCr;<02fdN?9@Sf-E`~Qo zHCsT{U5X_OW4xkGSkT_om-}jZ?sy`SSD>SCLx!KcmF3iAeavx~lVSW9d-EN~}9zvtc*U{4r$tyNe<&m`6>u8E`@=4S6=2o;;iSR7#6|dnW3ay5(cDt&S;cEK zvBXe1Ox*N-V%@3rJ%|3Vq}viN`u^~W!ICLN_h}lAr^z3J67+y2c$)n2MyD^ASH>T- zzReckRhj@OPt;9$vju`iOh2Q6u-uD1)x#3eGAxPD(=EecU=RC74u=$CdmuLYMn`{` zhy90tyCFus#WBEZ;y|y71L5gDmV@9;!_7M>rC86Oi0J_n;6fi=f|o84e3N;+J;3KB zqE6#fpO^#*q};70nG2O9NY_nOe`^w+{VZeRx`g{2N#GcwyQvsF+mQ_S5YxS+dwEIs z@{$gVjd|QlI%K5)kG}`Fo1w50A27R<$%YzYdtjqunIjvXHCTS+YR6w-8?hR&h8K%B zKwxU`yc@md-3a|jw+HyV(J+cw4LsyiERLml7+=qOT=%(G`-djMI4?KjU~C^Z6Jdqn zW?uBGj>%r(OQF%w{Se>aD24rLJhdA5A^x9^DS%5R#xLDdVH;-})Tnb3KXgom9i*&Q z7bosR_7O3j+G^81aE#a;0^$X(TcGRU zrL5DA8SqA*dH2JPKJ)H}zVq&fFLX-{Zq5l&?+3q(-taRalvtIz)BmhvCgc*^LzXjP zw84_Y@D>e|bW50pcgAurFXeElkC$=?%j6Mu!}zodj&dj^wk$~FH^*5}MpO?t3s&@) zUUAHVZw*s!IS0P$(Oq!N>2bq#b3w}L4spdX*K6JbFr-I!!SO)vJPjw#htWOCD~|bI z6Bocd((QrQ2UMsF;B{j9X<7u^44n`mI~Tz(#HwIKn#1`JT+HsR=u&_jV$d2N?pz9W z#Q5peel%5io!=_2^Hc?IlId=>AiGehf~~q6dZeg=9sh@phr@E)^?7^9@_W`A#l4&+ zM%{G}hQCC#%5Z8OMic*IK!4ILgQMAloZe|Khq^xVmU|_-9A5U6PwS@@D$C(rvZ{fO ztTuT$d||KyS;gX`(A1+F;(QGD=kh#i;0@&PnAoE|vZOP#Bs-(U2JsC2G@Tl=tD@E9yJq|EsYylSvgXR-Jk z{Hw=uiSvKpTpv~kVb^y1T;hBIM)a`jCGAD1%j3#wI33<5Z-m{%cr6}wz6>MsxvmE4 zoHfqZ;7x;dWWD5k1FYBSx{jx53ZEs-Ze# zoAX@_+y&iku9yA=Ck)05{2u(+qx-=59>iYHE%i3v2{~S@kXQ{&i}}pC6T)slLskRV zWE^$wh7`_l5f8<*I`_c)#HwLjOowwXXx|fEhEK;`&i!yjXVi6{fpjCEsOvt1iNq>k zZ&H`@09-QIUjrE&@|t%D?!Bpd-Uh{6cNlCVx^-R7!*E6G6YvO>ky3wFKH}x{2s}W# zN+^R3$`M#%u#L#RghveakRZ9ff?WnnmV8}bdwDqu2MnEC4sacXmJ$3`3wpqByiC7= zcEhwkgu1?giw4UVqFl$kERVwL&l_kLmm^6}Z z^_4J8^4#F=Ik|D;!;P8#7WVFW(No`mHzQBSQ~ zr>E8gFB(pHYE5u@OmAvUUa9r!cxp{>jx4oi#&c_e^g^1*cy3KFjF=v<$*UI4FwwB& z0h?idQE$LzuYkQe9z*De%TyMZrUIBY` zJm4vKO1Gqdr{J)`_ySMCF=BM9myz~8+bwX(Fy#STVB7fKfGu7Ddv!cu3pDDM6tD%v zTYD?o;&pmkz)HGGXw`5dv_Pmq`95fYB!lsN&;oe|RSPB)AQ!5Z-v3d#HiO>y;k3=0|m`UsL!Fo;NHH!%)|E@Up=+30>^_ zp3BuFDb)2tkFJ>p>)epuAe}(%k9ozIPT)9@rSfh*RQaRn7-bNUhBOCUyx4kl1p&YRDDT{ zuer~4iI$7&Z>Bp}uad9#5)|sD%rAZxntBYz*Lw+`A*Khs1ltT9Z_7^j#bCU^oiOlT z9#G#EosdVY+04Ut>ebea@V!bNz7t01rWC#t))1BGM`2Owk>Wf|-PqYi>>6X+NU9h#`y}8Y5 z!Ck^)sEnU4RKbte2ly}p612AmF%Yy^P zi?w2HaIv_P9Z8!kI_15=_ll|VP<4q$hh^f66yS{Xds>|s$@tsaY{DV~FWR?=MJ&u` zJL0sUOmQ>H--04`alrfHCYoEs)<^6|?Uw_-7Hjoc^01hb;%4c!gjTUwe#SQmN@e~j zeVP18@>y{UOwY&>v|8~u{4l4UxuONBo?Y*giR*Yi)*{W8PsBK+h4O-22HVNqW@)7* z2`c0}f&-*SaH1$`CBH z_q!rT3Ud=cIm%uhVpf=NU9yjoFQuk$!`*!(ElBC447emxDON^>ed0N$h2vZAQYA2J zypk`VM9vq)j7%|KusJiuV&yO9Vw6AO`-xnv_@?Ece18r{B`{M=6?h9Wp)h&2vV~Ui z3$3IcHV>{)%9J+qGG(?hF|0uNMc-#|5;JE~Y9_DRrL-rNg-T{_QVDK{!mw3Jg>s8e z5`NFjoz{vYEcmWpnH*XyGQl2JtCR^pMn11JLwx84rBy?83FPLhT36^@(dWAP) zy}&=It5>Q*8cg++$#%gWoCMp2&Y)eUQe}VoUQ@nuD&;d%GrSUg%(PjlaW$JZlckyA z2Xda$ihi1)Zddpos)w%z+tt0w%1D=bP~e}X9VE+x0{?vMpfCn)s-=tgO?5qtux6Udn^3^tyf_fLZHY(RPr997!;32HrL`4+2-X^%Dw zn(t(_S?CP7M^ledm@|aU!jZHYYNxO>ajx2-yn^2$pHX%MFHk!K{-IR|*>qy>)TvB7 zjCe-*Ab6u%ro3+3gp$HUzSpw?@VuEmP7~Cf$~|eDRj29a*mqR3>C@=9S+FTL?S1q- z2ftW1i?c&NQKxn&_S8>gr#L3{OSMyZWXQK_r0Io(Q);|vTFwvXl-EAhG$Z%l>LhB& zyYalu7iQ3To5xo9=fEVk&YWVNK@U}vm@Od7oNt;FT&RpR9ZAbK7n$yGjqn^>8lL&Q zayMKFixgJrey9nbB|p{DlBf)I75bUMo+UpArAH$EX)aZ^WPa!wQrU0hDRVRY;b4}% z;)Lveh^u3g0IvslPWFoY8^0CgZ4-IhL>@*;FfiUyX7bAzVmT`2M&w$WMZD^Go~(@4 zZn7*i{o#MJrNT5JYocWZos&mRP0sr))h4EvTWU>*@QPe(8lA}t`iMCR9#zhp9z^+V zC`pwDMJ%(VN~sZ#TWY04ksixP>2P$dWxeTNvCAyD!Bd{MY&K;NY(N}^xZQLv;9bo5 ze%z#6_}V?GRsHw@ zV{4IoG?8Dx7p5Mwc9_KeP1c`jZingJ@Qc4K8)f}LeiQ&#Td%PMJmyB2(m~Jms z;+(_mzcAiAzc7A}%V)zKW9|9sW41f&Bh}=j`|U+)W7vcCQgpG{eo#q`D^N?t;XV(d z{36PW)sJ(kaJ)SmZPZwwm1x7$%~vPeUbNSXe+l~s`nlb<#a^n3AxS&zU6>bxE^5dk zHAUdA8^aEui`Put=_8C|X6l3Xd9=}0P~msG3N{dZRB(XmV}nSDM4SY69~aCJW6CPI+8rCavEhk=bWZXyJQLK5Z?mJqrL>j)bOn-mYI zT0hZr1!jjvnE1449Jht$(YOG|m0=|`o`U1w!rU~j#Bq7}21Mw;3vqV;7Q_?%LG{46 zexiB>Mh%EY+&Z8D(Ht=aaZ*Gj;^v4AYACZr?n2xg*@Cz(S`*DzVE3SCb2J+sQ()%j zsQ@L<#7sf_Bc{?^z$V9v7B1gl;VJGSY#|h_lr&)h;S|D3!VQGG2wMn68`%>U5KhtP zP)WGKc8mugY#|iwToO%~XI}(s`xVf*#LgW}A#@W~67C{wA&mCnHU)%Je6GN{*h(62 zAZ+yUz>%O`J{mV_ArbiUG58)v6lt92>w&mnH;vsSuW+_-8$axo;5E+KRi))6)m zHW5NR*$}!3>j)bOn+RdB2P~m^gUON*68Kn)phF&E389;?js2I@iD{? z{hzuDZ_4JDe}*H5)}Z#_&}R|<-?8?87+Hq$FuJ4vX1r`@U5|a=aqnCKia^Alp^n90 z$ODFlCxX znx>j&n&z8Un0_;jP<_oo<_L3~dAj-U=B4J>%?;*b=19v9%LPl9MY7&zz0bPVdd^y4 z|JW|M@#`~;`e{_|QvN{*z}?ySJ6?SlPlsRa;VK_+vv;F@zE;=ui`I`idcLpDW50T0 zpWdlm77pXj8jrwb;R5V~e0Ha_neBtE_?ilzDzfm4QVag3Qusxg3KLD`u+%ggUvtqu zTzJ+LFYGYYf=R7~2z8;b4=VAsP&lA&6wKyQm}jnq_2!Mj%Vr0h!B;!Je#O@nl!sYr z;ciRqt?+|oqj1(z3TIIeXO(eWAYK+W3jDR)I!*k^I-OoF+d?tcHl1FhY}3T)IG&Ej zdOX(KHVUoyin25K7?6KuXvgSE~#d+KvlIQa)R%r%H!X7|j@amP!&$HkyyW>xNuo;G3OdkjTQ5XxbG>*Z|Mr!%9X3Z%r zn>%&RpShOTY-KFlyCK#L5Lkk@XzN0O1u}I3{@#^)_C&rAwB`+w^*ya?&WkKux)Uwd z_(}Lb2=tyu1z-w;@oN@HEVhr>VJ?FG+~&qSyQ`vk+lL^qLTbtytruvWKj>OFxa0@nVL@t!q?v3$v#{Ht=^3{NK>6 o9cK3YRkAhDS=lgOFEdD~jtntJFnsd_uql13)5h9ab&BbK0kY`F1ONa4 diff --git a/About/Manifest.xml b/About/Manifest.xml index fd71972..eb8c757 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -1,7 +1,7 @@  RJWSexperienceIdeology - 1.5.1.0 + 1.5.1.1
  • RimJobWorld >= 5.3.0
    •  diff --git a/About/RealAbout.xml b/About/RealAbout.xml index c06dabd..f7bc102 100644 --- a/About/RealAbout.xml +++ b/About/RealAbout.xml @@ -1,4 +1,4 @@ - + RJW Sexperience Ideology amevarashi @@ -7,7 +7,7 @@
  • 1.4
  • 1.5
    •  - 1.5.1.0 + 1.5.1.1
  • Ludeon.RimWorld.Ideology diff --git a/CHANGELOG.md b/CHANGELOG.md index cefc8b6..b78e14f 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Source/IdeologyAddon/IdeologyAddon.csproj b/Source/IdeologyAddon/IdeologyAddon.csproj index cc624eb..f2f51af 100644 --- a/Source/IdeologyAddon/IdeologyAddon.csproj +++ b/Source/IdeologyAddon/IdeologyAddon.csproj @@ -2,7 +2,7 @@ Debug 1.5 - 1.0 + 1.1 $(TargetGameVersion).$(InternalModVersion) {B4481C38-31B1-422D-B5AA-0059FE7CCA1C} Library