X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fcommon%2FIkari.h;h=c355fdba5cad90889dca400e95f337212db672a8;hb=0911d263c10cca314305799d5b839ee9653cac0b;hp=d73798f3c245428aa93b7a0f9f923a87fa7c2a14;hpb=0c01d2b65aaf159bfd9bcf9d3f909a1d2ae5247f;p=l2e.git

diff --git a/src/common/Ikari.h b/src/common/Ikari.h
index d73798f..c355fdb 100644
--- a/src/common/Ikari.h
+++ b/src/common/Ikari.h
@@ -1,10 +1,3 @@
-/*
- * Ikari.h
- *
- *  Created on: Aug 10, 2012
- *      Author: holy
- */
-
 #ifndef COMMON_IKARI_H_
 #define COMMON_IKARI_H_
 
@@ -15,6 +8,9 @@ namespace common {
 // TODO: looks like Ikari and Spell have _quite_ a lot in common…
 class Ikari {
 
+public:
+	static const int TYPE_ID = 302;
+
 public:
 	Ikari();
 
@@ -25,21 +21,29 @@ public:
 	TargetingMode &GetTargetingMode() { return targetingMode; }
 	const TargetingMode &GetTargetingMode() const { return targetingMode; }
 
-	// TODO: add missing ikari properties
+	bool IsMagical() const { return !isPhysical; }
+	bool IsPhysical() const { return isPhysical; }
 
 // temporary setters
 public:
 	void SetName(const char *n) { name = n; }
 	void SetCost(Uint8 c) { cost = c; }
+	void SetMagical() { isPhysical = false; }
+	void SetPhysical() { isPhysical = true; }
+
+	static void CreateTypeDescription();
+	static void Construct(void *);
 
 private:
 	const char *name;
 
-	Uint8 cost;
+	int cost;
 	TargetingMode targetingMode;
 
+	bool isPhysical;
+
 };
 
 }
 
-#endif /* COMMON_IKARI_H_ */
+#endif