diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index f121f1c5..2a88db68 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 10c8b389..5531a657 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 @@ -45,6 +45,24 @@ +
  • + + true + (255,255,255,255) + (157,201,185,195) + (255,255,255,255) + (255,255,255,255) + +
  • + +
  • + WULA_GiveQuest_Colony_Promotion_UI_1 +
    • +
  • + +
    • + +
  • true @@ -376,7 +394,7 @@ Combat 100 - 1 + 1
    • diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index 4ca123b7..b2f36304 100644 --- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -11,7 +11,7 @@ SRA/Pawn/Mechanoid/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 (0.2, 0.3, 0.2) @@ -54,7 +54,7 @@ Wula/Things/WULA_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 @@ -67,7 +67,7 @@ Wula/Things/WULA_Attack_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 @@ -94,7 +94,7 @@ Wula/Things/WULA_Constructor_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 @@ -111,7 +111,7 @@ Wula/Things/WULA_Assault_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 @@ -314,6 +314,63 @@ + + Wula_PIA_Light_Unit + + WulaSpecies + +
  • + + Wula/Item/WULA_Species_Icon + SRA/Pawn/Mechanoid/AllegianceOverlays/None + CutoutWithOverlay + Graphic_Multi + 1 + + (0.2, 0.3, 0.2) + + +
    • +     + 18 + 20 + 250 + 10~20 + 10~20 + Poor + Poor + Poor + true + +
  • Wula_Armor_Light
    • +     + +
  • Wula_Melee_Weapon_T1
    • +
  • Wula_Ranged_Weapon_T1
    • +     + +
  • WULA_Assault_Troop_PowerArmor
    • +
  • WULA_Assault_Troop_Helmet
    • +     + 3000~8000 + 1 + 1 + 1 + 999999~999999 + 999999~999999 + +
  • WULA_AutoJumpdrive
    • +
  • DeathAcidifier
    • +     + + +
  • + +
  • Wula_Backstory_Categories
    • + + +     +     Wula_PIA_Heavy_Unit @@ -325,7 +382,7 @@ SRA/Pawn/Mechanoid/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 (0.2, 0.3, 0.2) @@ -385,7 +442,7 @@ SRA/Pawn/Mechanoid/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 (0.2, 0.3, 0.2) @@ -404,17 +461,13 @@
  • Wula_Legion_Apparel
    •  - -
  • Wula_Melee_Weapon_T2
    • -     - 3000~8000 0 0 99999~99999     Wula_PIA_Legion_Escort_Unit - + WulaSpecies
  • @@ -423,7 +476,7 @@ SRA/Pawn/Mechanoid/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 1.1 + 1 (0.2, 0.3, 0.2) @@ -440,14 +493,16 @@ Poor true -
  • Wula_Armor_Super_Heavy
    • +
  • Wula_Armor_Light
    • +
  • Wula_Armor_Shield
    • +
  • WULA_Manpack_Loitering_Munition
  • Wula_Melee_Weapon_T2
    •  -
  • WULA_Heavy_Infantry_PowerArmor
    • -
  • WULA_Heavy_Infantry_Helmet
    • +
  • WULA_Assault_Troop_PowerArmor
    • +
  • WULA_Assault_Troop_Helmet
    •  3000~8000 1 diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml index eff06bf3..c758ed6c 100644 --- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Base_Tex_Quest.xml @@ -62,7 +62,7 @@
  • taxInterval - 250 + 600
  • diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml index 53a6976c..a6699714 100644 --- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Colony_Promotion.xml @@ -1,6 +1,52 @@ - + + WULA_GiveQuest_Colony_Promotion_UI_1 + + Wula/Events/Portraits/WULA_Legion_2 + 「军团」,P.I.A + +
  • 晋级审查是一件大事情——你们确定你们已经准备好了吗？\n\n我和你们重申一下流程吧，我会派遣自己的一个分体和护卫队在你们殖民地考察12天，你要照顾我的分体和卫队的起居。如果一切顺利，考察完成之后你们将获得殖民地晋升的机会，舰队会为你们开放更多的许可科技。
    • + + +
  • + + true + (255,255,255,255) + (157,201,185,195) + (255,255,255,255) + (255,255,255,255) + +
  • + +
  • +
  • + WULA_Colony_Promotion +
    • + + + + +
  • + + true + (255,255,255,255) + (157,201,185,195) + (255,255,255,255) + (255,255,255,255) + +
  • + +
  • + Wula_UI_Legion_1 +
    • +
  • + +
    • + + +     + WULA_GiveQuest_Colony_Promotion GiveQuest @@ -36,6 +82,18 @@
  • + +
  • + WULA_Colony_Promotion_Reward + promotionReward +
    • + +
  • + +
  • Wula_PIA_Legion_Faction
    • + + +
  • map.MapRemoved @@ -428,9 +486,16 @@
  • pickupShipThing.SentSatisfied - - Success - true + + +
  • + $promotionReward +
    • +
  • + Success + true +
    • +
  • @@ -454,4 +519,24 @@ + + WULA_Colony_Promotion_Reward + + +
  • + 1 + + + + +
  • Techprint_WULA_Colony_License_LV2_Technology
    • + + + 1 + + + + + + \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml index 56c137b4..54b0b177 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Apperals/WULA_Apparel.xml @@ -564,9 +564,7 @@ -
  • Wula_Armor_Heavy
    • -
  • RoyalTier5
    • -
  • Royal
    • +
  • Wula_Armor_Light
    •  Wula/Apparel/WULA_Assault_Troop_PowerArmor     @@ -621,9 +619,7 @@ -
  • Wula_Armor_Heavy
    • -
  • RoyalTier5
    • -
  • Royal
    • +
  • Wula_Armor_Light
    •  Wula/Apparel/WULA_Assault_Troop_Helmet     @@ -804,7 +800,7 @@ -
  • Wula_Armor_Super_Heavy
    • +
  • Wula_Armor_Shield
    •
  • Torso
    • 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 bab1412f..ad48e01a 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 @@ -512,7 +512,7 @@ 2 -
  • Wula_Weapon_Init
    • +
  • Wula_Ranged_Weapon_T1
  • Wula_Assault_Cat_Weapon
    •  @@ -547,6 +547,7 @@ False Misc11 false + true 12800 Verb_CastAbility @@ -964,7 +965,7 @@ 2 -
  • Wula_Ranged_Weapon_T2
    • +
  • Wula_Ranged_Weapon_T1
    •
  • @@ -1746,6 +1747,9 @@
  • ApparelUtility
    • + +
  • WULA_Manpack_Loitering_Munition
    • +     false 4 false diff --git a/1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml b/1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml index 1909e0d2..16ec116b 100644 --- a/1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml +++ b/1.6/1.6/Defs/ThinkTreeDefs/WULA_ThinkTrees.xml @@ -378,6 +378,22 @@ Humanlike_PreMain + + +
  • + WULA_Legion_PawnKind + +
  • + Misc + +
  • + 15.0 +
    • + + + + +
  • @@ -402,22 +418,6 @@
  • Humanlike_PostMain
    • - - - -
  • - WULA_Legion_PawnKind - -
  • - Misc - -
  • - 4.0 -
    • - - - -
  • diff --git a/Source/WulaFallenEmpire/EventSystem/Effect/EffectBase.cs b/Source/WulaFallenEmpire/EventSystem/Effect/EffectBase.cs index 02288374..7259cf66 100644 --- a/Source/WulaFallenEmpire/EventSystem/Effect/EffectBase.cs +++ b/Source/WulaFallenEmpire/EventSystem/Effect/EffectBase.cs @@ -449,7 +449,6 @@ namespace WulaFallenEmpire public class Effect_AddQuest : EffectBase { public QuestScriptDef quest; - public override void Execute(Window dialog = null) { if (quest == null) @@ -457,11 +456,23 @@ namespace WulaFallenEmpire Log.Error("[WulaFallenEmpire] Effect_AddQuest has a null quest Def."); return; } + // ʹñ׼ɷǴraw quest + Quest newQuest = QuestUtility.GenerateQuestAndMakeAvailable(quest, 0); - Quest newQuest = Quest.MakeRaw(); - newQuest.root = quest; - newQuest.id = Find.UniqueIDsManager.GetNextQuestID(); - Find.QuestManager.Add(newQuest); + if (newQuest != null) + { + Log.Message($"[WulaFallenEmpire] Successfully added quest: {quest.defName}"); + + // Զܵ񣬷Ϳż + if (!newQuest.root.autoAccept) + { + QuestUtility.SendLetterQuestAvailable(newQuest); + } + } + else + { + Log.Error($"[WulaFallenEmpire] Failed to generate quest: {quest.defName}"); + } } }