diff --git a/data/models/sheared_sheep.b3d b/data/models/sheared_sheep.b3d new file mode 100644 index 0000000..e4a616b Binary files /dev/null and b/data/models/sheared_sheep.b3d differ diff --git a/data/textures/mob_sheared_sheep.png b/data/textures/mob_sheared_sheep.png new file mode 100644 index 0000000..25a0737 Binary files /dev/null and b/data/textures/mob_sheared_sheep.png differ diff --git a/src/content_mob.cpp b/src/content_mob.cpp index b4232da..81e552d 100644 --- a/src/content_mob.cpp +++ b/src/content_mob.cpp @@ -748,6 +748,33 @@ void content_mob_init() f->setCollisionBox(aabb3f(-0.4*BS, 0., -0.4*BS, 0.4*BS, 1.*BS, 0.4*BS)); lists::add("creative",CONTENT_TOOLITEM_MOB_SPAWNER,1,i); + i = CONTENT_MOB_SHEARED_SHEEP; + f = &g_content_mob_features[i&~CONTENT_MOB_MASK]; + f->content = i; + f->description = wgettext("Sheared Sheep"); + f->level = MOB_PASSIVE; + f->hp = 30; + f->model = "sheared_sheep.b3d"; + f->model_scale = v3f(0.8,0.8,0.8); + f->model_rotation = v3f(0,-90,0); + f->model_offset = v3f(0,0.6,0); + f->setTexture("mob_sheared_sheep.png"); + f->setAnimationFrames(MA_STAND,40,60); + f->setAnimationFrames(MA_MOVE,1,28); + f->setAnimationFrames(MA_ATTACK,1,28); + f->punch_action = MPA_HARM; + f->dropped_item = std::string("CraftItem2 ")+itos(CONTENT_CRAFTITEM_MEAT)+" 2"; + f->motion = MM_SEEKER; + f->motion_type = MMT_WALK; + f->sound_random = "mob-sheep-env"; + f->sound_random_extra = "mob-ducksheep-env"; + f->spawn_min_height = 2; + f->spawn_max_height = 50; + f->spawn_group = 4; + f->lifetime = 1800.0; + f->setCollisionBox(aabb3f(-0.4*BS, 0., -0.4*BS, 0.4*BS, 1.*BS, 0.4*BS)); + lists::add("creative",CONTENT_TOOLITEM_MOB_SPAWNER,1,i); + i = CONTENT_MOB_SNOWBALL; f = &g_content_mob_features[i&~CONTENT_MOB_MASK]; f->content = i; diff --git a/src/content_mob.h b/src/content_mob.h index 8d3a211..f6c1d73 100644 --- a/src/content_mob.h +++ b/src/content_mob.h @@ -324,8 +324,9 @@ void content_mob_init(); #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) +#define CONTENT_MOB_SHEARED_SHEEP (CONTENT_MOB_MASK | 0x14) // increment me if you add a mob! -#define CONTENT_MOB_COUNT 20 +#define CONTENT_MOB_COUNT 21 #endif