X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FObjects%2FPersonType.cpp;h=41d07c2483749444ba3f227c1ad8ac58c656bead;hb=7aa870825c0e851e69703d9730e20db6eb94a675;hp=b3a803fb7801d1bcd799cad689a78afc8c12bb5f;hpb=0d560a31c813321b1ef8b96e177ffd64457f3436;p=lugaru.git

diff --git a/Source/Objects/PersonType.cpp b/Source/Objects/PersonType.cpp
index b3a803f..41d07c2 100644
--- a/Source/Objects/PersonType.cpp
+++ b/Source/Objects/PersonType.cpp
@@ -24,6 +24,7 @@ std::vector<PersonType> PersonType::types;
 PersonType::PersonType()
 {
     animTalkIdle = tempanim;
+    animHurtIdle = tempanim;
 }
 
 bool PersonType::hasAnimTalkIdle()
@@ -31,6 +32,11 @@ bool PersonType::hasAnimTalkIdle()
     return (animTalkIdle != tempanim);
 }
 
+bool PersonType::hasAnimHurtIdle()
+{
+    return (animHurtIdle != tempanim);
+}
+
 void PersonType::Load()
 {
     types.resize(2);
@@ -75,6 +81,14 @@ void PersonType::Load()
     types[wolftype].skins[1] = "Textures/FurWolfDark.jpg";
     types[wolftype].skins[2] = "Textures/FurWolfSnow.jpg";
 
+    types[wolftype].power = 2.5;
+    types[wolftype].defaultDamageTolerance = 300;
+    types[wolftype].defaultScale = .23;
+    types[wolftype].hasClaws = true;
+    types[wolftype].clothes = false;
+    types[wolftype].maxRunSpeed = 75;
+    types[wolftype].knifeCatchingType = 1;
+
     /* Rabbit */
     types[rabbittype].proportions[0] = 1.2;
     types[rabbittype].proportions[1] = 1.05;
@@ -90,6 +104,8 @@ void PersonType::Load()
     types[rabbittype].animLandingHard = landhardanim;
     types[rabbittype].animFightIdle = fightidleanim;
     types[rabbittype].animBounceIdle = bounceidleanim;
+    types[rabbittype].animTalkIdle = talkidleanim;
+    types[rabbittype].animHurtIdle = hurtidleanim;
 
     types[rabbittype].soundsAttack[0] = rabbitattacksound;
     types[rabbittype].soundsAttack[1] = rabbitattack2sound;
@@ -122,4 +138,12 @@ void PersonType::Load()
     types[rabbittype].skins[7] = "Textures/FurChocolate.jpg";
     types[rabbittype].skins[8] = "Textures/FurBlackWhite.jpg";
     types[rabbittype].skins[9] = "Textures/FurBrownWhite.jpg";
+
+    types[rabbittype].power = 1;
+    types[rabbittype].defaultDamageTolerance = 200;
+    types[rabbittype].defaultScale = .2;
+    types[rabbittype].hasClaws = false;
+    types[rabbittype].clothes = true;
+    types[rabbittype].maxRunSpeed = 55;
+    types[rabbittype].knifeCatchingType = 0;
 }