diff --git a/1.6/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/1.6/Assemblies/WulaFallenEmpire.dll index 54cb00aa..59ca7369 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/MentalStateDefs/MentalStates_WULA_Broken.xml b/1.6/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml index 67a4372c..c6d83d75 100644 --- a/1.6/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml +++ b/1.6/1.6/Defs/MentalStateDefs/MentalStates_WULA_Broken.xml @@ -50,7 +50,7 @@ WulaFallenEmpire.MentalState_MechNoPilot Misc (0.65, 0.9, 0.93) - No driver + 无驾驶员 true true diff --git a/1.6/1.6/Defs/ThingDefs_Races/WULA_Mechunit_Race.xml b/1.6/1.6/Defs/ThingDefs_Races/WULA_Mechunit_Race.xml index 66c3da25..1023fd15 100644 --- a/1.6/1.6/Defs/ThingDefs_Races/WULA_Mechunit_Race.xml +++ b/1.6/1.6/Defs/ThingDefs_Races/WULA_Mechunit_Race.xml @@ -167,6 +167,17 @@ Wula/UI/Commands/WULA_Enter_Mech Wula/UI/Commands/WULA_Exit_Mech + +
  • Chemfuel 70 diff --git a/Content/Textures/Wula/UI/Commands/WULA_BoardCrew.png b/Content/Textures/Wula/UI/Commands/WULA_BoardCrew.png new file mode 100644 index 00000000..dab20c2e Binary files /dev/null and b/Content/Textures/Wula/UI/Commands/WULA_BoardCrew.png differ diff --git a/Content/Textures/Wula/UI/Commands/WULA_ExitCrew.png b/Content/Textures/Wula/UI/Commands/WULA_ExitCrew.png new file mode 100644 index 00000000..01fb13be Binary files /dev/null and b/Content/Textures/Wula/UI/Commands/WULA_ExitCrew.png differ diff --git a/Content/Textures/Wula/UI/Commands/WULA_Recall_Pilot.png b/Content/Textures/Wula/UI/Commands/WULA_Recall_Pilot.png new file mode 100644 index 00000000..f935612a Binary files /dev/null and b/Content/Textures/Wula/UI/Commands/WULA_Recall_Pilot.png differ diff --git a/Source/WulaFallenEmpire/Work/EnterMech/JobDriver_EnterMech.cs b/Source/WulaFallenEmpire/Work/EnterMech/JobDriver_EnterMech.cs index 40b9616e..c3b9298e 100644 --- a/Source/WulaFallenEmpire/Work/EnterMech/JobDriver_EnterMech.cs +++ b/Source/WulaFallenEmpire/Work/EnterMech/JobDriver_EnterMech.cs @@ -65,8 +65,12 @@ namespace WulaFallenEmpire if (comp != null && comp.CanAddPilot(pawn)) { comp.AddPilot(pawn); - Messages.Message("WULA_PilotEnteredMech".Translate(pawn.LabelShort, mech.LabelShort), - MessageTypeDefOf.PositiveEvent, false); + if (mech.drafter != null && !mech.Drafted) + { + mech.drafter.Drafted = true; + } + //Messages.Message("WULA_PilotEnteredMech".Translate(pawn.LabelShort, mech.LabelShort), + // MessageTypeDefOf.PositiveEvent, false); } }; enterToil.defaultCompleteMode = ToilCompleteMode.Instant; diff --git a/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 index 29cac1a7..71d5e4db 100644 Binary files a/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 and b/美术与文本源文件/Wula/Things/Wula_AI_Heavy_Panzer/Bodies/Naked_Thin_east.sai2 differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.dds b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.dds differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.png b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_east.png differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.dds b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.dds differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.png b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_north.png differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.dds b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.dds new file mode 100644 index 00000000..b88cc944 Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.dds differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.png b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.png new file mode 100644 index 00000000..37b54f7e Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/AllegianceOverlays/None_south.png differ diff --git a/美术与文本源文件/Wula/Things/Wula_APC/Bodies/Naked_Thin_east.sai2 b/美术与文本源文件/Wula/Things/Wula_APC/Bodies/Naked_Thin_east.sai2 new file mode 100644 index 00000000..ee891289 Binary files /dev/null and b/美术与文本源文件/Wula/Things/Wula_APC/Bodies/Naked_Thin_east.sai2 differ diff --git a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_east.png b/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_east.png deleted file mode 100644 index 3d2beb4a..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_east.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_north.png b/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_north.png deleted file mode 100644 index cf8054fd..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_north.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_south.png b/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_south.png deleted file mode 100644 index 3dd50ce3..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_south.png and /dev/null differ diff --git a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_west.png b/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_west.png deleted file mode 100644 index 652e13fa..00000000 Binary files a/美术与文本源文件/Wula/Things/Wula_CataphractCentipede/CataphractCentipede_west.png and /dev/null differ diff --git a/美术与文本源文件/Wula/UI/Commands/WULA_FlightToggle.sai2 b/美术与文本源文件/Wula/UI/Commands/WULA_FlightToggle.sai2 index ad76a8a2..867e4cce 100644 Binary files a/美术与文本源文件/Wula/UI/Commands/WULA_FlightToggle.sai2 and b/美术与文本源文件/Wula/UI/Commands/WULA_FlightToggle.sai2 differ