X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FMonster.cpp;h=7cb4185f13209bf31cc327051718a3034dd5d004;hb=b02da898c7c8a08141df4e797774a61cf5e0163f;hp=acbe6cf93bdacbd402eb4cff94ee6ce53396bb51;hpb=d7927b645a22776d6e1e1c209365e8f74c4350e9;p=l2e.git

diff --git a/src/battle/Monster.cpp b/src/battle/Monster.cpp
index acbe6cf..7cb4185 100644
--- a/src/battle/Monster.cpp
+++ b/src/battle/Monster.cpp
@@ -7,6 +7,11 @@
 
 #include "Monster.h"
 
+#include "../loader/TypeDescription.h"
+
+using loader::FieldDescription;
+using loader::TypeDescription;
+
 namespace battle {
 
 Monster::Monster()
@@ -16,18 +21,15 @@ Monster::Monster()
 , attackScript(0)
 , defenseScript(0)
 
+, meleeAnimation(0)
+, attackAnimation(0)
+, spellAnimation(0)
+
 , maxHealth(0)
 , health(0)
 , maxMana(0)
 , mana(0)
 
-, attack(0)
-, defense(0)
-, agility(0)
-, intelligence(0)
-, gut(0)
-, magicResistance(0)
-
 , expReward(0)
 , goldReward(0)
 
@@ -40,4 +42,46 @@ Monster::~Monster() {
 
 }
 
+
+void Monster::SubtractHealth(int amount) {
+	if (amount > Health()) {
+		health = 0;
+	} else {
+		health -= amount;
+	}
+}
+
+
+void Monster::CreateTypeDescription() {
+	Monster m;
+
+	int animationId(TypeDescription::GetTypeId("Animation"));
+	int numberId(TypeDescription::GetTypeId("Number"));
+	int spriteId(TypeDescription::GetTypeId("Sprite"));
+	int statsId(TypeDescription::GetTypeId("Stats"));
+	int stringId(TypeDescription::GetTypeId("String"));
+
+	TypeDescription &td(TypeDescription::CreateOrGet("Monster"));
+	td.SetConstructor(&Construct);
+	td.SetSize(sizeof(Monster));
+
+	td.AddField("name", FieldDescription(((char *)&m.name) - ((char *)&m), stringId, true));
+	td.AddField("sprite", FieldDescription(((char *)&m.sprite) - ((char *)&m), spriteId, true));
+	td.AddField("level", FieldDescription(((char *)&m.level) - ((char *)&m), numberId, false));
+
+	td.AddField("maxHealth", FieldDescription(((char *)&m.maxHealth) - ((char *)&m), numberId, false));
+	td.AddField("health", FieldDescription(((char *)&m.health) - ((char *)&m), numberId, false));
+	td.AddField("maxMana", FieldDescription(((char *)&m.maxMana) - ((char *)&m), numberId, false));
+	td.AddField("mana", FieldDescription(((char *)&m.mana) - ((char *)&m), numberId, false));
+	td.AddField("stats", FieldDescription(((char *)&m.stats) - ((char *)&m), statsId, false));
+
+	td.AddField("attackAnimation", FieldDescription(((char *)&m.attackAnimation) - ((char *)&m), animationId, true));
+	td.AddField("spellAnimation", FieldDescription(((char *)&m.spellAnimation) - ((char *)&m), animationId, true));
+	td.AddField("meleeAnimation", FieldDescription(((char *)&m.meleeAnimation) - ((char *)&m), animationId, true));
+}
+
+void Monster::Construct(void *data) {
+	new (data) Monster;
+}
+
 }