diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 918fd4d8..4d844f30 100644 Binary files a/1.6/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/1.6/Assemblies/WulaFallenEmpire.dll differ diff --git a/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml b/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml index b561a564..28342a2f 100644 --- a/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml +++ b/1.6/1.6/Defs/EventDefs/EventDef_Wula/Wula_MainEvent.xml @@ -13,7 +13,7 @@
  • - + true (255,255,255,255) (157,201,185,195) @@ -23,24 +23,6 @@
  • -
  • - 增援 - 乌拉帝国 行星封锁机关的一支分队正在接近。 - 10000 - Wula_PIA_Legion_Faction - ImmediateAttack - EdgeDrop - Combat - -
  • - Combat - 100 - - 10 - -
    • - - @@ -91,4 +73,4 @@     - + \ No newline at end of file diff --git a/1.6/1.6/Defs/StoryTellers/WULA_Storytellers.xml b/1.6/1.6/Defs/StoryTellers/WULA_Storytellers.xml index 5f8a0e91..5a023ae6 100644 --- a/1.6/1.6/Defs/StoryTellers/WULA_Storytellers.xml +++ b/1.6/1.6/Defs/StoryTellers/WULA_Storytellers.xml @@ -180,6 +180,17 @@ 8 1 + +
  • + WULA_GiveQuest_Intro_Spy + 6 + +
  • WULA_Awakened_Synth
    • + + + \ No newline at end of file diff --git a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png index 0cb4b9ff..abe745d8 100644 Binary files a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png and b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_east.png differ diff --git a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png index 3dee4932..40a944bb 100644 Binary files a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png and b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_north.png differ diff --git a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png index 71c8043b..a6a94bb5 100644 Binary files a/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png and b/Content/Textures/Wula/Hair/WULA_Double_Ponytail_Long_south.png differ diff --git a/Content/Textures/Wula/Hair/WULA_High_Ponytail_east.png b/Content/Textures/Wula/Hair/WULA_High_Ponytail_east.png index b472941d..579693f5 100644 Binary files a/Content/Textures/Wula/Hair/WULA_High_Ponytail_east.png and b/Content/Textures/Wula/Hair/WULA_High_Ponytail_east.png differ diff --git a/Content/Textures/Wula/Hair/WULA_High_Ponytail_north.png b/Content/Textures/Wula/Hair/WULA_High_Ponytail_north.png index 16e0a9cf..80006c55 100644 Binary files a/Content/Textures/Wula/Hair/WULA_High_Ponytail_north.png and b/Content/Textures/Wula/Hair/WULA_High_Ponytail_north.png differ diff --git a/Content/Textures/Wula/Hair/WULA_High_Ponytail_south.png b/Content/Textures/Wula/Hair/WULA_High_Ponytail_south.png index be86ba85..b1a09654 100644 Binary files a/Content/Textures/Wula/Hair/WULA_High_Ponytail_south.png and b/Content/Textures/Wula/Hair/WULA_High_Ponytail_south.png differ diff --git a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_east.png b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_east.png index 1874c288..1080fc15 100644 Binary files a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_east.png and b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_east.png differ diff --git a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_north.png b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_north.png index 84579ecf..a52df560 100644 Binary files a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_north.png and b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_north.png differ diff --git a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_south.png b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_south.png index 019fcaa7..2876f061 100644 Binary files a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_south.png and b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_south.png differ diff --git a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_west.png b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_west.png index 461fa16e..5e474787 100644 Binary files a/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_west.png and b/Content/Textures/Wula/Things/WulaSpecies/Heads/Average_Normal_west.png differ diff --git a/Source/WulaFallenEmpire/Storyteller/StorytellerComp_SingleOnceFixed_FactionFilter.cs b/Source/WulaFallenEmpire/Storyteller/StorytellerComp_SingleOnceFixed_FactionFilter.cs new file mode 100644 index 00000000..685fe4d9 --- /dev/null +++ b/Source/WulaFallenEmpire/Storyteller/StorytellerComp_SingleOnceFixed_FactionFilter.cs @@ -0,0 +1,63 @@ +using System.Collections.Generic; +using RimWorld; +using Verse; + +namespace WulaFallenEmpire +{ + public class StorytellerComp_SingleOnceFixed_FactionFilter : StorytellerComp_SingleOnceFixed + { + private StorytellerCompProperties_SingleOnceFixed_FactionFilter PropsFilter => (StorytellerCompProperties_SingleOnceFixed_FactionFilter)props; + + public override IEnumerable MakeIntervalIncidents(IIncidentTarget target) + { + // 检查派系过滤条件 + if (!CheckFactionFilter()) + { + yield break; + } + + // 调用父类的逻辑 + foreach (var incident in base.MakeIntervalIncidents(target)) + { + yield return incident; + } + } + + private bool CheckFactionFilter() + { + if (Faction.OfPlayer == null) + return false; + + var playerFactionDef = Faction.OfPlayer.def; + + // 优先检查白名单：如果白名单有内容，只有白名单内的派系才能触发 + if (PropsFilter.allowedFactionTypes != null && PropsFilter.allowedFactionTypes.Count > 0) + { + return PropsFilter.allowedFactionTypes.Contains(playerFactionDef); + } + + // 然后检查黑名单：如果黑名单有内容，黑名单内的派系不能触发 + if (PropsFilter.excludedFactionTypes != null && PropsFilter.excludedFactionTypes.Count > 0) + { + return !PropsFilter.excludedFactionTypes.Contains(playerFactionDef); + } + + // 如果既没有白名单也没有黑名单，所有派系都能触发 + return true; + } + } + + public class StorytellerCompProperties_SingleOnceFixed_FactionFilter : StorytellerCompProperties_SingleOnceFixed + { + // 黑名单：这些派系类型不会触发事件 + public List excludedFactionTypes; + + // 白名单：只有这些派系类型会触发事件（优先级高于黑名单） + public List allowedFactionTypes; + + public StorytellerCompProperties_SingleOnceFixed_FactionFilter() + { + compClass = typeof(StorytellerComp_SingleOnceFixed_FactionFilter); + } + } +} diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index 357129fe..ff80bf29 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -207,6 +207,7 @@ + diff --git a/美术与文本源文件/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 b/美术与文本源文件/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 index 800a0546..e84c2885 100644 Binary files a/美术与文本源文件/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 and b/美术与文本源文件/Wula/Hair/WULA_Double_Ponytail_Long_south.sai2 differ diff --git a/美术与文本源文件/Wula/Hair/WULA_High_Ponytail_south.sai2 b/美术与文本源文件/Wula/Hair/WULA_High_Ponytail_south.sai2 index df1d237e..8652ae97 100644 Binary files a/美术与文本源文件/Wula/Hair/WULA_High_Ponytail_south.sai2 and b/美术与文本源文件/Wula/Hair/WULA_High_Ponytail_south.sai2 differ diff --git a/美术与文本源文件/Wula/Hair/WULA_One_Side_Ponytail_south.sai2 b/美术与文本源文件/Wula/Hair/WULA_One_Side_Ponytail_south.sai2 index a863f030..4e8bbc42 100644 Binary files a/美术与文本源文件/Wula/Hair/WULA_One_Side_Ponytail_south.sai2 and b/美术与文本源文件/Wula/Hair/WULA_One_Side_Ponytail_south.sai2 differ diff --git a/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 b/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 index 71ba8c04..377cb0ca 100644 Binary files a/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 and b/美术与文本源文件/Wula/Things/WulaSpecies/Heads/Average_Normal_south.sai2 differ