diff --git a/Assets/JSONData/TownNPCMoodValues.json b/Assets/JSONData/TownNPCMoodValues.json index b8316ba8..236e5184 100644 --- a/Assets/JSONData/TownNPCMoodValues.json +++ b/Assets/JSONData/TownNPCMoodValues.json @@ -14,5 +14,9 @@ "DislikeNPC": -10, "HateNPC": -20, "HateLonely": -30, - "SleptWell": 10 + "SleptWell": 10, + "LikeEvent": 10, + "LoveEvent": 20, + "DislikeEvent": -10, + "HateEvent": -20 } \ No newline at end of file diff --git a/Content/TownNPCRevitalization/Globals/NPCs/TownGlobalNPC.cs b/Content/TownNPCRevitalization/Globals/NPCs/TownGlobalNPC.cs index a930e56b..9f733227 100644 --- a/Content/TownNPCRevitalization/Globals/NPCs/TownGlobalNPC.cs +++ b/Content/TownNPCRevitalization/Globals/NPCs/TownGlobalNPC.cs @@ -138,7 +138,6 @@ public override bool AppliesToEntity(NPC entity, bool lateInstantiation) => late public override void Load() { TownNPCCombatModule.Load(); - TownNPCMoodModule.Load(); } public override void Unload() { @@ -161,6 +160,9 @@ public override void SetStaticDefaults() { throw new Exception("Multiple TownNPCAIState instances with the same ReservedStateInteger"); } + // Must be loaded due to tML refreshing the happiness database in-between Load and SetStaticDefaults. + TownNPCMoodModule.Load(); + _stateDict = states.ToDictionary(state => state.ReservedStateInteger); //_allActivities = states.OfType().ToList(); } diff --git a/Localization/de-DE.hjson b/Localization/de-DE.hjson index be9377fa..2c0a0603 100644 --- a/Localization/de-DE.hjson +++ b/Localization/de-DE.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/en-US.hjson b/Localization/en-US.hjson index 8db88782..b91d5a0b 100644 --- a/Localization/en-US.hjson +++ b/Localization/en-US.hjson @@ -400,7 +400,6 @@ Mods: { TowNPCMoodDescription: { Injured: Injured SleptWell: Well Rested - AtParty: At Party Content: Content NoHome: Homeless FarFromHome: Far From Housing @@ -416,7 +415,10 @@ Mods: { DislikeNPC: Dislikes Neighbor HateNPC: Hates Neighbor HateLonely: Lonely - IrritatedByBloodMoon: Blood Moon + LikeEvent: Likes Event + LoveEvent: Loves Event + DislikeEvent: Dislikes Event + HateEvent: Hates Event } InterTownNPCChat: { diff --git a/Localization/es-ES.hjson b/Localization/es-ES.hjson index be9377fa..2c0a0603 100644 --- a/Localization/es-ES.hjson +++ b/Localization/es-ES.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/fr-FR.hjson b/Localization/fr-FR.hjson index be9377fa..2c0a0603 100644 --- a/Localization/fr-FR.hjson +++ b/Localization/fr-FR.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/it-IT.hjson b/Localization/it-IT.hjson index 2d81002f..46f04e06 100644 --- a/Localization/it-IT.hjson +++ b/Localization/it-IT.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/pl-PL.hjson b/Localization/pl-PL.hjson index 7eacce79..ecadf44d 100644 --- a/Localization/pl-PL.hjson +++ b/Localization/pl-PL.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/pt-BR.hjson b/Localization/pt-BR.hjson index be9377fa..2c0a0603 100644 --- a/Localization/pt-BR.hjson +++ b/Localization/pt-BR.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/ru-RU.hjson b/Localization/ru-RU.hjson index be9377fa..2c0a0603 100644 --- a/Localization/ru-RU.hjson +++ b/Localization/ru-RU.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: { diff --git a/Localization/zh-Hans.hjson b/Localization/zh-Hans.hjson index be9377fa..2c0a0603 100644 --- a/Localization/zh-Hans.hjson +++ b/Localization/zh-Hans.hjson @@ -416,7 +416,10 @@ Mods: { // DislikeNPC: Dislikes Neighbor // HateNPC: Hates Neighbor // HateLonely: Lonely - // IrritatedByBloodMoon: Blood Moon + // LikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LikeEvent + // LoveEvent: Mods.LivingWorldMod.TowNPCMoodDescription.LoveEvent + // DislikeEvent: Mods.LivingWorldMod.TowNPCMoodDescription.DislikeEvent + // HateEvent: Mods.LivingWorldMod.TowNPCMoodDescription.HateEvent } InterTownNPCChat: {