1 files changed, 39 insertions, 9 deletions

diff --git a/Minecraft.World/Skeleton.h b/Minecraft.World/Skeleton.h
index b85d9afe..e2f6594c 100644
--- a/Minecraft.World/Skeleton.h
+++ b/Minecraft.World/Skeleton.h
@@ -2,38 +2,68 @@
 using namespace std;
 
 #include "Monster.h"
+#include "RangedAttackMob.h"
 
-class Skeleton : public Monster
+class RangedAttackGoal;
+class MeleeAttackGoal;
+
+class Skeleton : public Monster, public RangedAttackMob
 {
 public:
 	eINSTANCEOF GetType() { return eTYPE_SKELETON; }
 	static Entity *create(Level *level) { return new Skeleton(level); }
 
+private:
+	static const int DATA_TYPE_ID = 13;
+
+public:
+	static const int TYPE_DEFAULT = 0;
+	static const int TYPE_WITHER = 1;
+
+private:
+	RangedAttackGoal *bowGoal;
+	MeleeAttackGoal *meleeGoal;
+
+public:
 	Skeleton(Level *level);
+	virtual ~Skeleton();
 
+protected:
+	virtual void registerAttributes();
+	virtual void defineSynchedData();
+
+public:
 	virtual bool useNewAi();
-	virtual int getMaxHealth();
 
 protected:
 	virtual int getAmbientSound();
 	virtual int getHurtSound();
 	virtual int getDeathSound();
+	virtual void playStepSound(int xt, int yt, int zt, int t);
+
+public:
+	virtual bool doHurtTarget(shared_ptr<Entity> target);
 
 public:
-    virtual shared_ptr<ItemInstance> getCarriedItem();
 	virtual MobType getMobType();
 	virtual void aiStep();
+	virtual void rideTick();
 	virtual void die(DamageSource *source);
 
 protected:
 	virtual int getDeathLoot();
-    virtual void dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel);
+	virtual void dropDeathLoot(bool wasKilledByPlayer, int playerBonusLevel);
 	virtual void dropRareDeathLoot(int rareLootLevel);
-
-private:
-	static shared_ptr<ItemInstance> bow;
+	virtual void populateDefaultEquipmentSlots();
 
 public:
-
-	static void staticCtor();
+	virtual MobGroupData *finalizeMobSpawn(MobGroupData *groupData, int extraData = 0); // 4J Added extraData param
+	virtual void reassessWeaponGoal();
+	virtual void performRangedAttack(shared_ptr<LivingEntity> target, float power);
+	virtual int getSkeletonType();
+	virtual void setSkeletonType(int type);
+	virtual void readAdditionalSaveData(CompoundTag *tag);
+	virtual void addAdditonalSaveData(CompoundTag *entityTag);
+	virtual void setEquippedSlot(int slot, shared_ptr<ItemInstance> item);
+	virtual double getRidingHeight();
 };