X-Git-Url: https://git.jsancho.org/?p=lugaru.git;a=blobdiff_plain;f=Source%2FObjects%2FPerson.cpp;h=7a16709f30a2deffd852bec219fdc7c16b56cfd8;hp=02c174e3c932fee2a3a5557cfba20d51ae1a0fb3;hb=b35798eb8ef5e05a4574bbf1115c31a504496616;hpb=25fd991fca18b740e622d8cf50532f18af1b9711 diff --git a/Source/Objects/Person.cpp b/Source/Objects/Person.cpp index 02c174e..7a16709 100644 --- a/Source/Objects/Person.cpp +++ b/Source/Objects/Person.cpp @@ -506,7 +506,7 @@ void Person::CheckKick() } if (Animation::animations[victim->animTarget].height != lowheight) { - float damagemult = (creature == wolftype ? 2.5 : 1.) * power * power; + float damagemult = PersonType::types[creature].power * power * power; XYZ relative = velocity; relative.y = 0; Normalise(&relative); @@ -2440,10 +2440,7 @@ void Person::DoAnimations() } //Move impacts - float damagemult = 1 * power; - if (creature == wolftype) { - damagemult = 2.5 * power; - } + float damagemult = PersonType::types[creature].power * power; if (hasvictim) { damagemult /= victim->damagetolerance / 200; }