diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 2ee7f0f3..95a68173 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 3afa2c7c..2f432691 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 @@ -78,28 +78,6 @@ -
  • - - - false - false - -
  • - -
  • - Wula_UI_Legion_50 -
    • -
  • - -
    • - -
  • true @@ -142,6 +120,33 @@
    • +
  • + + + +
  • + Wula_Reinforcement_From_PIA_Level + 3 +
    • + + true + +
  • + +
  • + Wula_UI_Legion_50 +
    • +
  • + +
    • +     +
  • false @@ -1078,9 +1083,9 @@ Wula/Events/Portraits/WULA_Legion_1 「军团」,P.I.A -
  • 要找活吗？
    • +
  • 要找活吗？好吧，我手上有一些活，怎么说呢，不太好走乌拉帝国的标准审查流程，我的断爪卫队也不适合去做这些事情，确实需要有人帮我处理。\n\n你们挑个感兴趣的吧，我会把任务的需求发给你们。
    • - +
  • +
  • + WULA_Boss_Sky_Lock_Has_Start + 0 + Int +
    • +
  • + WULA_Vacation_Quest_Has_Start + 0 + Int +
  • - - + + true + +
  • + WULA_Boss_Sky_Lock_Has_Start + 1 +
    • +
  • +
  • + WULA_Boss_Sky_Lock_UI_1 +
  • - - - -
  • - -
  • - + + true + +
  • + WULA_Vacation_Quest_Has_Start + 1
    • - - -
  • - - +
  • +
  • + WULA_Vacation_Quest_UI_1 +
    • diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index f25ca5ce..834ee237 100644 --- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -716,6 +716,43 @@
  • DeathAcidifier
    • + + WULA_Legion_Swimsuit_PawnKind + + 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 + 0 + true + 18 + 20 + true + 10~20 + 10~20 + Wula_PIA_Legion_Faction + false + +
  • WULA_Swimsuit
    • +     + 0 + 0 + 99999~99999 +     Wula_PIA_Legion_Escort_Unit diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Attack_Robber_Camp.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Attack_Robber_Camp.xml index 86f7f745..5fa59234 100644 --- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Attack_Robber_Camp.xml +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Attack_Robber_Camp.xml @@ -4,6 +4,7 @@ WULA_Attack_Robber_Camp 0 1 + false true true diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Sky_Lock.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Sky_Lock.xml index 75846ff0..bb44b2fb 100644 --- a/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Sky_Lock.xml +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Boss_Sky_Lock.xml @@ -1,11 +1,61 @@  + + WULA_Boss_Sky_Lock_UI_1 + + Wula/Events/Portraits/WULA_Legion_4 + 「军团」,P.I.A + +
  • 啊，这个啊。最近有一台灵能泰坦在我们的运输舰上失控了，杀了一船人，现在还在船上肆虐。这个事情原本是应该由国教教会过来回收，但是目前我还不想让她们知道这个事情——只能交给你们了。我可以控其他战舰撞击运输舰，把它推向你们殖民地附近，灵能泰坦大概率不会在这样的坠毁中受到什么伤害，你们得亲自派遣殖民者解决它。\n\n事成之后，我会用它的灵能回路帮你们搞一台专属于殖民地的灵能泰坦，你们就当这个机械体一开始就是配给给你们的，如何？
    • +     + +
  • + + 殖民地的表现让P.I.A相当不满意，这种特殊任务不会交给殖民地负责 + false + +
  • + Wula_Goodwill_To_PIA + -75 +
    • + + +
  • + +
  • + WULA_Boss_Sky_Lock_Has_Start + 1 + Add +
    • +
  • + WULA_Boss_Sky_Lock +
    • +
  • + +
    • +     + +
  • + + false + +
  • + +
  • + Wula_UI_Legion_50 +
    • +
  • + +
    • + + +     +     WULA_Boss_Sky_Lock 0 - 1 true - true + false 4 true @@ -48,7 +98,7 @@ Things/Building/Natural/Hive/HiveC Things/Building/Natural/Hive/HiveC site - AncientsHostile + AncientsHostile true 5 @@ -57,17 +107,45 @@ +
  • + + NegativeEvent + 在一艘巡洋舰向失控运输舰狠狠撞击后，碎裂的运输舰如流星般坠入边缘世界地表。不过灵能泰坦随后便在地表上被目击——地点已经标记出来了。 +
    • +
  • PsiTitan.0.Destroyed - - Success - true + + +
  • + + PositiveEvent + 灵能泰坦在殖民者的攻击下已经停止运转，其灵能回路核心已经暴露并掉落。\n\n记得回收灵能回路核心，这是建造新的灵能泰坦所需的材料。 +
    • +
  • + Wula_PIA_Legion_Faction + 25 + WULA_Killed_Psititan +
    • +
  • + PsiTitan.0.Destroyed + WULA_Boss_Sky_Lock_UI_2 +
    • +
  • + Success + true +
    • +     + + WULA_Killed_Psititan + + Wula_PsiTitan_Boss_Map @@ -89,6 +167,11 @@ AncientsHostile DefendBase MapGeneration + +
  • + WULA_Psi_Titan_Core +
    • +     @@ -332,7 +415,6 @@
  • WULA_Sky_Lock - PlayerColony
  • (11,11,11,11)
  • (116,7,116,7)
    • @@ -342,7 +424,6 @@
  • AncientTunnelerHusk - PlayerColony
  • (38,49,38,49)
  • (70,44,70,44)
    • @@ -351,7 +432,6 @@
  • AncientTank - PlayerColony
  • (27,24,27,24)
  • (26,83,26,83)
    • @@ -360,7 +440,6 @@
  • AncientMiniWarwalkerRemains - PlayerColony
  • (84,28,84,28)
  • (94,52,94,52)
    • @@ -368,7 +447,6 @@
  • ShipChunk - PlayerColony
  • (56,24,56,24)
  • (57,27,57,27)
    • @@ -384,7 +462,6 @@
  • AncientAPC - PlayerColony
  • (92,67,92,67)
  • (105,57,105,57)
    • @@ -392,4 +469,29 @@     + + WULA_Boss_Sky_Lock_UI_2 + + Wula/Events/Portraits/WULA_Legion_1 + 「军团」,P.I.A + +
  • 完成的不错，记得把灵能回路核心带回来，这个东西是建造灵能泰坦必须的材料，不带回来的话你们这次就算白打工了。
    • +     + +
  • + + false + +
  • + +
  • + WULA_Psi_Titan_Technology +
    • +
  • + +
    • + + +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/QuestScriptDefs/WULA_Vacation_Quest.xml b/1.6/1.6/Defs/QuestScriptDefs/WULA_Vacation_Quest.xml new file mode 100644 index 00000000..1c892f95 --- /dev/null +++ b/1.6/1.6/Defs/QuestScriptDefs/WULA_Vacation_Quest.xml @@ -0,0 +1,307 @@ + + + + WULA_Vacation_Quest_UI_1 + + Wula/Events/Portraits/WULA_Legion_1 + 「军团」,P.I.A + +
  • 哎，感觉老是在舰队上有点烦闷，想下地走走。你们殖民地附近有海吗？我想去放个假。
    • +     + +
  • + + 好感度不足，你至少要成为行星封锁机关的盟友才能接下此任务 + false + +
  • + Wula_Goodwill_To_PIA + 75 +
    • + + +
  • + +
  • + WULA_Vacation_Quest_Has_Start + 1 + Add +
    • +
  • + WULA_Vacation_Quest +
    • +
  • + +
    • +     + +
  • + + false + +
  • + +
  • + Wula_UI_Legion_50 +
    • +
  • + +
    • + + +     +     + + WULA_Vacation_Quest + 0 + true + false + 1 + true + false + + + +
  • questName->WULA_Vacation_Quest_questName
    • +     +     + + +
  • QuestHospitalityCommon
    • +     + +
  • questDescription->WULA_Vacation_Quest_questDescription
    • +     +     + + + + +
  • + +
  • + +
  • Wula_PIA_Legion_Faction
    • + + + + +
  • + WULA_Legion_Swimsuit_PawnKind + Wula_PIA_Legion_Faction + + true + WULA_Child_Backstory01 + WULA_Adult_Backstory_Legion + + asker +
    • + + +
  • + faction + $asker + false + true + true +
    • + +
  • + faction.BecameHostileToPlayer + + [faction_name]开始敌视你。 +
    • +
  • + faction.BecameHostileToPlayer + Fail +
    • +
  • + faction.BecameHostileToPlayer + InvalidPreAcceptance + NotYetAcceptedOnly +
    • + + + +
  • + lodgers + $asker +
    • + + +
  • + $asker +
    • + + +
  • + $lodgers + Wula_PIA_Legion_Faction + HomeFaction + +
  • lodgers.RanWild
    • +
  • lodgers.BecameMutant
    • + + + + +
  • + $lodgers +
    • + + +
  • + $asker +
    • + + +
  • + $lodgers + false + lodgers.RanWild +
    • + + +
  • + + +
  • + $lodgers + true + false +
    • + +
  • + + +
  • + Util_TransportShip_DropOff + + $lodgers + Wula_PIA_Legion_Faction + +
    • + +
  • + goodwillChangeOnShuttleDestroyed + -50 +
    • + +
  • + pawnsLabelDef + [asker_nameDef] +
    • + +
  • + dropoffShipThing.Destroyed + + +
  • + + NegativeEvent + 被派遣来运输[asker_nameDef]的穿梭机已被破坏。 +
    • +
  • + Fail + $goodwillChangeOnShuttleDestroyed + $asker + ShuttleDestroyed +
    • +     + + + + + + + + +
  • + asker.Destroyed + pickupShipThing.SentWithExtraColonists + + +
  • + + NegativeEvent + 需要你护卫的{SUBJECT_definite}已经死亡。[failLetterEndingCommon] + OngoingOrNotYetAccepted +
    • +
  • + Fail + -25 + $asker + QuestPawnLost + OngoingOrNotYetAccepted +
    • + + + + + + + + + +
  • + lodgers.Arrested + + +
  • + + NegativeEvent + 需要你护卫的{SUBJECT_definite}已经被俘虏。[failLetterEndingCommon] +
    • +
  • + Fail + -30 + $asker + QuestPawnArrested +
    • + + + + + +
  • + asker.LeftMap + + +
  • + + NegativeEvent + 需要你护卫的{SUBJECT_definite}失踪在你的殖民地。[failLetterEndingCommon] +
    • +
  • + Fail + -30 + $asker + QuestPawnLost +
    • + + + + + +
  • + asker.RanWild + + +
  • + + NegativeEvent + 需要你护卫的{SUBJECT_definite}在你的殖民地回归自然。[failLetterEndingCommon] +
    • +
  • + Fail + -30 + $asker + QuestPawnLost +
    • + + + + +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml index 93b717bc..477b3cf5 100644 --- a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml +++ b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml @@ -250,7 +250,7 @@ WULA_ArmedShuttle_Technology - 允许殖民地呼叫一艘CVe-3"渡鸦"武装穿梭机，其拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾，可以抵挡大部分射弹。 + 允许殖民地呼叫一艘CVe-3"渡鸦"武装穿梭机，其拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾和MLt-1"棱晶"涡轮激光炮 ，可以抵挡大部分袭击。 3000 9.00 6.20 @@ -461,6 +461,20 @@
  • WULA_Colony_License_LV3_Technology
    •  + + WULA_Psi_Titan_Technology + 11.00 + 5.60 + + 允许殖民地申请空投PAt-6"灵能泰坦"，乌拉帝国的大型灵能战争机械，可以驱使各种强大的灵能能力。\n\n其用于镌刻灵能回路的核心受到国教教会严格限制，无法通过常规手段获得。 + 4000 + 9999 + 0 + 0 + +
  • Wula_PIA_Legion_Faction
    • +     +     WULA_Turret_Base_AT_Technology @@ -500,6 +514,7 @@ 允许殖民地申请空投自动迫击炮台，可以发射远距离的高爆迫击炮弹打击地图上出现的任何敌军。 3000 +
  • WULA_Synth_Weapon_3_Explosive_Technology
  • WULA_Synth_Armor_2_Technology
    •      diff --git a/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml b/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml index 2f1c71eb..98daa034 100644 --- a/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml +++ b/1.6/1.6/Defs/Scenarios/Scenarios_WULA.xml @@ -167,4 +167,110 @@ + + + WULA_ArmedShuttle_Start_Scenario + + 乌拉帝国开发署的舰队已经抵达边缘世界，一名专门负责考察当地生态的调查员和其穿梭机一起被部署到星球表面。 + + 以1位拥有精良装备的机械乌拉和其私人穿梭机开始游戏，但是开局资源较少。 + + PlayerFaction + WULA_Awakened_Synth + + + +
  • + ConfigPage_ConfigureStartingPawns + 1 + 8 +
    • + + +
  • + PlayerPawnsArriveMethod + DropPods + false +
    • + + + + +
  • + DisableIncident + WULA_GiveQuest_Intro_Spy + false +
    • + + +
  • + StartingThing_Defined + Chemfuel + 500 +
    • +
  • + StartingThing_Defined + WULA_RW_Beam_Base_AR + 1 +
    • +
  • + StartingThing_Defined + WULA_RW_Penetrating_Beam_Rifle_Ranged + 1 +
    • +
  • + StartingThing_Defined + WULA_MW_ChainSword + Plasteel + Normal +
    • +
  • + StartingThing_Defined + Apparel_WULA_Manpack_Loitering_Munition + 1 +
    • +
  • + StartingThing_Defined + WULA_Fake_Mothership_Beacon_Building + 1 +
    • +
  • + StartingThing_Defined + WULA_ArmedShuttleWithPocket_Cleanzone_Free + 1 +
    • + + +
  • + StartingResearch + WULA_Colony_License_LV1_Technology +
    • +
  • + StartingResearch + WULA_Structure_Technology +
    • +
  • + StartingResearch + BasicMechtech +
    • + + +
  • + CreateQuest + WULA_Intro_NewColony +
    • + + + +     +     +     \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml index 3a708dd6..e4c7e249 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Drop_Buildings.xml @@ -1954,7 +1954,7 @@
  • BuildingsMisc
    • - Wula/Building/WULA_Dropping_Building_Cleanzone + Wula/Building/WULA_Dropping_Building_Cleanzone_Plus Graphic_Multi (5,5) diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml index 46bec977..de2b2a7f 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml @@ -506,6 +506,7 @@ 50 300 3 + 1 (3,3) 0 @@ -516,7 +517,7 @@
  • WulaFallenEmpire.PlaceWorker_CustomRadius
    •  - + WULA_Buildings
  • Wula_Psi_Titan_Incoming @@ -536,10 +537,10 @@ Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming Graphic_Single CutoutFlying - (9,9) + (13,13) - Accelerate + Decelerate Things/Skyfaller/SkyfallerShadowDropPod (6, 6) DropPod_Fall @@ -555,9 +556,9 @@ - 15 +
  • @@ -565,8 +566,8 @@
  • Wula_Psi_Titan - AncientsHostile - false + PlayerColony + true false
    • diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml index dd7994b7..04ae65f4 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Misc_Buildings.xml @@ -825,7 +825,7 @@ true (0.56, 0.62, 0.9) - Wula/Building/WULA_Fake_Fighter_Drone_Building + Wula/Weapon/WULA_Weapon_Empty Graphic_Single TransparentPostLight (3,3) diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Shuttle_Building.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Shuttle_Building.xml index bfcd2a51..ce337829 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Shuttle_Building.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Shuttle_Building.xml @@ -1,9 +1,69 @@ + + WULA_ArmedShuttleWithPocket_Cleanzone_Free + + 清理出一块场地并准备好资源，使得乌拉帝国母舰可以向此处派遣一艘穿梭机。\n\nCVe-3"渡鸦"是乌拉帝国用于在舰队和地表构建联系的特种穿梭机，拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾和MLt-1"棱晶"涡轮激光炮 ，可以抵挡大部分袭击。 + Wula/Building/WULA_ArmedShuttle_Moving + Normal + MinifiedThing + + Wula/Building/WULA_Dropping_Building_Cleanzone_Plus + Graphic_Multi + (9,13) + + false + + + +
  • BuildingsMisc
    • +     + false + false + false + false + false + false + BuildingOnTop + PassThroughOnly + 0 + false + false + + 0 + false + Light + + 1 + 0 + 1 + 0 + + (9,13) + 0 + 0 + + + BuildingDestroyed_Metal_Small + false + false + + +
  • + WULA_ArmedShuttleWithPocket_SP_Prefab + true + WULA_ArmedShuttleWithPocket_Incoming + true + 1 + true + false +
    • +     +     WULA_ArmedShuttleWithPocket_Cleanzone - 清理出一块场地并准备好资源，使得乌拉帝国母舰可以向此处派遣一艘穿梭机。\n\nCVe-3"渡鸦"是乌拉帝国用于在舰队和地表构建联系的特种穿梭机，拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾，可以抵挡大部分射弹。 + 清理出一块场地并准备好资源，使得乌拉帝国母舰可以向此处派遣一艘穿梭机。\n\nCVe-3"渡鸦"是乌拉帝国用于在舰队和地表构建联系的特种穿梭机，拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾和MLt-1"棱晶"涡轮激光炮 ，可以抵挡大部分袭击。 Wula/Building/WULA_ArmedShuttle_Moving Normal MinifiedThing @@ -42,7 +102,7 @@ (9,13) 0 - 1 + 0
  • WULA_ArmedShuttle_Technology
    • @@ -62,7 +122,7 @@
  • WULA_ArmedShuttleWithPocket_SP_Prefab - true + false WULA_ArmedShuttleWithPocket_Incoming true 1 @@ -120,7 +180,7 @@ WULA_ArmedShuttleWithPocket - 乌拉帝国用于在舰队和地表构建联系的特种穿梭机，拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾，可以抵挡大部分射弹。 + 乌拉帝国用于在舰队和地表构建联系的特种穿梭机，拥有巨大的货仓和一个内部折叠的生活区，因此载重量惊人且可以在内部活动。它同时还拥有一面高反射概率的反射盾和MLt-1"棱晶"涡轮激光炮 ，可以抵挡大部分袭击。 WulaFallenEmpire.Building_ArmedShuttleWithPocket true Building @@ -176,10 +236,18 @@
  • ShuttleEngine
  • ShuttleEngine
    • - WULA_Shuttle_Autocannon - 5.5 - 1.75 - (0, 0.05) + + 1000 + + true + Wula_Base_Laser_Turret_Weapon + 0.01 + (0, 0) + 3
  • ITab_ContentsTransporter
    • @@ -232,7 +300,7 @@
  • 15 - 300 + 30 2400 30 @@ -251,7 +319,7 @@ true - 0.85 + 0.75 30 0 Interceptor_BlockedProjectile @@ -260,7 +328,7 @@ 15 30 Flame - 8 + 1 false false false @@ -272,6 +340,11 @@ CVe-3"渡鸦"可以启动防御设施，蒸发胆敢进入反射立场内的敌军——这同时会使得它伤害附近所有的散落物品。 Wula/UI/Commands/Wula_Psi_Titan_AreaDamage
    • +
  • + CompPowerPlant + -2000 + true +
  • @@ -454,8 +527,7 @@ Graphic_Multi Wula/Building/WULA_ArmedShuttle_Moving CutoutComplex - (6,6.25) - (0, 8, 1.6) + (14,14) False diff --git a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml index b1b945e2..81ad320e 100644 --- a/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Turret_Buildings.xml @@ -416,7 +416,7 @@ Light 500 - 0 + 1 20 0 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 4c56190f..303a3a82 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 @@ -91,6 +91,9 @@
  • FullHead
    • + +
  • Overhead
    • +     false false false @@ -538,6 +541,44 @@ 1     + + WULA_Swimsuit + + 为乌拉帝国合成人特制的泳衣，适配了其球形关节防止滑落。\n\n可能有些人会和你说这是乌拉族最强大的防具，别信。 + + Wula/Apparel/WULA_Swimsuit + + + +
  • WULA_Swimsuit
    • +     + +
  • Torso
    • +
  • Neck
    • +
  • Shoulders
    • +
  • Arms
    • +
  • Legs
    • +     + +
  • OnSkin
    • +
  • Middle
    • +     + Wula/Apparel/WULA_Swimsuit + false + false + false +     + + + 10 + + + 100 + 1000 + 1 + 0.2 + +     WULA_Assault_Troop_PowerArmor diff --git a/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml b/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml index 6d86dbea..f6ac2df6 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/WULA_Flyover_Item.xml @@ -410,7 +410,7 @@ Wula/FlyoverThing/WULA_BattleShip_Shadow Graphic_Single TransparentPostLight - (70,100) + (90,100) (195,195,195,45)     diff --git a/1.6/1.6/Defs/ThingDefs_Misc/WULA_Item.xml b/1.6/1.6/Defs/ThingDefs_Misc/WULA_Item.xml index aa55541a..36e5ef42 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/WULA_Item.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/WULA_Item.xml @@ -15,7 +15,7 @@ false false - 2.5 + 5 0.3 1 0.55 @@ -73,7 +73,7 @@ false false - 1000 + 400 0.01 50 @@ -116,7 +116,7 @@ false false - 1 + 50 1 3 3 @@ -182,7 +182,7 @@ 0 0 0.01 - 24 + 50 0.3 450 @@ -242,7 +242,7 @@ 30 0.01 - 24 + 40 0.3 450 @@ -298,4 +298,28 @@ false false + + WULA_Psi_Titan_Core + + PAt-6"灵能泰坦"的灵能回路核心，每一台灵能泰坦都需要这个核心完成灵能回路的镌刻。它严格受到乌拉帝国国教教会的管制，殖民地无法轻易弄到。 + + Wula/Item/WULA_Psi_Titan_Core + Graphic_Single + + None + false + Metal_Drop + Metal_Drop + false + false + + 1 + 0.01 + + +
  • ResourcesRaw
    • +     + false + false +     diff --git a/1.6/1.6/Languages/ChineseSimplified (简体中文)/DefInjected/QuestScriptDef/WULA_Vacation_Quest.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/DefInjected/QuestScriptDef/WULA_Vacation_Quest.xml new file mode 100644 index 00000000..08545739 --- /dev/null +++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/DefInjected/QuestScriptDef/WULA_Vacation_Quest.xml @@ -0,0 +1,9 @@ + + + +
  • questName->特殊任务：度假
    • +     + +
  • questDescription->行星封锁机关的总控AI在舰队上待得太闷了，想出来溜达一段时间。\n\n除非与乌拉帝国行星封锁机关敌对，否则看起来你的上司是要一直赖在殖民地了，你可以删除此任务，以免其占据任务列表。
    • +     +     \ No newline at end of file diff --git a/Content/Textures/Wula/Apparel/WULA_Maid_Uniform_Headband_Thin_east.png b/Content/Textures/Wula/Apparel/WULA_Maid_Uniform_Headband_Thin_east.png index 7382eb25..0d418f1c 100644 Binary files a/Content/Textures/Wula/Apparel/WULA_Maid_Uniform_Headband_Thin_east.png and b/Content/Textures/Wula/Apparel/WULA_Maid_Uniform_Headband_Thin_east.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Swimsuit.png b/Content/Textures/Wula/Apparel/WULA_Swimsuit.png new file mode 100644 index 00000000..160ee935 Binary files /dev/null and b/Content/Textures/Wula/Apparel/WULA_Swimsuit.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_east.png b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_east.png new file mode 100644 index 00000000..41fe07c4 Binary files /dev/null and b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_east.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_north.png b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_north.png new file mode 100644 index 00000000..be11eedc Binary files /dev/null and b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_north.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_south.png b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_south.png new file mode 100644 index 00000000..a1ef59ca Binary files /dev/null and b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_south.png differ diff --git a/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_west.png b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_west.png new file mode 100644 index 00000000..94b7fbfd Binary files /dev/null and b/Content/Textures/Wula/Apparel/WULA_Swimsuit_Thin_west.png differ diff --git a/Content/Textures/Wula/Building/WULA_ArmedShuttle.png b/Content/Textures/Wula/Building/WULA_ArmedShuttle.png index a0a52c4f..20a26aff 100644 Binary files a/Content/Textures/Wula/Building/WULA_ArmedShuttle.png and b/Content/Textures/Wula/Building/WULA_ArmedShuttle.png differ diff --git a/Content/Textures/Wula/Building/WULA_ArmedShuttle_Moving.png b/Content/Textures/Wula/Building/WULA_ArmedShuttle_Moving.png index 87f1e1ee..f9524e72 100644 Binary files a/Content/Textures/Wula/Building/WULA_ArmedShuttle_Moving.png and b/Content/Textures/Wula/Building/WULA_ArmedShuttle_Moving.png differ diff --git a/Content/Textures/Wula/Building/WULA_Surveillance_Building.png b/Content/Textures/Wula/Building/WULA_Surveillance_Building.png index 2fdaad1b..acee601f 100644 Binary files a/Content/Textures/Wula/Building/WULA_Surveillance_Building.png and b/Content/Textures/Wula/Building/WULA_Surveillance_Building.png differ diff --git a/Content/Textures/Wula/Item/WULA_Psi_Titan_Core.png b/Content/Textures/Wula/Item/WULA_Psi_Titan_Core.png new file mode 100644 index 00000000..3216b31d Binary files /dev/null and b/Content/Textures/Wula/Item/WULA_Psi_Titan_Core.png differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png b/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png deleted file mode 100644 index daa82dff..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png b/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png deleted file mode 100644 index a1a4ad45..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png b/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png deleted file mode 100644 index c4598303..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png b/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png b/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png b/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/Wula_Armour_Icon.png b/Content/Textures/Wula/Things/Wula_Armour/Wula_Armour_Icon.png deleted file mode 100644 index c8ff3d8e..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/Wula_Armour_Icon.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png b/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png deleted file mode 100644 index aa13ab62..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png b/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png deleted file mode 100644 index 6d4e5767..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png b/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png deleted file mode 100644 index 55e87537..00000000 Binary files a/Content/Textures/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.png b/Content/Textures/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.png index 02b703eb..a51f1d01 100644 Binary files a/Content/Textures/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.png and b/Content/Textures/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.png differ diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompBuildingSpawner.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompBuildingSpawner.cs index 480ed182..8f4054e7 100644 --- a/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompBuildingSpawner.cs +++ b/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompBuildingSpawner.cs @@ -40,7 +40,27 @@ namespace WulaFallenEmpire // 自动呼叫条件 private bool ShouldAutoCall => IsNonPlayerFaction && Props.canAutoCall && !autoCallScheduled && !used; - // 科技检查 + // 新增：检测是否在口袋地图中 + public bool IsInPocketMap + { + get + { + if (parent?.Map == null) + return false; + + // 检查地图的Parent是否为PocketMapParent + if (parent.Map.Parent is PocketMapParent) + return true; + + // 额外的检查：通过地图的标签或特殊属性 + if (parent.Map.uniqueID.ToString().Contains("PocketMap")) + return true; + + return false; + } + } + + // 修改后的科技检查 - 在口袋地图中跳过检查 public bool HasRequiredResearch { get @@ -48,6 +68,10 @@ namespace WulaFallenEmpire if (Props.requiredResearch == null) return true; + // 如果在口袋地图中且配置为跳过检查 + if (IsInPocketMap && Props.skipResearchCheckInPocketMap) + return true; + if (IsNonPlayerFaction) return true; // 非玩家派系不需要科技 @@ -55,11 +79,15 @@ namespace WulaFallenEmpire } } - // FlyOver 检查 + // 修改后的FlyOver检查 - 在口袋地图中跳过检查 public bool HasRequiredFlyOver { get { + // 如果在口袋地图中且配置为跳过检查 + if (IsInPocketMap && Props.skipFlyOverCheckInPocketMap) + return true; + if (!Props.requireFlyOver) return true; @@ -107,11 +135,15 @@ namespace WulaFallenEmpire } } - // 屋顶检查 + // 修改后的屋顶检查 - 在口袋地图中跳过检查 public bool CheckRoofConditions { get { + // 如果在口袋地图中且配置为跳过检查 + if (IsInPocketMap && Props.skipRoofCheckInPocketMap) + return true; + if (parent?.Map == null) return true; @@ -279,7 +311,7 @@ namespace WulaFallenEmpire } } - // 显示禁用原因 + // 显示禁用原因 - 修改为支持口袋地图 private void ShowDisabledReason() { if (!HasRequiredResearch) @@ -371,32 +403,90 @@ namespace WulaFallenEmpire calling = false; callTick = -1; } - + // 检查位置是否可用 private bool CanSpawnAtPosition(IntVec3 spawnPos) { if (parent?.Map == null) + { + Log.Warning($"[BuildingSpawner] Parent map is null for {parent?.LabelShort}"); return false; - + } + // 检查是否在地图范围内 if (!spawnPos.InBounds(parent.Map)) - return false; - - // 检查是否有阻挡物 - if (!Props.canReplaceExisting) { - List thingsAtPos = spawnPos.GetThingList(parent.Map); - foreach (var thing in thingsAtPos) + Log.Warning($"[BuildingSpawner] Spawn position {spawnPos} is out of bounds for {parent?.LabelShort}"); + return false; + } + + // 获取建筑的大小和旋转 + ThingDef buildingDef = Props.buildingToSpawn; + if (buildingDef == null) + { + Log.Error($"[BuildingSpawner] buildingToSpawn is null for {parent?.LabelShort}"); + return false; + } + + Rot4 rotation = Props.buildingRotation; + IntVec2 buildingSize = buildingDef.Size; + + // 计算建筑占用的所有单元格 + CellRect rect = GenAdj.OccupiedRect(spawnPos, rotation, buildingSize); + + // 检查建筑是否完全在地图范围内 + if (!rect.InBounds(parent.Map)) + { + Log.Warning($"[BuildingSpawner] Building rect {rect} for {buildingDef.defName} is out of bounds. Size: {buildingSize}, Position: {spawnPos}"); + return false; + } + + // 如果是口袋地图，检查是否有足够的空间 + if (IsInPocketMap) + { + // 口袋地图可能较小，检查边界 + Map pocketMap = parent.Map; + int safeMargin = 2; // 安全边界 + + if (rect.minX < safeMargin || rect.minZ < safeMargin || + rect.maxX >= pocketMap.Size.x - safeMargin || rect.maxZ >= pocketMap.Size.z - safeMargin) { - // 跳过不可穿透的建筑和植物 - if (thing.def.passability == Traversability.Impassable) - return false; + Log.Warning($"[BuildingSpawner] Building {buildingDef.defName} too close to pocket map edge. Rect: {rect}, Map Size: {pocketMap.Size}"); + return false; } } - + + // 检查每个单元格是否可用 + foreach (IntVec3 cell in rect) + { + if (!cell.InBounds(parent.Map)) + { + Log.Warning($"[BuildingSpawner] Cell {cell} is out of bounds for building {buildingDef.defName}"); + return false; + } + + if (!Props.canReplaceExisting) + { + List thingsAtPos = cell.GetThingList(parent.Map); + foreach (var thing in thingsAtPos) + { + // 跳过不可穿透的建筑和植物 + if (thing.def.passability == Traversability.Impassable) + { + // 跳过自己 + if (thing != parent) + { + Log.Warning($"[BuildingSpawner] Cell {cell} is blocked by {thing.def.defName} ({thing.LabelShort})"); + return false; + } + } + } + } + } + return true; } - + // 处理屋顶破坏 private void HandleRoofDestruction() { @@ -406,6 +496,10 @@ namespace WulaFallenEmpire IntVec3 targetPos = parent.Position; RoofDef roof = targetPos.GetRoof(parent.Map); + // 如果在口袋地图中且配置为跳过屋顶检查，不破坏屋顶 + if (IsInPocketMap && Props.skipRoofCheckInPocketMap) + return; + if (roof != null && !roof.isThickRoof && Props.allowThinRoof) { parent.Map.roofGrid.SetRoof(targetPos, null); @@ -844,7 +938,7 @@ namespace WulaFallenEmpire } } - // 获取禁用原因 + // 获取禁用原因 - 修改为支持口袋地图 private string GetDisabledReason() { if (IsNonPlayerFaction) @@ -877,18 +971,18 @@ namespace WulaFallenEmpire return null; } - // 获取呼叫描述 + // 获取呼叫描述 - 修改为支持口袋地图 private string GetCallDescription() { var sb = new StringBuilder(); sb.Append("WULA_TeleportBuildingDesc".Translate(Props.buildingToSpawn.label)); - if (Props.requiredResearch != null) + if (Props.requiredResearch != null && !(IsInPocketMap && Props.skipResearchCheckInPocketMap)) { sb.AppendLine().Append("WULA_RequiresResearch".Translate(Props.requiredResearch.label)); } - if (Props.requireFlyOver && !HasRequiredFlyOver) + if (Props.requireFlyOver && !HasRequiredFlyOver && !(IsInPocketMap && Props.skipFlyOverCheckInPocketMap)) { sb.AppendLine().Append("WULA_RequiresBuildingDropperFlyOver".Translate()); } @@ -896,7 +990,7 @@ namespace WulaFallenEmpire if (parent?.Map != null) { RoofDef roof = parent.Position.GetRoof(parent.Map); - if (roof != null) + if (roof != null && !(IsInPocketMap && Props.skipRoofCheckInPocketMap)) { if (roof.isThickRoof && !Props.allowThickRoof) { @@ -911,5 +1005,11 @@ namespace WulaFallenEmpire return sb.ToString(); } + + // 新增：调试方法，显示口袋地图检测状态 + public string GetPocketMapDebugInfo() + { + return $"IsInPocketMap: {IsInPocketMap}, Map.Parent: {parent?.Map?.Parent?.GetType()?.Name}"; + } } } diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompProperties_BuildingSpawner.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompProperties_BuildingSpawner.cs index ce6f5984..0890f91a 100644 --- a/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompProperties_BuildingSpawner.cs +++ b/Source/WulaFallenEmpire/BuildingComp/WULA_BuildingSpawner/CompProperties_BuildingSpawner.cs @@ -45,6 +45,15 @@ namespace WulaFallenEmpire // 新增：建筑生成后的燃料量（如果适用） public FloatRange fuelRange = new FloatRange(1f, 1f); + // 新增：是否在口袋地图中跳过科技检查 + public bool skipResearchCheckInPocketMap = true; + + // 新增：是否在口袋地图中跳过FlyOver检查 + public bool skipFlyOverCheckInPocketMap = true; + + // 新增：是否在口袋地图中跳过屋顶检查 + public bool skipRoofCheckInPocketMap = true; + public CompProperties_BuildingSpawner() { compClass = typeof(CompBuildingSpawner); diff --git a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/CompPrefabSkyfallerCaller.cs b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/CompPrefabSkyfallerCaller.cs index e65a7a34..235e6591 100644 --- a/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/CompPrefabSkyfallerCaller.cs +++ b/Source/WulaFallenEmpire/BuildingComp/WULA_SkyfallerCaller/CompPrefabSkyfallerCaller.cs @@ -89,8 +89,6 @@ namespace WulaFallenEmpire { if (!string.IsNullOrEmpty(PropsPrefab.prefabDefName)) { - Log.Message($"[PrefabSkyfallerCaller] Executing auto skyfaller call for prefab at {parent.Position}"); - // 非玩家派系自动呼叫不需要资源检查 HandleRoofDestruction(); @@ -112,7 +110,6 @@ namespace WulaFallenEmpire if (thing is Skyfaller_PrefabSpawner skyfaller) { skyfaller.prefabDefName = PropsPrefab.prefabDefName; - Log.Message($"[PrefabSkyfallerCaller] Setting prefabDefName to: {PropsPrefab.prefabDefName}"); GenSpawn.Spawn(skyfaller, parent.Position, parent.Map); } else @@ -150,22 +147,22 @@ namespace WulaFallenEmpire } // 新增：调试信息 - public override string CompInspectStringExtra() - { - var baseString = base.CompInspectStringExtra(); + //public override string CompInspectStringExtra() + //{ + // var baseString = base.CompInspectStringExtra(); - if (!string.IsNullOrEmpty(PropsPrefab.prefabDefName)) - { - var sb = new System.Text.StringBuilder(); - if (!string.IsNullOrEmpty(baseString)) - { - sb.AppendLine(baseString); - } - sb.Append($"Prefab: {PropsPrefab.prefabDefName}"); - return sb.ToString(); - } + // if (!string.IsNullOrEmpty(PropsPrefab.prefabDefName)) + // { + // var sb = new System.Text.StringBuilder(); + // if (!string.IsNullOrEmpty(baseString)) + // { + // sb.AppendLine(baseString); + // } + // sb.Append($"Prefab: {PropsPrefab.prefabDefName}"); + // return sb.ToString(); + // } - return baseString; - } + // return baseString; + //} } } diff --git a/美术与文本源文件/Wula/Apparel/WULA_Maid_Uniform_Headband.sai2 b/美术与文本源文件/Wula/Apparel/WULA_Maid_Uniform_Headband.sai2 index 7675838b..236b7427 100644 Binary files a/美术与文本源文件/Wula/Apparel/WULA_Maid_Uniform_Headband.sai2 and b/美术与文本源文件/Wula/Apparel/WULA_Maid_Uniform_Headband.sai2 differ diff --git a/美术与文本源文件/Wula/Apparel/WULA_Swimsuit_Thin_south.sai2 b/美术与文本源文件/Wula/Apparel/WULA_Swimsuit_Thin_south.sai2 new file mode 100644 index 00000000..7d29c540 Binary files /dev/null and b/美术与文本源文件/Wula/Apparel/WULA_Swimsuit_Thin_south.sai2 differ diff --git a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 b/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 index b24dbc58..a6c2423e 100644 Binary files a/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 and b/美术与文本源文件/Wula/Building/WULA_ArmedShuttle_New.sai2 differ diff --git a/美术与文本源文件/Wula/Building/WULA_Surveillance_Building.sai2 b/美术与文本源文件/Wula/Building/WULA_Surveillance_Building.sai2 index ccb18dc1..37ac234e 100644 Binary files a/美术与文本源文件/Wula/Building/WULA_Surveillance_Building.sai2 and b/美术与文本源文件/Wula/Building/WULA_Surveillance_Building.sai2 differ diff --git a/美术与文本源文件/Wula/Item/WULA_Default_Item.sai2 b/美术与文本源文件/Wula/Item/WULA_Default_Item.sai2 deleted file mode 100644 index 992b8155..00000000 Binary files a/美术与文本源文件/Wula/Item/WULA_Default_Item.sai2 and /dev/null differ diff --git a/美术与文本源文件/Wula/Item/WULA_Psi_Titan_Core.sai2 b/美术与文本源文件/Wula/Item/WULA_Psi_Titan_Core.sai2 new file mode 100644 index 00000000..6bc877ca Binary files /dev/null and b/美术与文本源文件/Wula/Item/WULA_Psi_Titan_Core.sai2 differ diff --git a/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon.png b/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon.png deleted file mode 100644 index bf2f3c33..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Icon.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.sai2 b/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.sai2 new file mode 100644 index 00000000..83b6f161 Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Wula_Psi_Titan_Incoming.sai2 differ