diff --git a/1.6/1.6/Assemblies/ArachnaeSwarm.dll b/1.6/1.6/Assemblies/ArachnaeSwarm.dll index dee47a2..b568830 100644 Binary files a/1.6/1.6/Assemblies/ArachnaeSwarm.dll and b/1.6/1.6/Assemblies/ArachnaeSwarm.dll differ diff --git a/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_PowerArmor.xml b/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_PowerArmor.xml index 856da5e..dcafeb8 100644 --- a/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_PowerArmor.xml +++ b/1.6/1.6/Defs/Thing_Misc/Apparels/ARA_PowerArmor.xml @@ -37,13 +37,13 @@ ARA_SpiderOne_PowerArmor
  • - 10.0 + 100.0 - -
  • FoodMeals
    • -
  • FoodRaw
    • - + +
  • ARA_InsectJelly
    • +     + 虫蜜 1 0.5 true @@ -111,13 +111,14 @@
  • - 10.0 + true + 100.0 - -
  • FoodMeals
    • -
  • FoodRaw
    • - + +
  • ARA_InsectJelly
    • +     + 虫蜜 1 0.5 true diff --git a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon_Icez.xml b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon_Icez.xml index ab41456..c408bb2 100644 --- a/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon_Icez.xml +++ b/1.6/1.6/Defs/Thing_Misc/Weapons/ARA_Weapon_Icez.xml @@ -74,7 +74,7 @@
  • ARA_Huge_Weapon
    • -
  • ARA_Weapon_Damage_Acid
    • +
  • ARA_Weapon_Damage_FrostExplode
    • 2 diff --git a/1.6/1.6/Defs/WeaponTraitDefs/ARA_WeaponTraitDefs.xml b/1.6/1.6/Defs/WeaponTraitDefs/ARA_WeaponTraitDefs.xml index fd444dd..70b74d1 100644 --- a/1.6/1.6/Defs/WeaponTraitDefs/ARA_WeaponTraitDefs.xml +++ b/1.6/1.6/Defs/WeaponTraitDefs/ARA_WeaponTraitDefs.xml @@ -77,4 +77,15 @@ + + ARA_Weapon_Damage_FrostExplode + + 这种武装器官发射的霜冻气雾能够沾染敌人，被沾染的敌人会再次爆炸。 + 1 + ARA_Weapon_Damage_Category + + + + + \ No newline at end of file diff --git a/Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs b/Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs index e9e153f..87de355 100644 --- a/Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs +++ b/Source/ArachnaeSwarm/Building_Comps/CompRefuelableNutrition.cs @@ -7,13 +7,27 @@ namespace ArachnaeSwarm { public class CompProperties_RefuelableNutrition : CompProperties_Refuelable { + public bool silent = false; + public CompProperties_RefuelableNutrition() { compClass = typeof(CompRefuelableNutrition); - // 默认启用这些Gizmo，除非在XML中明确设置为false this.targetFuelLevelConfigurable = true; this.showAllowAutoRefuelToggle = true; } + + public override IEnumerable SpecialDisplayStats(StatRequest req) + { + if (silent) + { + yield break; // If silent, return nothing. + } + + foreach (var stat in base.SpecialDisplayStats(req)) + { + yield return stat; + } + } } [StaticConstructorOnStartup] diff --git a/Source/ArachnaeSwarm/PowerArmor/ARA_PowerArmor.cs b/Source/ArachnaeSwarm/PowerArmor/ARA_PowerArmor.cs index b7668de..aa9d8c7 100644 --- a/Source/ArachnaeSwarm/PowerArmor/ARA_PowerArmor.cs +++ b/Source/ArachnaeSwarm/PowerArmor/ARA_PowerArmor.cs @@ -152,7 +152,7 @@ namespace ArachnaeSwarm } } #endregion - + #region State-Switching public override void Notify_Unequipped(Pawn pawn) { diff --git a/Source/ArachnaeSwarm/PowerArmor/CompPowerArmorStation.cs b/Source/ArachnaeSwarm/PowerArmor/CompPowerArmorStation.cs index 9ed75c4..f4d4d52 100644 --- a/Source/ArachnaeSwarm/PowerArmor/CompPowerArmorStation.cs +++ b/Source/ArachnaeSwarm/PowerArmor/CompPowerArmorStation.cs @@ -20,6 +20,17 @@ namespace ArachnaeSwarm { public CompProperties_PowerArmorStation Props => (CompProperties_PowerArmorStation)props; + public override void CompTick() + { + base.CompTick(); + var fuelComp = parent.GetComp(); + if (fuelComp != null) + { + // Set consumption rate to 0 when in building form + fuelComp.currentConsumptionRate = 0f; + } + } + public override IEnumerable CompFloatMenuOptions(Pawn selPawn) { foreach (FloatMenuOption option in base.CompFloatMenuOptions(selPawn))