diff --git a/1.6/Assemblies/WulaFallenEmpire.dll b/1.6/Assemblies/WulaFallenEmpire.dll
index 89ffb7ff..83d99d55 100644
Binary files a/1.6/Assemblies/WulaFallenEmpire.dll and b/1.6/Assemblies/WulaFallenEmpire.dll differ
diff --git a/1.6/Assemblies/WulaFallenEmpire.pdb b/1.6/Assemblies/WulaFallenEmpire.pdb
index 1142b654..071f63bb 100644
Binary files a/1.6/Assemblies/WulaFallenEmpire.pdb and b/1.6/Assemblies/WulaFallenEmpire.pdb differ
diff --git a/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml b/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml
index f4cb3082..7c07ec75 100644
--- a/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml
+++ b/1.6/Defs/BodyAndPartDefs/Bodies_WULA.xml
@@ -514,7 +514,7 @@
WULA_Outer_Armor_Bodypart
- 1
+ 0.99
Top
Torso
@@ -597,7 +597,7 @@
WULA_Outer_Armor_Bodypart
- 1
+ 0.99
Top
Torso
@@ -629,7 +629,7 @@
Leg
第一机械足
- 0.14
+ 0.13
Bottom
Legs
@@ -638,7 +638,7 @@
Leg
第二机械足
- 0.14
+ 0.13
Bottom
Legs
@@ -647,7 +647,7 @@
Leg
第三机械足
- 0.14
+ 0.13
Bottom
Legs
@@ -656,7 +656,7 @@
Leg
第四机械足
- 0.14
+ 0.13
Bottom
Legs
@@ -665,7 +665,7 @@
Leg
第五机械足
- 0.14
+ 0.13
Bottom
Legs
@@ -674,7 +674,7 @@
Leg
第六机械足
- 0.14
+ 0.13
Bottom
Legs
diff --git a/1.6/Defs/StatDefs/WULA_Stats.xml b/1.6/Defs/StatDefs/WULA_Stats.xml
index 2befd10b..7a164a3f 100644
--- a/1.6/Defs/StatDefs/WULA_Stats.xml
+++ b/1.6/Defs/StatDefs/WULA_Stats.xml
@@ -9,7 +9,6 @@
-1
1
PercentZero
- 4000
@@ -20,6 +19,5 @@
1
0
PercentZero
- 3990
diff --git a/1.6/Defs/ThingDefs/WULA_Item.xml b/1.6/Defs/ThingDefs/WULA_Item.xml
index ae06091e..0469f70c 100644
--- a/1.6/Defs/ThingDefs/WULA_Item.xml
+++ b/1.6/Defs/ThingDefs/WULA_Item.xml
@@ -244,7 +244,7 @@
Shooting
- 100000
+ 100000
5000
2.0
1.5
@@ -263,7 +263,7 @@
Melee
- 100000
+ 100000
5000
2.0
1.5
@@ -282,7 +282,7 @@
Animals
- 100000
+ 100000
5000
2.0
1.5
@@ -301,7 +301,7 @@
Artistic
- 100000
+ 100000
5000
2.0
1.5
@@ -320,7 +320,7 @@
Construction
- 100000
+ 100000
5000
2.0
1.5
@@ -339,7 +339,7 @@
Cooking
- 100000
+ 100000
5000
2.0
1.5
@@ -358,7 +358,7 @@
Crafting
- 100000
+ 100000
5000
2.0
1.5
@@ -377,7 +377,7 @@
Intellectual
- 100000
+ 100000
5000
2.0
1.5
@@ -396,7 +396,7 @@
Medicine
- 100000
+ 100000
5000
2.0
1.5
@@ -415,7 +415,7 @@
Mining
- 100000
+ 100000
5000
2.0
1.5
@@ -434,7 +434,7 @@
Plants
- 100000
+ 100000
5000
2.0
1.5
@@ -453,7 +453,7 @@
Social
- 100000
+ 100000
5000
2.0
1.5
diff --git a/Source/WulaFallenEmpire/CompUseEffect_WulaSkillTrainer.cs b/Source/WulaFallenEmpire/CompUseEffect_WulaSkillTrainer.cs
index 3394781d..c7a35a30 100644
--- a/Source/WulaFallenEmpire/CompUseEffect_WulaSkillTrainer.cs
+++ b/Source/WulaFallenEmpire/CompUseEffect_WulaSkillTrainer.cs
@@ -63,20 +63,22 @@ namespace WulaFallenEmpire
}
}
- public override bool CanBeUsedBy(Pawn p, out string failReason)
+ public override AcceptanceReport CanBeUsedBy(Pawn p)
{
if (p.skills == null)
{
- failReason = "PawnHasNoSkills".Translate(p.LabelShort);
- return false;
+ return "PawnHasNoSkills".Translate(p.LabelShort);
}
if (Props.skill == null)
{
- failReason = "SkillTrainerHasNoSkill".Translate(parent.LabelShort);
- return false;
+ return "SkillTrainerHasNoSkill".Translate(parent.LabelShort);
}
- failReason = null;
- return true;
+ // 检查目标技能是否被禁用
+ if (p.skills.GetSkill(Props.skill).TotallyDisabled)
+ {
+ return "SkillDisabled".Translate();
+ }
+ return base.CanBeUsedBy(p);
}
}
}