marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

structures: made very low damage repairable 

When the damage times the total component value was much lower compared to the total HitPoints (e.g. with basements), the damage could sometimes not be repaired.
This is fixed now.
install-platforms
David Dormagen 2018-01-13 15:04:15 +01:00
parent 38d937fa58
commit 12da14d603
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
planet/Objects.ocd/Libraries.ocd/Structures.ocd/Structure.ocd/Script.c
View File

@ -244,8 +244,9 @@ public func GetRepairMaterials()
{
material_value += material.count * material.id->GetValue();
}
// Multiply by 1000 to prevent issues with rounding.
var remaining_damage_value = 1000 * total_component_value * GetDamage() / GetHitPoints() - 1000 * material_value;
var remaining_damage_value = total_component_value * GetDamage() / GetHitPoints() - material_value;
if (remaining_damage_value <= 0)
{
return lib_structure.repair_materials;
@ -259,6 +260,7 @@ public func GetRepairMaterials()
var current_offset = 0;
var component, i = 0;
var found = false;
while (component = GetComponent(nil, i++))
{
var count = GetComponent(component);
@ -268,11 +270,16 @@ public func GetRepairMaterials()
if (random_sample <= current_offset)
{
remaining_damage_value -= value;
remaining_damage_value -= 1000 * value;
AddRepairMaterial(component);
found = true;
break;
}
}
// Failsafe. No components?
if (!found)
break;
}
return lib_structure.repair_materials;