AblativeAbsolute/rjw-sexperience-ideology
1
0
Fork 0
mirror of https://gitgud.io/amevarashi/rjw-sexperience-ideology.git synced 2024-08-15 00:43:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Compare commits

base: AblativeAbsolute:9b25392911fb182a488287a5fa46d657db69a5e1
Branches Tags
AblativeAbsolute:master
AblativeAbsolute:dev
AblativeAbsolute:RW-1.3
AblativeAbsolute:1.5.1.1
AblativeAbsolute:1.5.1.0
AblativeAbsolute:ci-test-40
AblativeAbsolute:1.4.1.0
AblativeAbsolute:1.0.2.1
AblativeAbsolute:1.0.1.2
AblativeAbsolute:1.0.1.1
AblativeAbsolute:1.0.1.0
AblativeAbsolute:1.0.0.3
AblativeAbsolute:1.0.0.2
AblativeAbsolute:1.0.0.1
AblativeAbsolute:1.0.0.0
..
compare: AblativeAbsolute:60095c450346fea66f91c60223ee13d8c2380234
Branches Tags
AblativeAbsolute:dev
AblativeAbsolute:master
AblativeAbsolute:RW-1.3
AblativeAbsolute:1.5.1.1
AblativeAbsolute:1.5.1.0
AblativeAbsolute:ci-test-40
AblativeAbsolute:1.4.1.0
AblativeAbsolute:1.0.2.1
AblativeAbsolute:1.0.1.2
AblativeAbsolute:1.0.1.1
AblativeAbsolute:1.0.1.0
AblativeAbsolute:1.0.0.3
AblativeAbsolute:1.0.0.2
AblativeAbsolute:1.0.0.1
AblativeAbsolute:1.0.0.0

No commits in common. "9b25392911fb182a488287a5fa46d657db69a5e1" and "60095c450346fea66f91c60223ee13d8c2380234" have entirely different histories.
9b25392911 ... 60095c4503

4 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

106
1.5/Defs/PreceptDefs/Precepts_SocialAffection.xml
View file

@ -1,62 +1,62 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8" ?>
<Defs> <Defs>
<!-- Issues --> <!-- Issues -->
<IssueDef> <IssueDef>
<defName>SocialAffection</defName> <defName>SocialAffection</defName>
<label>social affection</label> <label>social affection</label>
<iconPath>UI/Issues/SocialAffection</iconPath> <iconPath>UI/Issues/SocialAffection</iconPath>
</IssueDef> </IssueDef>
<!-- Precepts --> <!-- Precepts -->
<PreceptDef> <PreceptDef>
<defName>SocialAffection_Normal</defName> <defName>SocialAffection_Normal</defName>
<issue>SocialAffection</issue> <issue>SocialAffection</issue>
<label>normal(vanilla)</label> <label>normal(vanilla)</label>
<description>Just normal.</description> <description>Just normal.</description>
<impact>Low</impact> <impact>Low</impact>
<displayOrderInIssue>50</displayOrderInIssue> <displayOrderInIssue>50</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact> <displayOrderInImpact>1000</displayOrderInImpact>
</PreceptDef> </PreceptDef>
<PreceptDef> <PreceptDef>
<defName>SocialAffection_Small</defName> <defName>SocialAffection_Small</defName>
<issue>SocialAffection</issue> <issue>SocialAffection</issue>
<label>only immediate family</label> <label>only immediate family</label>
<description>Care about only immediate family.</description> <description>Care about only immediate family.</description>
<impact>Medium</impact> <impact>Medium</impact>
<displayOrderInIssue>40</displayOrderInIssue> <displayOrderInIssue>40</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact> <displayOrderInImpact>1000</displayOrderInImpact>
</PreceptDef> </PreceptDef>
<PreceptDef> <PreceptDef>
<defName>SocialAffection_OnlyFamily</defName> <defName>SocialAffection_OnlyFamily</defName>
<issue>SocialAffection</issue> <issue>SocialAffection</issue>
<label>only family</label> <label>only family</label>
<description>Don't care about the tragedy of a non-family member.</description> <description>Don't care about non-family memeber's tragedy.</description>
<impact>Medium</impact> <impact>Medium</impact>
<displayOrderInIssue>30</displayOrderInIssue> <displayOrderInIssue>30</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact> <displayOrderInImpact>1000</displayOrderInImpact>
</PreceptDef> </PreceptDef>
<PreceptDef> <PreceptDef>
<defName>SocialAffection_Dry</defName> <defName>SocialAffection_Dry</defName>
<issue>SocialAffection</issue> <issue>SocialAffection</issue>
<label>not family</label> <label>not family</label>
<description>Don't care about the tragedy of a family member.</description> <description>Don't care about family memeber's tragedy.</description>
<impact>High</impact> <impact>High</impact>
<displayOrderInIssue>20</displayOrderInIssue> <displayOrderInIssue>20</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact> <displayOrderInImpact>1000</displayOrderInImpact>
</PreceptDef> </PreceptDef>
<PreceptDef> <PreceptDef>
<defName>SocialAffection_Psychopath</defName> <defName>SocialAffection_Psychopath</defName>
<issue>SocialAffection</issue> <issue>SocialAffection</issue>
<label>Psychopath</label> <label>Psychopath</label>
<description>Don't care about others.</description> <description>Don't care about others.</description>
<impact>High</impact> <impact>High</impact>
<displayOrderInIssue>10</displayOrderInIssue> <displayOrderInIssue>10</displayOrderInIssue>
<displayOrderInImpact>1000</displayOrderInImpact> <displayOrderInImpact>1000</displayOrderInImpact>
</PreceptDef> </PreceptDef>
</Defs> </Defs>

