Skip to content

Commit

Permalink
Finish ground-work for event preferences
Browse files Browse the repository at this point in the history
  • Loading branch information
@MutantWafflez
MutantWafflez committed Jul 5, 2024
1 parent 535f1db commit ef0b309
Show file tree
Hide file tree
Showing 11 changed files with 44 additions and 12 deletions.
6 changes: 5 additions & 1 deletion Assets/JSONData/TownNPCMoodValues.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 14,9 @@
"DislikeNPC": -10,
"HateNPC": -20,
"HateLonely": -30,
"SleptWell": 10
"SleptWell": 10,
"LikeEvent": 10,
"LoveEvent": 20,
"DislikeEvent": -10,
"HateEvent": -20
}
4 changes: 3 additions & 1 deletion Content/TownNPCRevitalization/Globals/NPCs/TownGlobalNPC.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -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<TownNPCActivity>().ToList();
}
Expand Down
5 changes: 4 additions & 1 deletion Localization/de-DE.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
6 changes: 4 additions & 2 deletions Localization/en-US.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 400,6 @@ Mods: {
TowNPCMoodDescription: {
Injured: Injured
SleptWell: Well Rested
AtParty: At Party
Content: Content
NoHome: Homeless
FarFromHome: Far From Housing
Expand All @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/es-ES.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/fr-FR.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/it-IT.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/pl-PL.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/pt-BR.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/ru-RU.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
5 changes: 4 additions & 1 deletion Localization/zh-Hans.hjson
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down

0 comments on commit ef0b309

Please sign in to comment.