adding kitty mobs

src/content_mob.cpp

@@ -787,4 +787,100 @@ void content_mob_init()
 	f->contact_drop_item = CONTENT_CRAFTITEM_ARROW;
 	f->spawn_naturally = false;
 	f->setCollisionBox(aabb3f(-BS/3.,0.0,-BS/3., BS/3.,BS/2.,BS/3.));
+        
+	i = CONTENT_MOB_GREY_KITTY;
+	f = &g_content_mob_features[i&~CONTENT_MOB_MASK];
+	f->content = i;
+	f->level = MOB_AGGRESSIVE;
+	f->hp = 30;
+	f->model = "kitty.b3d";
+	f->model_scale = v3f(1.0,1.0,1.0);
+	f->model_rotation = v3f(0,180,0);
+	f->model_offset = v3f(0,0,0);
+	f->setTexture("mob_kitty_greytabby.png");
+	f->setAnimationFrames(MA_STAND,90,110);
+	f->setAnimationFrames(MA_MOVE,0,50);
+	f->setAnimationFrames(MA_ATTACK,110,190);
+	f->punch_action = MPA_HARM;
+	f->dropped_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_FUR)+" 1";
+	f->motion = MM_WANDER;
+	f->motion_type = MMT_WALK;
+	f->angry_motion = MM_SEEKER;
+	f->sound_random = "mob-kitty-env";
+	f->spawn_min_height = -5;
+	f->spawn_max_height = 40;
+	f->lifetime = 1200.0;
+	f->setCollisionBox(aabb3f(-0.6*BS, 0., -0.6*BS, 0.6*BS, 1.25*BS, 0.6*BS));
+	
+	i = CONTENT_MOB_WHITE_KITTY;
+	f = &g_content_mob_features[i&~CONTENT_MOB_MASK];
+	f->content = i;
+	f->level = MOB_AGGRESSIVE;
+	f->hp = 30;
+	f->model = "kitty.b3d";
+	f->model_scale = v3f(1.0,1.0,1.0);
+	f->model_rotation = v3f(0,180,0);
+	f->model_offset = v3f(0,0,0);
+	f->setTexture("mob_kitty_white.png");
+	f->setAnimationFrames(MA_STAND,90,110);
+	f->setAnimationFrames(MA_MOVE,0,50);
+	f->setAnimationFrames(MA_ATTACK,110,190);
+	f->punch_action = MPA_HARM;
+	f->dropped_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_FUR)+" 1";
+	f->motion = MM_WANDER;
+	f->motion_type = MMT_WALK;
+	f->angry_motion = MM_SEEKER;
+	f->sound_random = "mob-kitty-env";
+	f->spawn_min_height = -5;
+	f->spawn_max_height = 40;
+	f->lifetime = 1200.0;
+	f->setCollisionBox(aabb3f(-0.6*BS, 0., -0.6*BS, 0.6*BS, 1.25*BS, 0.6*BS));
+	
+	i = CONTENT_MOB_SIAMESE_KITTY;
+	f = &g_content_mob_features[i&~CONTENT_MOB_MASK];
+	f->content = i;
+	f->level = MOB_AGGRESSIVE;
+	f->hp = 30;
+	f->model = "kitty.b3d";
+	f->model_scale = v3f(1.0,1.0,1.0);
+	f->model_rotation = v3f(0,180,0);
+	f->model_offset = v3f(0,0,0);
+	f->setTexture("mob_kitty_siamese.png");
+	f->setAnimationFrames(MA_STAND,90,110);
+	f->setAnimationFrames(MA_MOVE,0,50);
+	f->setAnimationFrames(MA_ATTACK,110,190);
+	f->punch_action = MPA_HARM;
+	f->dropped_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_FUR)+" 1";
+	f->motion = MM_WANDER;
+	f->motion_type = MMT_WALK;
+	f->angry_motion = MM_SEEKER;
+	f->sound_random = "mob-kitty-env";
+	f->spawn_min_height = -5;
+	f->spawn_max_height = 40;
+	f->lifetime = 1200.0;
+	f->setCollisionBox(aabb3f(-0.6*BS, 0., -0.6*BS, 0.6*BS, 1.25*BS, 0.6*BS));
+	
+	i = CONTENT_MOB_GINGER_KITTY;
+	f = &g_content_mob_features[i&~CONTENT_MOB_MASK];
+	f->content = i;
+	f->level = MOB_AGGRESSIVE;
+	f->hp = 30;
+	f->model = "kitty.b3d";
+	f->model_scale = v3f(1.0,1.0,1.0);
+	f->model_rotation = v3f(0,180,0);
+	f->model_offset = v3f(0,0,0);
+	f->setTexture("mob_kitty_gingertabby.png");
+	f->setAnimationFrames(MA_STAND,90,110);
+	f->setAnimationFrames(MA_MOVE,0,50);
+	f->setAnimationFrames(MA_ATTACK,110,190);
+	f->punch_action = MPA_HARM;
+	f->dropped_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_FUR)+" 1";
+	f->motion = MM_WANDER;
+	f->motion_type = MMT_WALK;
+	f->angry_motion = MM_SEEKER;
+	f->sound_random = "mob-kitty-env";
+	f->spawn_min_height = -5;
+	f->spawn_max_height = 40;
+	f->lifetime = 1200.0;
+	f->setCollisionBox(aabb3f(-0.6*BS, 0., -0.6*BS, 0.6*BS, 1.25*BS, 0.6*BS));
 }

src/content_mob.h

@@ -320,8 +320,12 @@ void content_mob_init();
 #define CONTENT_MOB_SHEEP (CONTENT_MOB_MASK | 0x0D)
 #define CONTENT_MOB_SNOWBALL (CONTENT_MOB_MASK | 0x0E)
 #define CONTENT_MOB_ARROW (CONTENT_MOB_MASK | 0x0F)
+#define CONTENT_MOB_GREY_KITTY (CONTENT_MOB_MASK | 0x10)
+#define CONTENT_MOB_WHITE_KITTY (CONTENT_MOB_MASK | 0x11)
+#define CONTENT_MOB_SIAMESE_KITTY (CONTENT_MOB_MASK | 0x12)
+#define CONTENT_MOB_GINGER_KITTY (CONTENT_MOB_MASK | 0x13)
 
 // increment me if you add a mob!
-#define CONTENT_MOB_COUNT 16
+#define CONTENT_MOB_COUNT 20
 
 #endif

src/guiMainMenu.cpp

@@ -768,7 +768,7 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
 			txt += "\ndarkrose, sdzen, Pentium44, Menche, MavJS, tiemay, Tapoky, JHeaton, Wayward_One, Stephane, hdastwb, VargaD.\n\n";
 
 			txt += gettext("Artists and Modellers");
-			txt += "\ndarkrose, sdzen, Menche, Pentium44, Wuzzy, Carl 'melkior' Kidwell, Jordach.\n\n";
+			txt += "\ndarkrose, sdzen, Menche, Pentium44, Wuzzy, Carl 'melkior' Kidwell, Jordach, Gwinna, elky.\n\n";
 
 			txt += gettext("Translators");
 			txt += "\ndarkrose, Szkodnix, soognarf, Wuzzy, Akien, redhound, Rui, loh, wario, puma_rc, Uniaika.\n\n";