diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 8e38dab2..aba019e6 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/DroneWorkModeDefs/DroneWorkModes.xml b/1.6/1.6/Defs/DroneWorkModeDefs/DroneWorkModes.xml index 7a3a91f6..d4e9bf2f 100644 --- a/1.6/1.6/Defs/DroneWorkModeDefs/DroneWorkModes.xml +++ b/1.6/1.6/Defs/DroneWorkModeDefs/DroneWorkModes.xml @@ -3,33 +3,33 @@ Work - - The drone will work normally. - UI/Commands/Attack + + 机械将执行分配的工作. + UI/Icons/WorkMode/Work 10 Recharge - - The drone will seek a charger to recharge. - UI/Commands/DesirePower + + 机械将寻找充电站并充电. + UI/Icons/WorkMode/Recharge 20 Shutdown - - The drone will find a safe spot to self-shutdown. - UI/Commands/ToggleVent + + 机械将立即进入休眠状态. + UI/Icons/WorkMode/SelfShutdown 30 AutoFight - - The drone will automatically seek and attack enemies. - UI/Commands/Attack + + 机械将自动寻找并攻击敌人. + UI/Icons/WorkMode/Escort 40 diff --git a/1.6/1.6/Defs/JobDefs/Jobs_WULA_AutonomousMech.xml b/1.6/1.6/Defs/JobDefs/Jobs_WULA_AutonomousMech.xml index 244b77e7..fbfa5302 100644 --- a/1.6/1.6/Defs/JobDefs/Jobs_WULA_AutonomousMech.xml +++ b/1.6/1.6/Defs/JobDefs/Jobs_WULA_AutonomousMech.xml @@ -4,7 +4,7 @@ WULA_DroneSelfShutdown WulaFallenEmpire.JobDriver_DroneSelfShutdown - self-shutting down. + 关机自休眠. false true diff --git a/1.6/1.6/Defs/PawnTableDefs/PawnTables_WULA.xml b/1.6/1.6/Defs/PawnTableDefs/PawnTables_WULA.xml index db81724f..f5d6cfd5 100644 --- a/1.6/1.6/Defs/PawnTableDefs/PawnTables_WULA.xml +++ b/1.6/1.6/Defs/PawnTableDefs/PawnTables_WULA.xml @@ -17,15 +17,17 @@ WULA_DroneWorkMode + WulaFallenEmpire.PawnColumnWorker_DroneWorkMode true - UI/Commands/Attack + UI/Icons/WorkMode/Work Work Mode 24 WULA_DroneEnergy + WulaFallenEmpire.PawnColumnWorker_DroneEnergy true Energy diff --git a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_Keyed.xml b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_Keyed.xml index b8afd2e5..fc6fd6a7 100644 --- a/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_Keyed.xml +++ b/1.6/1.6/Languages/ChineseSimplified (简体中文)/Keyed/WULA_Keyed.xml @@ -94,7 +94,11 @@ 自主控制 自主模式: {0} {0} 能量低,自动切换到充电模式 - {0} 已充满电,自动切换到工作模式 + {0} 已充满电,自动切换到工作模式 {0} 能量临界! + 自主机械体 + 自动战斗 + 切换到自动战斗模式 - 机械将自动寻找并攻击敌人 + \ No newline at end of file diff --git a/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_MainTabWindow_Mechs_Pawns.cs b/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_MainTabWindow_Mechs_Pawns.cs deleted file mode 100644 index dcaae258..00000000 --- a/Source/WulaFallenEmpire/HarmonyPatches/WULA_AutonomousMech/Patch_MainTabWindow_Mechs_Pawns.cs +++ /dev/null @@ -1,23 +0,0 @@ -using HarmonyLib; -using RimWorld; -using System.Collections.Generic; -using System.Linq; -using Verse; - -namespace WulaFallenEmpire -{ - [HarmonyPatch(typeof(MainTabWindow_Mechs), "Pawns", MethodType.Getter)] - public static class Patch_MainTabWindow_Mechs_Pawns - { - [HarmonyPostfix] - public static void Postfix(ref IEnumerable __result) - { - // 获取所有自主机械体 - var autonomousMechs = Find.CurrentMap.mapPawns.PawnsInFaction(Faction.OfPlayer) - .Where(p => p.RaceProps.IsMechanoid && p.GetComp()?.CanBeAutonomous == true); - - // 将自主机械体合并到结果中,并去重 - __result = __result.Concat(autonomousMechs).Distinct(); - } - } -} \ No newline at end of file diff --git a/Source/WulaFallenEmpire/WulaDefOf.cs b/Source/WulaFallenEmpire/WulaDefOf.cs index ae59029c..453a156b 100644 --- a/Source/WulaFallenEmpire/WulaDefOf.cs +++ b/Source/WulaFallenEmpire/WulaDefOf.cs @@ -84,6 +84,7 @@ namespace WulaFallenEmpire public static DroneWorkModeDef Recharge; public static DroneWorkModeDef Shutdown; public static DroneWorkModeDef AutoFight; + public static PawnTableDef WULA_AutonomousMechs; static WulaDefOf() { diff --git a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj index 1daa7b70..b3fa5e91 100644 --- a/Source/WulaFallenEmpire/WulaFallenEmpire.csproj +++ b/Source/WulaFallenEmpire/WulaFallenEmpire.csproj @@ -190,7 +190,6 @@ -