diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 83025b9c..473cbd14 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/Effects/Mote_Wula.xml b/1.6/1.6/Defs/Effects/Mote_Wula.xml index 3629b15f..8fac8604 100644 --- a/1.6/1.6/Defs/Effects/Mote_Wula.xml +++ b/1.6/1.6/Defs/Effects/Mote_Wula.xml @@ -2,19 +2,30 @@ - ExcaliburBeam + WULA_ExcaliburBeam WulaFallenEmpire.Thing_ExcaliburBeam MoteOverhead - Things/Mote/PowerBeam - MoteGlow + Things/Mote/GraserBeam + Graphic_MoteWithAgeSecs + MoteBeam + (25,1) + (165, 44, 2, 255) + + <_ScrollSpeedA>0 + <_ScrollSpeedB>0 + <_Intensity>2 + true 0.5 9.3 1.0 + True + True + True diff --git a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml index e9f16490..8e11def8 100644 --- a/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml +++ b/1.6/1.6/Defs/PawnKinds/PawnKinds_Wula.xml @@ -241,7 +241,7 @@ Wula_Mech_Mobile_Factory - + Wula_Mech_Mobile_Factory 1000 false @@ -262,7 +262,7 @@ Wula/Things/WULA_Cat/AllegianceOverlays/None CutoutWithOverlay Graphic_Multi - 6 + 9 (1.4, 1.8, 1.4) @@ -277,10 +277,85 @@ -
  • WULA_GiveSwitchHediff
  • -
  • WULA_RemoveSwitchHediff
  • +
  • Wula_Mech_Mobile_Factory_Produce
  • + + WULA_Mech_Flyer + + WULA_Mech_Flyer + 190 + false + Wula/Things/WULA_Mech_Flyer/Wula_Mech_Flyer_east_Flying_ + 1 + 1 + 2 + false + + true + true + +
  • + + Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer + CutoutWithOverlay + Graphic_Multi + 1.5 + + (0.4, 0.8, 0.4) + + +
  • +
    + 1 + 9999~9999 +
    + + Wula_Mech_Mobile_Factory_Produce + + 立刻生产10台CRm-51"兵蚁",快速组织一道近战阵线。 + Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce + 5000 + 5 + true + true + 300 + true + false + + Verb_CastAbility + 24 + 0 + WarqueenWarUrchinsSpawned + false + false + + true + + + +
  • + Wula_Mech_Mobile_Factory_Produce_Proj + 10 +
  • +
    +
    + + Wula_Mech_Mobile_Factory_Produce_Proj + + Projectile_SpawnsPawnZeroAge + + Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south + Graphic_Single + + + 41 + WULA_Mech_Flyer + true + Bullet + 1 + + 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 7ca10a1e..3e81701b 100644 --- a/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml +++ b/1.6/1.6/Defs/ResearchProjectDefs/WULA_ResearchProjects_Remake.xml @@ -239,6 +239,17 @@
  • WULA_Synth_Productor_Technology
  • + + WULA_Mech_Mobile_Factory_Technology + 9.00 + 5.60 + + 允许殖民地申请空投MFm-2"陆行舰",乌拉帝国的大型战争机械,一座插满火炮和战地生产设施的移动堡垒。 + 800 + +
  • WULA_Colony_License_LV3_Technology
  • +
    +
    WULA_Turret_Base_AT_Technology @@ -383,8 +394,6 @@ - - WULA_Synth_Clothes_1_Technology diff --git a/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml b/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml index b931cdff..386ac0ba 100644 --- a/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml +++ b/1.6/1.6/Defs/SoundDefs/Wula_Sound_Weapons.xml @@ -80,6 +80,22 @@ + + WULA_Unlimit_Penetrating_Beam_Shootingsound + MapOnly + 1 + +
  • + +
  • + Wula/WULA_Unlimit_Penetrating_Beam_Shootingsound +
  • + + 65 + 0.9~1.1 + +
    +
    WULA_RW_Beam_Shootingsound true 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 new file mode 100644 index 00000000..4fc2bf92 --- /dev/null +++ b/1.6/1.6/Defs/ThingDefs_Buildings/WULA_Mech_Buildings.xml @@ -0,0 +1,166 @@ + + + + + Wula_Mech_Mobile_Factory_Cleanzone + + 清理出一块场地并准备好资源,使得乌拉帝国母舰可以向此处投放大型战争机械。建造好的信标可以收起或移至他处,但是必须要有母舰或者工程舰在上空才能投送大型战争机械。\n\n陆行舰是乌拉帝国的大型战争机械,简直就是一座移动堡垒——它不仅装甲厚实、火炮林立,还能在战场上生产大量的辅助战争机械以形成坚实的弹性阵线,生来就是为了粉碎坚固的堡垒和顽强的抵抗。 + Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Incoming + MinifiedThing + Normal + + Wula_Mech_Mobile_Factory + WULA_Mech_Flyer + + +
  • BuildingsMisc
  • +
    + + Wula/Building/WULA_Dropping_Building_Cleanzone + Graphic_Multi + (3,3) + + false + + + Building + PassThroughOnly + false + 0.5 + false + 0 + false + false + +
  • WULA_Mech_Mobile_Factory_Technology
  • +
    + + 1 + 1 + 1 + 0 + + (3,3) + 0 + 1 + + 50 + 1 + + + BuildingDestroyed_Metal_Small + + +
  • WulaFallenEmpire.PlaceWorker_CustomRadius
  • +
    + WULA_Buildings + +
  • + Wula_Mech_Mobile_Factory_Incoming + true + 1 + true + false +
  • +
    +
    + + Wula_Mech_Mobile_Factory_Incoming + + (1,1) + WulaFallenEmpire.Skyfaller_PawnSpawner + + Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Incoming + Graphic_Single + CutoutFlying + (9,9) + + + Decelerate + Things/Skyfaller/SkyfallerShadowDropPod + (6, 6) + DropPod_Fall + 100 + Explosion_Vaporize + 0.05 + 1 + 1 + + +
  • (0,0)
  • +
  • (1, 1)
  • +
    +
    + + 15 + WULA_Mech_EMP_Drop + 0 +
    + +
  • + Smoke_Joint +
  • +
  • + Wula_Mech_Mobile_Factory + PlayerColony + false + false +
  • +
    +
    + + WULA_Mech_EMP_Drop + + true + {0} has been EMPed to death. + false + Electric + 50 + 0 + + + Explosion_Vaporize + Damage_EMP + true + EMPResistance + 2200 + WULA_Mech_EMP_Drop_Shockwave + + + WULA_Mech_EMP_Drop_Shockwave + +
  • + SubEffecter_SprayerTriggered + Fleck_BlastMechBandShockwave + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + Fleck_BlastMechBandRedLine + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + FlashMechBand + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + Mote_RedFlashStrong + 1 + OnSource + 24 +
  • +
    +
    +
    \ No newline at end of file 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 5bf8aa46..bef6ff3c 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 @@ -1188,6 +1188,42 @@ + WULA_DarkMatterBomb_Shockwave + +
  • + SubEffecter_SprayerTriggered + Fleck_BlastMechBandShockwave + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + Fleck_BlastMechBandRedLine + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + FlashMechBand + 1 + OnSource + true + 0~0 +
  • +
  • + SubEffecter_SprayerTriggered + Mote_RedFlashStrong + 1 + OnSource + 24 +
  • +
    +
    + + WULA_DarkMatterBomb_FlashStrong MoteAttached diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml similarity index 65% rename from 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml rename to 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml index 912cf2cc..4c244a62 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Materialist_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Machine_Weapon.xml @@ -2,16 +2,16 @@ WULA_RW_Unlimit_Penetrating_Beam_Cannon - - 乌拉帝国军械部在黄金时期所设计的武器,时至今日仍未被确认其实际代号。这种武器装填缓慢、体积巨大,只能由最庞大的战争平台所配备,所发射的切割束几乎可以横跨战场,并抹除路径上所有的敌人。 + + 乌拉帝国军械部在黄金时期所设计的武器,装填缓慢、体积巨大,只能由最庞大的战争平台所配备,所发射的切割束几乎可以横跨战场,并抹除路径上所有的敌人。 Archotech None Wula/Weapon/WULA_RW_Unlimit_Penetrating_Beam_Cannon Graphic_Single - 1.5 + 3 - 0.75 + 0.5 Interact_Rifle 200 @@ -19,7 +19,7 @@ 1 1 1 - 0 + 4 false @@ -33,29 +33,30 @@
  • WulaFallenEmpire.Verb_Excalibur true - 30.9 - 6 + 500 + 5 1 2 - ChargeLance_Fire + WULA_Unlimit_Penetrating_Beam_Shootingsound GunTail_Heavy false + Mote_HellsphereCannon_Aim + HellsphereCannon_Aiming true - 1 - Bomb + 2 + BombSuper 450 2 - ExcaliburBeam + WULA_ExcaliburBeam
  • Wula_Mech_Mobile_Factory_Main_Weapon
  • - - + Wula_CR_Mobile_Factory_Turret 由乌拉帝国的陆行舰所配备的炮塔之一,能够喷射穿透装甲的热熔束,处理靠近陆行舰的威胁。 @@ -127,120 +128,6 @@ - - Wula_CR_Mobile_Factory_Turret_MKII - - 由乌拉帝国的陆行舰所配备的炮塔之一,此改进版比起其原型可以将热熔束喷到更远的地方,但是无法处理过近的目标。 - -
  • - Verb_ArcSprayIncinerator - true - 26 - 15 - 6 - 25 - false - false - 6 - 2 - Damage_WULA_Melta - GunTail_Medium - 9 - Flamethrower_Firing - Fleck_IncineratorBeamBurn - 0.32 - 0.5 - 0 - IncineratorBeam_End - 0.85 - 0.55~0.85 - .5 - true - true - true - true - true - Fleck_IncineratorBeamSmoke - (58, 225, 225) - (102, 200, 200) - - -
  • (0, 0)
  • -
  • (0.65, 0.02)
  • -
  • (1, .5)
  • - - - - true - - - -
  • (0.6, 0)
  • -
  • (0.7, 0.2)
  • -
  • (1.2, 0.8)
  • -
    -
    - Combat_RangedFlamethrower - -
    -
    - - WULA_MechFlyerTurretGun_Melta - - 由乌拉帝国的CRm-51"兵蚁"机械体所配备的武装,替换了常规的磁力光束,可以在近距离上灼烧敌军。 - -
  • - Verb_ArcSprayIncinerator - true - 3 - 6 - 4 - 25 - false - false - 3 - 2 - Damage_WULA_Melta_Small - GunTail_Medium - 9 - Flamethrower_Firing - Fleck_IncineratorBeamBurn - 0.32 - 0.5 - 0 - IncineratorBeam_End - 0.85 - 0.55~0.85 - .5 - true - true - true - true - true - Fleck_IncineratorBeamSmoke - (58, 225, 225) - (102, 200, 200) - - -
  • (0, 0)
  • -
  • (0.65, 0.02)
  • -
  • (1, .5)
  • - - - - true - - - -
  • (0.6, 0)
  • -
  • (0.7, 0.2)
  • -
  • (1.2, 0.8)
  • -
    -
    - Combat_RangedFlamethrower - -
    -
    Wula_MR_Mobile_Factory_Turret @@ -334,13 +221,14 @@ true Bullet_Wula_LR_Mobile_Factory_Turret 0 - 9 + 16 true false 4 120 - 1 - Mortar_LaunchA + 3 + 12 + Shot_TurretSniper 12 6 @@ -378,4 +266,86 @@ + + + WULA_MechFlyerTurretGun + + 一种可以窃取他人武器的内置炮塔。 + None + true + + Wula/Weapon/WULA_Weapon_Empty + Graphic_Single + + + 2.6 + 0.60 + 0.80 + 0.90 + 0.85 + + +
  • + WulaFallenEmpire.Verb_ShootWeaponStealBeam + WULA_WeaponStealEffect + 0.1 + 1.0 + true + + true + 0 + 5 + 5 + 50 + Wula_Dark_Matter_Beam + 3 + + + 1000 + -1 + 0 + 0 + 0 + + + 0 + BeamGraser_Shooting + Fleck_BeamBurn + 0.32 + Mote_WULA_RW_Handle_Cannon_Beam + GraserBeam_End + + 0.35 + + + 0.6 + 0.6 + 0.25 + + + true + + +
  • (0, 0)
  • +
  • (0.65, 0.4)
  • +
  • (1, 0.75)
  • + + + + + + true + + + + false + + +
    +
    \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Remake_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml similarity index 100% rename from 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Remake_Weapon.xml rename to 1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_FE_Manpack_Weapon.xml diff --git a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml index 50573e39..d94af5c0 100644 --- a/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml +++ b/1.6/1.6/Defs/ThingDefs_Misc/Weapons/WULA_Weapon.xml @@ -391,85 +391,4 @@
    - - WULA_MechFlyerTurretGun - - 一种可以窃取他人武器的内置炮塔。 - None - true - - Wula/Weapon/WULA_Weapon_Empty - Graphic_Single - - - 2.6 - 0.60 - 0.80 - 0.90 - 0.85 - - -
  • - WulaFallenEmpire.Verb_ShootWeaponStealBeam - WULA_WeaponStealEffect - 0.1 - 1.0 - true - - true - 0 - 5 - 5 - 50 - Wula_Dark_Matter_Beam - 3 - - - 1000 - -1 - 0 - 0 - 0 - - - 0 - BeamGraser_Shooting - Fleck_BeamBurn - 0.32 - - GraserBeam_End - - 0.35 - - - 0.6 - 0.6 - 0.25 - - - true - - -
  • (0, 0)
  • -
  • (0.65, 0.4)
  • -
  • (1, 0.75)
  • - - - - - - true - - - - false - - -
    -
    \ No newline at end of file diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml index 424bbbed..e9701b39 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies.xml @@ -974,7 +974,7 @@ Wula_Mech_Mobile_Factory - 乌拉帝国的大型战争机械,简直就是一座移动堡垒——它不仅装甲厚实、火炮林立,还能在战场上生产大量的辅助战争机械以形成坚实的弹性阵线,生来就是为了粉碎坚固的堡垒和顽强的抵抗。 + 乌拉帝国的大型战争机械,简直就是一座移动堡垒——它不仅装甲厚实、火炮林立,还能在战场上生产大量的辅助战争机械以形成坚实的弹性阵线,生来就是为了粉碎坚固的要塞和顽强的抵抗。 1 1 @@ -1022,7 +1022,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1035,15 +1035,15 @@ 90 -5 - (2.15, 0, -1) + (3.25, 0, -1) -90 - (1, 0, -1.45) + (1.5, 0, -1.45) 90 - (-2.15, 0, -1) + (-3.25, 0, -1) @@ -1058,7 +1058,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1069,15 +1069,15 @@ -90 - (2.15, 0, -1) + (3.25, 0, -1) -90 - (-1, 0, -1.45) + (-1.6, 0, -1.45) 90 - (-2.15, 0, -1) + (-3.25, 0, -1) -5 @@ -1093,7 +1093,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1106,15 +1106,15 @@ 90 -5 - (1.4, 0, -0.35) + (2.4, 0, -0.35) -90 - (1.3, 0, -0.45) + (2.3, 0, -0.45) 90 - (-1.4, 0, -0.35) + (-2.4, 0, -0.35) @@ -1129,7 +1129,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1141,16 +1141,16 @@ -90 - (1.4, 0, -0.35) + (2.4, 0, -0.35) -90 - (-1.3, 0, -0.45) + (-2.3, 0, -0.45) 90 -5 - (-1.4, 0, -0.35) + (-2.4, 0, -0.35) @@ -1165,7 +1165,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1178,15 +1178,15 @@ 90 -5 - (0.6, 0, 0.15) + (1.6, 0, 0.25) -90 - (-1.25, 0, 0.65) + (-2.15, 0, 0.65) 90 - (-0.6, 0, 0.15) + (-1.6, 0, 0.25) @@ -1201,7 +1201,7 @@ PawnRenderNode_TurretGun PawnRenderNodeWorker_TurretGun Body - (1, 1) + (2, 2) 20 Any @@ -1213,16 +1213,16 @@ -90 - (0.6, 0, 0.15) + (1.6, 0, 0.25) -90 - (1.25, 0, 0.65) + (2.05, 0, 0.65) 90 -5 - (-0.6, 0, 0.15) + (-1.6, 0, 0.25) @@ -1249,6 +1249,97 @@ + + WULA_Mech_Flyer + + 乌拉帝国的自律机械部队,它们通常由更高一级的机械作战节点自行制造,可以在靠近敌人后用装备的磁力射线从敌人身上窃取武器。 + +
  • + + +
  • Blunt
  • + + 8.5 + 2 + HeadAttackTool + true + 0.2 + +
    + + Mech_Light + 0.7 + + 1 + + +
  • + MechanoidFullyFormed + 0 + Pawn_Mech_Scyther_Wounded + Pawn_Mech_Scyther_Death + Pawn_Mech_Scyther_Call +
  • +
    + WULA_Mech_Flyer_Constant + + DeathActionWorker_Vanish + Filth_MachineBits + 1~2 + +
    + + 0 + 9999 + 0 + + + +
  • +
  • +
  • + true + 30 + MechanoidsWakeUp +
  • + +
  • + WULA_MechFlyerTurretGun + -90 + false + +
  • + PawnRenderNode_TurretGun + PawnRenderNodeWorker_TurretGun + Body + (1, 1) + 20 + Any + + + 180 + (0, 0, 0) + + +
  • + + +
  • + 10000 +
  • + +
  • + + + Drafted + + + WULA_Hover_FlyNorth + WULA_Hover_FlyEast + WULA_Hover_FlySouth +
  • +
    +
    Wula_AI_Heavy_Panzer diff --git a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml b/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml deleted file mode 100644 index 5dc0e0cd..00000000 --- a/1.6/1.6/Defs/ThingDefs_Races/Races_Wulaspecies_FE_Materialist.xml +++ /dev/null @@ -1,177 +0,0 @@ - - - - WULA_Mech_Flyer - - 乌拉帝国图书馆所制造的最小型的机械体,它们通常由更高一级的机械作战节点自行制造,拥有飞行能力可以快速接近敌方单位,同时使用装备的磁力射线从敌人身上窃取武器。 - -
  • - - -
  • Blunt
  • - - 8.5 - 2 - HeadAttackTool - true - 0.2 - -
    - - Mech_Light - 0.72 - -
  • - ChunkMechanoidSlag - 11 - 0.1 -
  • -
  • - ChunkMechanoidSlag - 12 - 0.1 -
  • -
    - 0.5 - -
  • - MechanoidFullyFormed - 0 - Pawn_Mech_Scyther_Wounded - Pawn_Mech_Scyther_Death - Pawn_Mech_Scyther_Call -
  • -
    - WULA_Mech_Flyer_Constant - - DeathActionWorker_Vanish - Filth_MachineBits - 1~2 - -
    - - 0 - 30 - 10 - - - -
  • - -
  • -
  • -
  • - true - 30 - MechanoidsWakeUp -
  • - -
  • - WULA_MechFlyerTurretGun - -90 - false - -
  • - PawnRenderNode_TurretGun - PawnRenderNodeWorker_TurretGun - Body - (1, 1) - 20 - Any - - - 180 - (0, 0, 0) - - -
  • - - -
  • - 10000 -
  • -
    -
    - - WULA_Mech_Flyer - - WULA_Mech_Flyer - 190 - false - Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_ - 2 - 2 - - false - true - true - -
  • - - Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer - CutoutWithOverlay - Graphic_Multi - 1.5 - - (0.4, 0.8, 0.4) - - -
  • -
    - 1 - 9999~9999 -
    - - WULA_Mech_Flyer_Slow - - - WULA_Mech_Flyer_Melta - - 乌拉帝国图书馆所制造的最小型的机械体,它们通常由更高一级的机械作战节点自行制造,拥有飞行能力可以快速接近敌方单位,同时使用装备的热熔喷射器向敌方喷射可以融化装甲的热熔束。 - - -
  • - -
  • -
  • -
  • - true - 30 - MechanoidsWakeUp -
  • - -
  • - WULA_MechFlyerTurretGun_Melta - -90 - false - -
  • - PawnRenderNode_TurretGun - PawnRenderNodeWorker_TurretGun - Body - (1, 1) - 20 - Any - - - 180 - (0, 0, 0) - - -
  • - - -
  • - 10000 -
  • -
    -
    - - WULA_Mech_Flyer_Melta - - WULA_Mech_Flyer_Melta - - - WULA_Mech_Flyer_Melta_Slow - -
    \ No newline at end of file diff --git a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml index 292db35d..22bdb237 100644 --- a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml +++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/Misc_Gameplay.xml @@ -335,4 +335,6 @@ 冷却:{0} 武器阵列:{0} 武器阵列:就绪 + + 战争机械已部署 \ No newline at end of file diff --git a/Content/Sounds/Wula/WULA_Unlimit_Penetrating_Beam_Shootingsound.wav b/Content/Sounds/Wula/WULA_Unlimit_Penetrating_Beam_Shootingsound.wav new file mode 100644 index 00000000..538b8c0b Binary files /dev/null and b/Content/Sounds/Wula/WULA_Unlimit_Penetrating_Beam_Shootingsound.wav differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/Flying/Wula_Mech_Flyer_east_Flying_1.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/Flying/Wula_Mech_Flyer_east_Flying_1.png new file mode 100644 index 00000000..05a63e65 Binary files /dev/null and b/Content/Textures/Wula/Things/WULA_Mech_Flyer/Flying/Wula_Mech_Flyer_east_Flying_1.png differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png deleted file mode 100644 index 2331eb49..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png deleted file mode 100644 index 74113f0a..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png deleted file mode 100644 index edfcd914..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png deleted file mode 100644 index 0fde680c..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png deleted file mode 100644 index c3f4e477..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png deleted file mode 100644 index 0185775c..00000000 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png and /dev/null differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png index 742fb0bc..dda1f326 100644 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png and b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png index f8361ba2..a050b9d0 100644 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png and b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png differ diff --git a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png index 0d0769ef..bc95fc69 100644 Binary files a/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png and b/Content/Textures/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png index f1514b63..0adb507c 100644 Binary files a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png index 97a2dbac..f18bbaa6 100644 Binary files a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png index a9a2e92c..7ede58a5 100644 Binary files a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_west.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_west.png new file mode 100644 index 00000000..0adb507c Binary files /dev/null and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_west.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Icon.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Icon.png index 7a23a576..69ec4502 100644 Binary files a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Icon.png and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Icon.png differ diff --git a/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Incoming.png b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Incoming.png new file mode 100644 index 00000000..4fb12106 Binary files /dev/null and b/Content/Textures/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Mech_Mobile_Factory_Incoming.png differ diff --git a/Content/Textures/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.png b/Content/Textures/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.png new file mode 100644 index 00000000..4e606f93 Binary files /dev/null and b/Content/Textures/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.png differ diff --git a/Source/WulaFallenEmpire/Ability/CompAbilityEffect_LaunchMultiProjectile.cs b/Source/WulaFallenEmpire/Ability/CompAbilityEffect_LaunchMultiProjectile.cs new file mode 100644 index 00000000..3fd32ecf --- /dev/null +++ b/Source/WulaFallenEmpire/Ability/CompAbilityEffect_LaunchMultiProjectile.cs @@ -0,0 +1,44 @@ +using Verse; +using RimWorld; + +namespace WulaFallenEmpire +{ + public class CompProperties_AbilityLaunchMultiProjectile : CompProperties_AbilityLaunchProjectile + { + public int numProjectiles = 1; + + public CompProperties_AbilityLaunchMultiProjectile() + { + compClass = typeof(CompAbilityEffect_LaunchMultiProjectile); + } + } + + public class CompAbilityEffect_LaunchMultiProjectile : CompAbilityEffect + { + public new CompProperties_AbilityLaunchMultiProjectile Props => (CompProperties_AbilityLaunchMultiProjectile)props; + + public override void Apply(LocalTargetInfo target, LocalTargetInfo dest) + { + base.Apply(target, dest); + for (int i = 0; i < Props.numProjectiles; i++) + { + LaunchProjectile(target); + } + } + + private void LaunchProjectile(LocalTargetInfo target) + { + if (Props.projectileDef != null) + { + Pawn pawn = parent.pawn; + Projectile projectile = (Projectile)GenSpawn.Spawn(Props.projectileDef, pawn.Position, pawn.Map); + projectile.Launch(pawn, pawn.DrawPos, target, target, ProjectileHitFlags.IntendedTarget, parent.verb.preventFriendlyFire); + } + } + + public override bool AICanTargetNow(LocalTargetInfo target) + { + return target.Pawn != null; + } + } +} \ No newline at end of file diff --git a/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_Pawn_ThreatDisabled.cs b/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_Pawn_ThreatDisabled.cs new file mode 100644 index 00000000..45f59289 --- /dev/null +++ b/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_Pawn_ThreatDisabled.cs @@ -0,0 +1,42 @@ +using HarmonyLib; +using RimWorld; +using Verse; +using Verse.AI; +using System.Collections.Generic; + +namespace WulaFallenEmpire +{ + // 核心补丁:修复威胁禁用检查 + [HarmonyPatch(typeof(Pawn), "ThreatDisabled")] + public static class Patch_Pawn_ThreatDisabled + { + public static void Postfix(Pawn __instance, IAttackTargetSearcher disabledFor, ref bool __result) + { + if (!__result) return; + if (!__instance.IsColonyMech) return; + + var comp = __instance.GetComp(); + if (comp != null && comp.CanFightAutonomously) + { + __result = false; + } + } + } + + // 核心补丁:修复机械师需求检查 - 正确的方法在 MechanitorUtility 中 + [HarmonyPatch(typeof(MechanitorUtility), "IsColonyMechRequiringMechanitor")] + public static class Patch_MechanitorUtility_IsColonyMechRequiringMechanitor + { + public static void Postfix(Pawn mech, ref bool __result) + { + if (__result && mech.IsColonyMech) + { + var comp = mech.GetComp(); + if (comp != null && comp.CanFightAutonomously) + { + __result = false; + } + } + } + } +} diff --git a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs index f67426f1..0db2d616 100644 --- a/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs +++ b/Source/WulaFallenEmpire/Pawn/WULA_AutonomousMech/CompAutonomousMech.cs @@ -109,6 +109,16 @@ namespace WulaFallenEmpire return CanBeAutonomous; } } + public bool IsInCombatMode + { + get + { + if (MechPawn == null || MechPawn.Dead || MechPawn.Downed) + return false; + // 被征召或处于自主战斗模式 + return MechPawn.Drafted || (CanFightAutonomously && MechPawn.mindState?.duty?.def == DutyDefOf.AssaultColony); + } + } // 在 CompAutonomousMech 类中添加这个新属性 public bool CanFightAutonomously diff --git a/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/CompProperties_SkyfallerPawnSpawner.cs b/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/CompProperties_SkyfallerPawnSpawner.cs new file mode 100644 index 00000000..8dcccf31 --- /dev/null +++ b/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/CompProperties_SkyfallerPawnSpawner.cs @@ -0,0 +1,76 @@ +using Verse; +using RimWorld; + +namespace WulaFallenEmpire +{ + public class CompProperties_SkyfallerPawnSpawner : CompProperties + { + public PawnKindDef pawnKind; + public FactionDef faction; + public bool spawnDrafted = false; + public bool spawnHostile = false; + + public CompProperties_SkyfallerPawnSpawner() + { + compClass = typeof(CompSkyfallerPawnSpawner); + } + } + + public class CompSkyfallerPawnSpawner : ThingComp + { + public CompProperties_SkyfallerPawnSpawner Props => (CompProperties_SkyfallerPawnSpawner)props; + + public void SpawnPawn(Map map, IntVec3 position) + { + if (Props.pawnKind == null) + { + Log.Error("CompSkyfallerPawnSpawner: pawnKind is null"); + return; + } + + // 创建 Pawn + PawnGenerationRequest request = new PawnGenerationRequest( + Props.pawnKind, + faction: GetFaction(), + context: PawnGenerationContext.NonPlayer, + fixedBiologicalAge: 0, + fixedChronologicalAge: 0 + ); + + Pawn pawn = PawnGenerator.GeneratePawn(request); + + // 设置阵营关系 + if (Props.spawnHostile) + { + pawn.SetFaction(Faction.OfAncientsHostile); + } + + // 生成 Pawn + GenSpawn.Spawn(pawn, position, map); + + // 如果需要,设置为征召状态 + if (Props.spawnDrafted && pawn.drafter != null) + { + pawn.drafter.Drafted = true; + } + + // 发送生成消息 + Messages.Message("SkyfallerPawnLanded".Translate(pawn.LabelShortCap), pawn, MessageTypeDefOf.NeutralEvent); + } + + private Faction GetFaction() + { + if (Props.faction != null) + { + return FactionUtility.DefaultFactionFrom(Props.faction); + } + + if (Props.spawnHostile) + { + return Faction.OfAncientsHostile; + } + + return Faction.OfAncients; + } + } +} diff --git a/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/Skyfaller_PawnSpawner.cs b/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/Skyfaller_PawnSpawner.cs new file mode 100644 index 00000000..8d278a53 --- /dev/null +++ b/Source/WulaFallenEmpire/ThingComp/WULA_SkyfallerPawnSpawner/Skyfaller_PawnSpawner.cs @@ -0,0 +1,50 @@ +using Verse; +using RimWorld; +using System.Collections.Generic; + +namespace WulaFallenEmpire +{ + public class Skyfaller_PawnSpawner : Skyfaller + { + private CompSkyfallerPawnSpawner pawnSpawnerComp; + + public override void PostPostMake() + { + base.PostPostMake(); + pawnSpawnerComp = GetComp(); + } + + protected override void Impact() + { + // 在调用基类 Impact 之前保存位置信息 + IntVec3 impactPosition = base.Position; + Map impactMap = base.Map; + + // 调用基类 Impact 方法(这会处理爆炸、碎片等效果) + base.Impact(); + + // 生成 Pawn + if (pawnSpawnerComp != null && impactMap != null) + { + pawnSpawnerComp.SpawnPawn(impactMap, impactPosition); + } + } + + // 可选:重写 SpawnThings 方法以防止生成原版的内容 + protected override void SpawnThings() + { + // 如果我们要生成 Pawn,可能不想生成原版的物品 + // 但保留原版逻辑以防有其他内容需要生成 + base.SpawnThings(); + } + + public override void ExposeData() + { + base.ExposeData(); + if (Scribe.mode == LoadSaveMode.LoadingVars) + { + pawnSpawnerComp = GetComp(); + } + } + } +} diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index c0afb0cd..5a5441f6 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -71,6 +71,7 @@ + @@ -142,6 +143,7 @@ + @@ -220,6 +222,8 @@ + + diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png deleted file mode 100644 index 2331eb49..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png deleted file mode 100644 index 74113f0a..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png deleted file mode 100644 index edfcd914..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_1_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png deleted file mode 100644 index 0fde680c..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png deleted file mode 100644 index c3f4e477..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png deleted file mode 100644 index 0185775c..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Flying_2_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Thin_south.sai2 b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Thin_south.sai2 deleted file mode 100644 index b827b3f8..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_Thin_south.sai2 and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png deleted file mode 100644 index 742fb0bc..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png deleted file mode 100644 index f8361ba2..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png deleted file mode 100644 index 0d0769ef..00000000 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.sai2 b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.sai2 index b26f2689..b40dbded 100644 Binary files a/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.sai2 and b/美术与文本源文件/Wula/Things/WULA_Mech_Flyer/WULA_Mech_Flyer_south.sai2 differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png b/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png deleted file mode 100644 index daa82dff..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.sai2 deleted file mode 100644 index a51654fc..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_east.sai2 and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png b/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png deleted file mode 100644 index a1a4ad45..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png b/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png deleted file mode 100644 index c4598303..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Bodies/Naked_Thin_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png b/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png b/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png b/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png deleted file mode 100644 index c5dbe5aa..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Heads/Average_Normal_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/Wula_Armour_Icon.png b/美术与文本源文件/Wula/Things/Wula_Armour/Wula_Armour_Icon.png deleted file mode 100644 index c8ff3d8e..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/Wula_Armour_Icon.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png b/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png deleted file mode 100644 index aa13ab62..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.sai2 deleted file mode 100644 index 15349f09..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_east.sai2 and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png b/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png deleted file mode 100644 index 6d4e5767..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png b/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png deleted file mode 100644 index 55e87537..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Armour/abandon/Naked_Thin_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png deleted file mode 100644 index 1f47af8e..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.sai2 index 108f5fa6..5a8120cb 100644 Binary files a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.sai2 and b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_east.sai2 differ diff --git a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png deleted file mode 100644 index 97a2dbac..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png deleted file mode 100644 index a9a2e92c..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Bodies/Naked_Thin_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Psi_Titan_Icon.png b/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Psi_Titan_Icon.png deleted file mode 100644 index bf2f3c33..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_Mech_Mobile_Factory/Wula_Psi_Titan_Icon.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_east.sai2 index 052b7b0c..89b9aaf9 100644 Binary files a/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_east.sai2 and b/美术与文本源文件/Wula/Things/Wula_Psi_Titan/Bodies/Naked_Thin_east.sai2 differ diff --git a/美术与文本源文件/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.sai2 b/美术与文本源文件/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.sai2 new file mode 100644 index 00000000..39d62623 Binary files /dev/null and b/美术与文本源文件/Wula/UI/Abilities/Wula_Mech_Mobile_Factory_Produce.sai2 differ