- Modified *monster and *areamonster script commands to allow size and ai parameters.

-- Event parameter now no longer works as size & ai replacement.
-- If not defined, it'll assume the default size (0 = medium) and default ai (0 = none).
- Changed all hardcoded AI states to recently created enum.

Please test, if you find any bugs, report on our Bug Tracker.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16904 54d463be-8e91-2dee-dedb-b68131a5f0ec

1 files changed, 11 insertions, 12 deletions

diff --git a/src/map/map.h b/src/map/map.h
index 43bef63af..24753d058 100644
--- a/src/map/map.h
+++ b/src/map/map.h
@@ -319,23 +319,22 @@ struct block_list {
 // Expanded to specify all mob-related spawn data by [Skotlex]
 struct spawn_data {
 	short class_; //Class, used because a mob can change it's class
-	unsigned short m,x,y;	//Spawn information (map, point, spawn-area around point)
-	signed short xs,ys;
+	unsigned short m, x, y;	//Spawn information (map, point, spawn-area around point)
+	signed short xs, ys;
 	unsigned short num; //Number of mobs using this structure
-	unsigned short active; //Number of mobs that are already spawned (for mob_remove_damaged: no)
-	unsigned int delay1,delay2; //Spawn delay (fixed base + random variance)
+	unsigned short active;//Number of mobs that are already spawned (for mob_remove_damaged: no)
+	unsigned int delay1, delay2; //Spawn delay (fixed base + random variance)
 	struct {
-		unsigned int size :2; //Holds if mob has to be tiny/large
-		unsigned int ai :2;	//Holds if mob is special ai.
-		unsigned int dynamic :1; //Whether this data is indexed by a map's dynamic mob list
-		unsigned int boss : 1;
+		unsigned int size : 2; //Holds if mob has to be tiny/large
+		unsigned int ai : 4; //Special ai for summoned monsters.
+							 //0: Normal mob | 1: Standard summon, attacks mobs
+							 //2: Alchemist Marine Sphere | 3: Alchemist Summon Flora | 4: Summon Zanzou
+		unsigned int dynamic : 1; //Whether this data is indexed by a map's dynamic mob list
+		unsigned int boss : 1; //0: Non-boss monster | 1: Boss monster
 	} state;
-	char name[NAME_LENGTH],eventname[EVENT_NAME_LENGTH]; //Name/event
+	char name[NAME_LENGTH], eventname[EVENT_NAME_LENGTH]; //Name/event
 };
 
-
-
-
 struct flooritem_data {
 	struct block_list bl;
 	unsigned char subx,suby;