6
1.5/Patches/Core_ThoughtDefsDeath.xml → 1.5/Patches/RJW_ThoughtDefsDeath.xml
View file

@ -2,9 +2,9 @@
<Patch> <Patch>
<Operation Class="PatchOperationConditional"> <Operation Class="PatchOperationConditional">
<xpath>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"]/nullifyingPrecepts</xpath> <xpath>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</xpath>
<nomatch Class="PatchOperationAdd"> <nomatch Class="PatchOperationAdd">
<xpath>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"]</xpath> <xpath>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"]</xpath>
<value> <value>
<nullifyingPrecepts> <nullifyingPrecepts>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
@ -14,7 +14,7 @@
</value> </value>
</nomatch> </nomatch>
<match Class="PatchOperationAdd"> <match Class="PatchOperationAdd">
<xpath>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"]/nullifyingPrecepts</xpath> <xpath>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</xpath>
<value> <value>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
<li>SocialAffection_Dry</li> <li>SocialAffection_Dry</li>

6
1.5/Patches/Core_ThoughtDefsLost.xml → 1.5/Patches/RJW_ThoughtDefsLost.xml
View file

@ -2,9 +2,9 @@
<Patch> <Patch>
<Operation Class="PatchOperationConditional"> <Operation Class="PatchOperationConditional">
<xpath>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"]/nullifyingPrecepts</xpath> <xpath>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</xpath>
<nomatch Class="PatchOperationAdd"> <nomatch Class="PatchOperationAdd">
<xpath>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"]</xpath> <xpath>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"]</xpath>
<value> <value>
<nullifyingPrecepts> <nullifyingPrecepts>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
@ -14,7 +14,7 @@
</value> </value>
</nomatch> </nomatch>
<match Class="PatchOperationAdd"> <match Class="PatchOperationAdd">
<xpath>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"]/nullifyingPrecepts</xpath> <xpath>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</xpath>
<value> <value>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
<li>SocialAffection_Dry</li> <li>SocialAffection_Dry</li>

2
1.5/Patches/RJW_Thought_Family_Beast.xml
View file

@ -709,6 +709,7 @@
<nullifyingPrecepts> <nullifyingPrecepts>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
<li>SocialAffection_Dry</li> <li>SocialAffection_Dry</li>
<li>SocialAffection_OnlyFamily</li>
</nullifyingPrecepts> </nullifyingPrecepts>
</value> </value>
</nomatch> </nomatch>
@ -717,6 +718,7 @@
<value> <value>
<li>SocialAffection_Psychopath</li> <li>SocialAffection_Psychopath</li>
<li>SocialAffection_Dry</li> <li>SocialAffection_Dry</li>
<li>SocialAffection_OnlyFamily</li>
</value> </value>
</match> </match>
</Operation> </Operation>