diff --git a/Assemblies/InstitutionJustice.dll b/Assemblies/InstitutionJustice.dll index bd75aff..1985ba2 100644 Binary files a/Assemblies/InstitutionJustice.dll and b/Assemblies/InstitutionJustice.dll differ 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/^/ /'