From 6fd3c3eb9bfa15a0cf679b9ea6a3f659d8b72b2f Mon Sep 17 00:00:00 2001 From: flan Date: Wed, 15 Jul 2026 17:06:54 +0000 Subject: [PATCH] Vendor Justice's crime ThoughtDefs + updated DLL into the drop-in package.sh now merges Justice's Defs (the crime relationship thoughts) into the aggregate's Defs tree alongside Contraband's, so the shipped one-mod Institution carries them. Re-vendors the Justice DLL with the consequences/relationship code. --- Assemblies/InstitutionJustice.dll | Bin 11776 -> 15360 bytes Defs/ThoughtDefs/Thoughts_Crime.xml | 34 ++++++++++++++++++++++++++++ Tools/package.sh | 7 +++++- 3 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 Defs/ThoughtDefs/Thoughts_Crime.xml diff --git a/Assemblies/InstitutionJustice.dll b/Assemblies/InstitutionJustice.dll index bd75affcefe35a48b3f303b2936a4b45cc2c20da..1985ba2b24ee77436f659b5198d5f398476e26ed 100644 GIT binary patch delta 7868 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 Q0?)5J=?VXu%|&eg2Otr_3;+NC delta 4230 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 W!5(93;-9wVRR^8de#u7s+W!D%x9H{o diff --git a/Defs/ThoughtDefs/Thoughts_Crime.xml b/Defs/ThoughtDefs/Thoughts_Crime.xml new file mode 100644 index 0000000..fe4cf9b --- /dev/null +++ b/Defs/ThoughtDefs/Thoughts_Crime.xml @@ -0,0 +1,34 @@ + + + + + + + Institution_Victimized + 15 + Thought_MemorySocial + 3 + +
  • + + -25 +
  • +
    +
    + + + Institution_KnownCriminal + 30 + Thought_MemorySocial + 1 + +
  • + + -15 +
  • +
    +
    + +
    diff --git a/Tools/package.sh b/Tools/package.sh index 062e1fe..46f45c0 100755 --- a/Tools/package.sh +++ b/Tools/package.sh @@ -37,11 +37,16 @@ cp "$CB/Assemblies/Contraband.dll" "$HERE/Assemblies/" cp "$JUST/Assemblies/InstitutionJustice.dll" "$HERE/Assemblies/" cp "$GANGS/Assemblies/InstitutionGangs.dll" "$HERE/Assemblies/" -echo "==> vendoring Contraband's content" +echo "==> vendoring the feature content" for d in Defs Patches Languages Textures; do rm -rf "$HERE/$d" [[ -e "$CB/$d" ]] && cp -r "$CB/$d" "$HERE/$d" done +# Justice ships defs of its own (crime thoughts, etc.); merge them into the same Defs/ tree. +if [[ -e "$JUST/Defs" ]]; then + mkdir -p "$HERE/Defs" + cp -r "$JUST/Defs/." "$HERE/Defs/" +fi echo "==> done. Assemblies:" ls -1 "$HERE/Assemblies/" | sed 's/^/ /'