Changeset 5 for src/map/mob.c

Timestamp:

06/30/08 21:19:58 (17 years ago)

Author:

jinshiro

Message:

 

Files:

• src/map/mob.c (modified) (4 diffs)

src/map/mob.c

@@ -245 +245 @@
  * 1: poring list
  * 2: bloody branch list
+ * 3: mob_pouch list
+ * 4: familiar list // familiar by FlavioJS [Brain]
  * flag:
  * &1: Apply the summon success chance found in the list (otherwise get any monster from the db)
@@ -2011 +2013 @@
                         break;
                 //Let players decide whether to retaliate versus the master or the mob. [Skotlex]
-                if (md2->master_id && battle_config.retaliate_to_master)
-                        md->attacked_id = md2->master_id;
+                /*if (md2->master_id && battle_config.retaliate_to_master)
+                        md->attacked_id = md2->master_id;*/
+//UNCOMMENT IF ERROR OCCURS WITH CUSTOM JOBS V
+//if (md2->master_id && battle_config.retaliate_to_master)
+                //BEGIN Custom Jobs (blackmagic)
+                        {
+                //necro_retaliation config (same as above, but only works for adept/necro/warlock summons) [Brainstorm]
+                if(!battle_config.necro_retaliation && (md2->class_ >= 3100 && md2->class_ <= 3235))
+                md->attacked_id = src->id;
+                else md->attacked_id = md2->master_id; //All normal summons
+        }
+                        //end
                 else
                         md->attacked_id = src->id;
@@ -2812 +2824 @@
         return map_foreachinmap(mob_countslave_sub, bl->m, BL_MOB,bl->id);
 }
+
+//Begin Custom Jobs (blackmagic)
+/// Count slaves with a certain master and class. by FlavioJS [Brain]
+static int mob_countslave_class_sub(struct block_list* bl, va_list ap)
+{
+        int id;
+        int count;
+        short* classes;
+        TBL_MOB* md;
+
+        id = va_arg(ap, int);
+        count = va_arg(ap, int);
+        classes = va_arg(ap, short*);
+        md = (TBL_MOB*)bl;
+        
+        if( md->master_id == id )
+        {// has the correct master
+        int i;
+        for( i = 0; i < count; ++i )
+        {
+                if( md->class_ == classes[i] )
+                return 1;
+        }
+        }
+        return 0;
+}
+
+/// Returns the number of slaves of the specified classes. by FlavioJS [Brain]
+/// @param bl Master
+/// @param count Number of classes
+/// @param classes Array of classes
+int mob_countslave_class(struct block_list* bl, int count, short* classes)
+{
+        return map_foreachinmap(mob_countslave_class_sub, bl->m, BL_MOB, bl->id, count, classes);
+}
+
+//End
 
 /*==========================================
@@ -3974 +4023 @@
                 "mob_poring.txt",
                 "mob_boss.txt",
-                "mob_pouch.txt"};
+                "mob_pouch.txt"
+                //Begin custom Jobs (blackmagic
+                "mob_familiar.txt" // familiar By FlavioJS [Brain]
+        };
+        //end
 
         memset(&summon, 0, sizeof(summon));