Merge origin/master with fixes

This commit is contained in:
2025-12-21 15:03:27 +08:00
50 changed files with 1004 additions and 260 deletions

File diff suppressed because it is too large Load Diff

View File

@@ -524,14 +524,6 @@ namespace ArachnaeSwarm
builder.Append(timeText);
builder.AppendLine();
builder.Append("ARA_EquipmentIncubator.Speed".Translate() + ": " + SpeedMultiplier.ToStringPercent());
// 显示营养液加成信息
if (currentNutrientCount > 0)
{
builder.AppendLine();
builder.Append("ARA_EquipmentIncubator.NutrientBonusActive".Translate() + ": " +
currentNutrientCount + " tiles (" + NutrientSpeedBonus.ToStringPercent() + ")");
}
}
else if (assignedLarva != null)
{
@@ -675,18 +667,6 @@ namespace ArachnaeSwarm
{
builder.AppendLine("ARA_EquipmentIncubator.NoResearchRequired".Translate());
}
// 显示营养液建议
var costStat = DefDatabase<StatDef>.GetNamedSilentFail("ARA_IncubationCost");
if (costStat != null)
{
int recommendedCost = Mathf.RoundToInt(config.thingDef.GetStatValueAbstract(costStat, null));
if (recommendedCost > 0)
{
builder.AppendLine();
builder.AppendLine("ARA_EquipmentIncubator.RecommendedNutrientsForSpeed".Translate(recommendedCost));
}
}
}
builder.AppendLine();