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

diff --git a/Source/Objects/PersonType.cpp b/Source/Objects/PersonType.cpp
index b22200a..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);
@@ -71,9 +77,17 @@ void PersonType::Load()
     types[wolftype].modelClothesFileName = "Models/Belt.solid";
 
     types[wolftype].skins.resize(3);
-    types[wolftype].skins[0] = "Textures/Wolf.jpg";
-    types[wolftype].skins[1] = "Textures/DarkWolf.jpg";
-    types[wolftype].skins[2] = "Textures/SnowWolf.jpg";
+    types[wolftype].skins[0] = "Textures/FurWolfGrey.jpg";
+    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;
@@ -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;
@@ -112,14 +128,22 @@ void PersonType::Load()
     types[rabbittype].modelClothesFileName = "Models/Belt.solid";
 
     types[rabbittype].skins.resize(10);
-    types[rabbittype].skins[0] = "Textures/Fur3.jpg";
-    types[rabbittype].skins[1] = "Textures/Fur.jpg";
-    types[rabbittype].skins[2] = "Textures/Fur2.jpg";
-    types[rabbittype].skins[3] = "Textures/Lynx.jpg";
-    types[rabbittype].skins[4] = "Textures/Otter.jpg";
-    types[rabbittype].skins[5] = "Textures/Opal.jpg";
-    types[rabbittype].skins[6] = "Textures/Sable.jpg";
-    types[rabbittype].skins[7] = "Textures/Chocolate.jpg";
-    types[rabbittype].skins[8] = "Textures/BW2.jpg";
-    types[rabbittype].skins[9] = "Textures/WB2.jpg";
+    types[rabbittype].skins[0] = "Textures/FurBrown.jpg";
+    types[rabbittype].skins[1] = "Textures/FurWhite.jpg";
+    types[rabbittype].skins[2] = "Textures/FurBlack.jpg";
+    types[rabbittype].skins[3] = "Textures/FurLynx.jpg";
+    types[rabbittype].skins[4] = "Textures/FurOtter.jpg";
+    types[rabbittype].skins[5] = "Textures/FurOpal.jpg";
+    types[rabbittype].skins[6] = "Textures/FurSable.jpg";
+    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;
 }