From df0924ab88f64b2d8636c68bdf1d3edc6bf713be Mon Sep 17 00:00:00 2001 From: Cocopomel <79386233+Cocopomel@users.noreply.github.com> Date: Fri, 26 Feb 2021 23:36:57 +0900 Subject: [PATCH] 0226 fix --- .../AutomataRaceSettings.xml | 9 ++ 1.2/Defs/HediffDefs/Hediffs_Maintenance.xml | 5 +- 1.2/Defs/ThingDef/ThingDef_Race_Paniel.xml | 9 +- ...ts_LostDead.xml => Thoughts_LostDeath.xml} | 104 +++++++++--------- .../ThoughtDefs/Thoughts_PanielReplace.xml | 5 + 1.2/Patches/Royalty.xml | 21 ---- 6 files changed, 73 insertions(+), 80 deletions(-) rename 1.2/Defs/ThoughtDefs/{Thoughts_LostDead.xml => Thoughts_LostDeath.xml} (94%) create mode 100644 1.2/Defs/ThoughtDefs/Thoughts_PanielReplace.xml diff --git a/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml b/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml index 21f712e..764543d 100644 --- a/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml +++ b/1.2/Defs/AutomataRaceSettings/AutomataRaceSettings.xml @@ -45,6 +45,15 @@
  • WitnessedDeathNonAlly
    • +
  • + ColonistBanished +
    • +
  • + ColonistBanishedToDie +
    • +
  • + PrisonerBanishedToDie +
    • \ No newline at end of file diff --git a/1.2/Defs/HediffDefs/Hediffs_Maintenance.xml b/1.2/Defs/HediffDefs/Hediffs_Maintenance.xml index fd4edc9..42aaa4e 100644 --- a/1.2/Defs/HediffDefs/Hediffs_Maintenance.xml +++ b/1.2/Defs/HediffDefs/Hediffs_Maintenance.xml @@ -22,6 +22,7 @@ 1.2 + 0.08 -0.10 -0.4 @@ -52,7 +53,7 @@ 0.80 - -0.04 + 0.04 -0.05 -0.2 @@ -86,7 +87,7 @@ 0.0 - -0.08 + -0.04 0.05 0.2 diff --git a/1.2/Defs/ThingDef/ThingDef_Race_Paniel.xml b/1.2/Defs/ThingDef/ThingDef_Race_Paniel.xml index 46380bb..63fa7e9 100644 --- a/1.2/Defs/ThingDef/ThingDef_Race_Paniel.xml +++ b/1.2/Defs/ThingDef/ThingDef_Race_Paniel.xml @@ -496,8 +496,6 @@
  • ObservedLayingCorpse
  • ObservedLayingRottingCorpse
  • WitnessedDeathNonAlly
    • -
  • ColonistBanished
    • -
  • ColonistBanishedToDie
  • BondedAnimalBanished
  • SleptInBedroom
    • @@ -528,7 +526,6 @@
  • PrisonCell
  • PrisonBarracks
    • -
  • Affair
  • Incestuous
  • Disfigured
  • HardWorkerVsLazy
    • @@ -571,6 +568,8 @@
  • Greedy
  • Jealous
  • Ascetic
    • + +
  • Expectations
    • @@ -613,8 +612,8 @@ 0 24 4 - 2 - 0.2 + 1.25 + 0.25 1 0 100 diff --git a/1.2/Defs/ThoughtDefs/Thoughts_LostDead.xml b/1.2/Defs/ThoughtDefs/Thoughts_LostDeath.xml similarity index 94% rename from 1.2/Defs/ThoughtDefs/Thoughts_LostDead.xml rename to 1.2/Defs/ThoughtDefs/Thoughts_LostDeath.xml index ba9eda6..4aa7c74 100644 --- a/1.2/Defs/ThoughtDefs/Thoughts_LostDead.xml +++ b/1.2/Defs/ThoughtDefs/Thoughts_LostDeath.xml @@ -1,6 +1,6 @@ - + PN_KnowColonyAutomatonDied 6 @@ -68,56 +68,7 @@ - - - PN_ColonyAutomatonLost - 6 - 5 - true - -
  • Psychopath
    • -     - -
  • - - One of our automaton lost. That automaton was our property. - -1 -
    • -     -     - - - PN_AutomatonWithGoodOpinionLost - 10 - 5 - 1 - -
  • Psychopath
    • -     - -
  • - - I lost my friend. very sad... - -5 -
    • -     -     - - - PN_AutomatonWithBadOpinionLost - 10 - 5 - 1 - -
  • - - That scrap was finally disappeared. - 5 -
    • -     -     - - + PN_KnowColonyAutomatonDiedforPN 6 @@ -185,7 +136,56 @@ - + + + PN_ColonyAutomatonLost + 6 + 5 + true + +
  • Psychopath
    • +     + +
  • + + One of our automaton lost. That automaton was our property. + -1 +
    • +     +     + + + PN_AutomatonWithGoodOpinionLost + 10 + 5 + 1 + +
  • Psychopath
    • +     + +
  • + + I lost my friend. very sad... + -5 +
    • +     +     + + + PN_AutomatonWithBadOpinionLost + 10 + 5 + 1 + +
  • + + That scrap was finally disappeared. + 5 +
    • +     +     + + PN_ColonyAutomatonLostforPN 6 diff --git a/1.2/Defs/ThoughtDefs/Thoughts_PanielReplace.xml b/1.2/Defs/ThoughtDefs/Thoughts_PanielReplace.xml new file mode 100644 index 0000000..08d47b5 --- /dev/null +++ b/1.2/Defs/ThoughtDefs/Thoughts_PanielReplace.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/1.2/Patches/Royalty.xml b/1.2/Patches/Royalty.xml index d85af1b..ad79fd6 100644 --- a/1.2/Patches/Royalty.xml +++ b/1.2/Patches/Royalty.xml @@ -7,27 +7,6 @@ Always -
  • - Defs/AlienRace.ThingDef_AlienRace[defName = "Paniel_Race"]/alienRace/thoughtSettings/canStillReceiveThoughts - -
  • AteFoodInappropriateForTitle
    • -
  • DecreeMet
    • -
  • DecreeFailed
    • -
  • Disinherited
    • -
  • NeuroquakeEcho
    • -
  • ReignedInThroneroom
    • -
  • OtherTravelerArrested
    • -
  • OtherTravelerSurgicallyViolated
    • -
  • PsychicEntropyOverloaded
    • -
  • AnimaScream
    • -
  • OtherTravelerDied
    • -
  • OtherTravelerArrested
    • -
  • OtherTravelerSurgicallyViolated
    • -
  • DecreeUnmet
    • -
  • PsychicLove
    • - - -
  • Defs/HediffDef[defName = "PanielBaseHediff"]/comps/li[@Class = "MoharHediffs.HediffCompProperties_HediffNullifier"]/hediffToNullify