diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index d4689ffe..48d5048d 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/CQFPartDefs/DialogTree/WULA_Dialog.xml b/1.6/1.6/Defs/CQFPartDefs/DialogTree/WULA_Dialog.xml new file mode 100644 index 00000000..edd8cb5a --- /dev/null +++ b/1.6/1.6/Defs/CQFPartDefs/DialogTree/WULA_Dialog.xml @@ -0,0 +1,97 @@ + + + + WULA_PIA_Legion_Escort_Traitor_DialogMain + 与断爪卫队的叛徒对话 + true + 与{Interviewee_nameDef}对话 + 2 + + +
  • + 0 + + 对话内容1 + 0 + +
  • 1
    • + + +
  • + 对话选项1-1 + false + +
  • + Normal + + 1 +
    • + + +     + + +
  • + 1 + + 对话内容2 + 1 + 0 + + +
  • + 对话选项2-1 + false + +
  • + Undefined + +
  • + +
  • Interviewee
    • + + +
  • + +
  • Interviewee
    • + + PlayerColony + +
  • + FinallyHostile +
    • + + + + +
  • + 对话选项2-2 + false + +
  • + Undefined + +
  • + +
  • Interviewee
    • + + +
  • + +
  • Interviewee
    • + + Insect + +
  • + FinallyHostile +
    • + + + + + + + +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/CQFPartDefs/DialogTree/WULA_DialogManager.xml b/1.6/1.6/Defs/CQFPartDefs/DialogTree/WULA_DialogManager.xml new file mode 100644 index 00000000..6bbe4a4e --- /dev/null +++ b/1.6/1.6/Defs/CQFPartDefs/DialogTree/WULA_DialogManager.xml @@ -0,0 +1,12 @@ + + + + WULA_PIA_Legion_Escort_Traitor_DialogManager + +
  • + WULA_PIA_Legion_Escort_Traitor_DialogMain + +
    • +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml b/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml new file mode 100644 index 00000000..0b1c449f --- /dev/null +++ b/1.6/1.6/Defs/CQFPartDefs/Map/Wula_PIA_Legion_Escort_Traitor_Map.xml @@ -0,0 +1,274 @@ + + + + Wula_PIA_Legion_Escort_Traitor_Map + + (64, 1, 64) + true + 0 + +
  • + (32, 0, 31) + +
  • + Traitor + Wula_PIA_Legion_Escort_Traitor + true + 1 + Wula_PIA_Legion_Faction + WULA_PIA_Legion_Escort_Traitor_DialogManager + QE_Duty_Waiter + MapGeneration +
    • + + +     + +
  • + WulaFloor + +
  • (23,25,50,35)
    • +
  • (28,23,42,24)
    • +
  • (32,20,34,22)
    • +
  • (31,22,31,22)
    • +
  • (35,21,37,22)
    • +
  • (39,18,41,22)
    • +
  • (38,22,38,22)
    • +
  • (43,24,45,24)
    • +
  • (34,36,48,36)
    • +
  • (34,37,47,37)
    • +
  • (34,38,46,38)
    • +
  • (35,39,46,40)
    • +
  • (37,41,46,43)
    • +
  • (37,44,44,46)
    • + + +     + +
  • + WULA_GlobalStorageSenderPod + Wula_PIA_Legion_Faction + +
  • (40,42,40,42)
    • +
  • (42,42,42,42)
    • + + +
  • + WULA_OrbitalTradeBeacon + Wula_PIA_Legion_Faction + +
  • (40,27,40,27)
    • +
  • (41,43,41,43)
    • + + +
  • + WulaWall + Wula_PIA_Legion_Faction + +
  • (22,23,24,24)
    • +
  • (22,25,22,25)
    • +
  • (27,20,32,20)
    • +
  • (19,28,22,28)
    • +
  • (26,22,27,23)
    • +
  • (27,21,28,21)
    • +
  • (25,24,26,24)
    • +
  • (19,29,19,32)
    • +
  • (22,27,22,27)
    • +
  • (34,16,39,17)
    • +
  • (21,33,22,35)
    • +
  • (37,18,38,21)
    • +
  • (22,36,23,37)
    • +
  • (29,31,29,36)
    • +
  • (37,22,37,25)
    • +
  • (24,37,24,38)
    • +
  • (30,33,30,36)
    • +
  • (25,38,27,38)
    • +
  • (41,20,42,21)
    • +
  • (42,22,48,22)
    • +
  • (31,36,33,36)
    • +
  • (43,23,48,23)
    • +
  • (33,37,33,38)
    • +
  • (48,24,48,28)
    • +
  • (46,28,47,28)
    • +
  • (35,41,36,47)
    • +
  • (51,26,52,31)
    • +
  • (37,47,45,47)
    • +
  • (51,33,52,37)
    • +
  • (47,41,48,43)
    • +
  • (45,44,47,44)
    • +
  • (45,45,46,46)
    • + + +
  • + Filth_RubbleBuilding + +
  • (20,26,22,26)
    • +
  • (29,18,29,18)
    • +
  • (32,19,32,19)
    • +
  • (33,18,33,18)
    • +
  • (20,32,20,33)
    • +
  • (39,18,40,18)
    • +
  • (40,19,40,19)
    • +
  • (29,37,31,37)
    • +
  • (28,38,28,38)
    • +
  • (42,28,42,28)
    • +
  • (36,36,36,36)
    • +
  • (35,38,35,38)
    • +
  • (34,40,34,40)
    • +
  • (38,37,38,37)
    • +
  • (50,24,50,24)
    • +
  • (33,45,33,45)
    • +
  • (41,38,41,38)
    • +
  • (51,25,51,25)
    • +
  • (52,24,52,24)
    • +
  • (50,35,50,35)
    • +
  • (49,40,50,40)
    • +
  • (50,39,52,39)
    • + + +
  • + Filth_Trash + +
  • (29,25,29,25)
    • +
  • (25,29,25,29)
    • +
  • (35,23,36,23)
    • +
  • (42,29,42,29)
    • +
  • (45,32,45,32)
    • + + +
  • + Filth_Slime + +
  • (18,15,18,15)
    • +
  • (21,24,21,24)
    • +
  • (31,12,31,12)
    • +
  • (28,26,28,26)
    • +
  • (15,36,15,36)
    • +
  • (32,24,32,24)
    • +
  • (41,13,41,13)
    • +
  • (40,24,40,24)
    • +
  • (22,42,22,42)
    • +
  • (31,41,31,41)
    • +
  • (45,27,45,27)
    • +
  • (54,13,54,13)
    • +
  • (30,47,30,47)
    • +
  • (47,32,47,32)
    • +
  • (44,38,44,38)
    • +
  • (52,41,52,41)
    • +
  • (45,50,45,50)
    • + + +
  • + Corpse_WulaSpecies + 2 + +
  • (18,15,18,15)
    • +
  • (21,24,21,24)
    • +
  • (31,12,31,12)
    • +
  • (28,26,28,26)
    • +
  • (15,36,15,36)
    • +
  • (32,24,32,24)
    • +
  • (41,13,41,13)
    • +
  • (40,24,40,24)
    • +
  • (22,42,22,42)
    • +
  • (31,41,31,41)
    • +
  • (45,27,45,27)
    • +
  • (54,13,54,13)
    • +
  • (30,47,30,47)
    • +
  • (47,32,47,32)
    • +
  • (44,38,44,38)
    • +
  • (52,41,52,41)
    • +
  • (45,50,45,50)
    • + + +
  • + WULA_Wall_Flag_Building + Wula_PIA_Legion_Faction + +
  • (34,15,34,15)
    • +
  • (39,15,39,15)
    • + + +
  • + Wula_Base_Laser_Turret + Wula_PIA_Legion_Faction + +
  • (18,21,18,21)
    • +
  • (19,47,19,47)
    • +
  • (50,18,50,18)
    • +
  • (50,49,50,49)
    • + + +
  • + Corpse_Wula_AI_Heavy_Panzer + 2 + (42,0,30) +
    • +
  • + WULA_Holographic_Flag_Building + Wula_PIA_Legion_Faction + +
  • (24,17,24,17)
    • +
  • (45,17,45,17)
    • +
  • (25,43,25,43)
    • +
  • (52,45,52,45)
    • + + +
  • + WulaDoor + Wula_PIA_Legion_Faction + (40,0,20) +
    • +
  • + Stool + WULA_Alloy + Wula_PIA_Legion_Faction + (31,0,34) +
    • +
  • + WULA_Cube_Productor + Wula_PIA_Legion_Faction + (31,0,35) +
    • +
  • + WULA_Charging_Station_Synth + Wula_PIA_Legion_Faction + +
  • (43,24,43,24)
    • +
  • (45,24,45,24)
    • +
  • (47,24,47,24)
    • + + +
  • + WULA_Machine_Recharger + Wula_PIA_Legion_Faction + +
  • (25,27,25,27)
    • +
  • (25,32,25,32)
    • + + +
  • + AncientTank + PlayerColony + (56,0,22) +
    • +
  • + AncientPipes + PlayerColony + +
  • (10,38,13,38)
    • +
  • (10,39,11,41)
    • +
  • (13,39,13,39)
    • +
  • (18,37,18,37)
    • + + +     + +
  • + default + + +
    • +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index 5b09e0d0..9cbfceaf 100644 --- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -466,6 +466,7 @@ WulaSpecies Wula_PIA_Legion_Faction + true
  • @@ -531,6 +532,7 @@ WulaSpecies Wula_PIA_Legion_Faction + true
  • @@ -637,6 +639,7 @@ WulaSpecies Wula_PIA_Legion_Faction + true
  • @@ -703,4 +706,73 @@
  • WULA_Trait_Broken_Personality
    • + + + + Wula_PIA_Legion_Escort_Traitor + + WulaSpecies + Wula_PIA_Legion_Faction + +
  • + + Wula/Item/WULA_Species_Icon + SRA/Pawn/Mechanoid/AllegianceOverlays/None + CutoutWithOverlay + Graphic_Multi + 1 + + (0.2, 0.3, 0.2) + + +
    • +     + + true + 1 + true + + 18 + 20 + 500 + 99~99 + 99~99 + Legendary + Legendary + Legendary + true + true + true + Plasteel + +
  • Wula_Legion_Apparel
    • +     + +
  • WULA_MW_Twohanded_ChainBroadsword
    • +     + +
  • WULA_Heavy_Infantry_Helmet_Nomask
    • +
  • WULA_Champion_Warrior_Armor
    • +     + 999999~999999 + 1 + 1 + 1 + 999999~999999 + 999999~999999 + +
  • DeathAcidifier
    • +     + +
  • Advanced
    • +
  • ImplantEmpireCommon
    • +     + + +
  • WULA_Child_Backstory03
    • +     + +
  • WULA_Adult_Backstory_Legion_Escort
    • +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml new file mode 100644 index 00000000..1025eaa6 --- /dev/null +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Kill_PIA_Legion_Escort_Traitor.xml @@ -0,0 +1,71 @@ + + + + WULA_GiveQuest_Kill_PIA_Legion_Escort_Traitor + GiveQuest + + +
  • Map_PlayerHome
    • +     + WULA_Kill_PIA_Legion_Escort_Traitor + IncidentWorker_GiveQuest + 0 + True +     + + WULA_Kill_PIA_Legion_Escort_Traitor + 0 + true + false + 4 + true + false + + + +
  • questName->WULA_Base_Tex_Quest_questName
    • +     +     + + +
  • QuestHospitalityCommon
    • +     + +
  • questDescription->WULA_Intro_Spy_questDescription
    • +     +     + + + +
  • + +
  • + Wula_PIA_Legion_Escort_Traitor_Map + 1 +
    • + + 5 + 10 + Things/Building/Natural/Hive/HiveC + Things/Building/Natural/Hive/HiveC + LostOutpost + + + 5 + 10 + + + + +
  • + Traitor.FinallyHostile + + + Success + true + +
    • +     +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml index 2bf4c041..c33da3f4 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml @@ -289,7 +289,7 @@ WULA_MW_Twohanded_ChainBroadsword - 一把需要双手才能拿起的巨型链锯刀，这种恐怖的近战武器一击就可以造成大量伤口，甚至将对手劈成两段。它的刀头装备了一台微型相位引擎，可以挥出斩裂空间的一刀，然后瞬间移动到目标面前。 + 一把需要双手才能拿起的巨型链锯刀，这种恐怖的近战武器一击就可以造成大量伤口，甚至将对手劈成两段。它的刀头装备了一台微型相位引擎，可以挥出斩裂空间的一刀，然后瞬间移动到目标面前，或是让对手移动到持刀者面前。 Wula/Weapon/WULA_MW_Twohanded_ChainBroadsword/WULA_MW_Twohanded_ChainBroadsword CutoutComplex @@ -404,7 +404,7 @@ WULA_MW_Twohanded_ChainBroadsword_Second_Ability - 使用CBs-25"地狱牙"刀头的相位引擎将目标拉近到施法者身边——这种折跃引擎只能折跃小型目标，如果持刀者体型大于3则无法发起传送。 + 使用CBs-25"地狱牙"刀头的相位引擎将目标拉近到施法者身边——这种折跃引擎只能折跃小型目标，如果目标体型大于3则无法拉近。 Wula/UI/Abilities/WULA_PullTarget True False diff --git a/Source/WulaFallenEmpire/HarmonyPatches/Faction_ShouldHaveLeader_Patch.cs b/Source/WulaFallenEmpire/HarmonyPatches/Faction_ShouldHaveLeader_Patch.cs new file mode 100644 index 00000000..441308f8 --- /dev/null +++ b/Source/WulaFallenEmpire/HarmonyPatches/Faction_ShouldHaveLeader_Patch.cs @@ -0,0 +1,25 @@ +using HarmonyLib; +using RimWorld; +using Verse; + +namespace WulaFallenEmpire +{ + /// + /// 为Wula_PIA_Legion_Faction派系排除领袖检查错误 + /// 通过修改ShouldHaveLeader属性实现 + /// + [HarmonyPatch(typeof(Faction), "get_ShouldHaveLeader")] + public static class Faction_ShouldHaveLeader_Patch + { + [HarmonyPostfix] + public static void Postfix(Faction __instance, ref bool __result) + { + // 对于Wula_PIA_Legion_Faction派系，强制返回false + // 这样原代码中的检查 if (ShouldHaveLeader && leader == null) 就不会触发 + if (__instance.def?.defName == "Wula_PIA_Legion_Faction") + { + __result = false; + } + } + } +} diff --git a/Source/WulaFallenEmpire/ThingComp/WULA_AreaTeleporter/Patch_Pawn_JobTracker_StartJob.cs b/Source/WulaFallenEmpire/HarmonyPatches/Patch_Pawn_JobTracker_StartJob.cs similarity index 100% rename from Source/WulaFallenEmpire/ThingComp/WULA_AreaTeleporter/Patch_Pawn_JobTracker_StartJob.cs rename to Source/WulaFallenEmpire/HarmonyPatches/Patch_Pawn_JobTracker_StartJob.cs diff --git a/Source/WulaFallenEmpire/ThingComp/WULA_DamageTransaction/Patch_Pawn_PreApplyDamage.cs b/Source/WulaFallenEmpire/HarmonyPatches/Patch_Pawn_PreApplyDamage.cs similarity index 100% rename from Source/WulaFallenEmpire/ThingComp/WULA_DamageTransaction/Patch_Pawn_PreApplyDamage.cs rename to Source/WulaFallenEmpire/HarmonyPatches/Patch_Pawn_PreApplyDamage.cs diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index c1494cb9..0c1dfd35 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -180,6 +180,7 @@ + @@ -275,7 +276,7 @@ - + @@ -283,7 +284,7 @@ - +