Changeset 19 for src/map/skill.h

Timestamp:

07/02/08 12:20:18 (17 years ago)

Author:

jinshiro

Message:

Now Compiles with Cygwin GCC

Files:

• src/map/skill.h (modified) (3 diffs)

src/map/skill.h

@@ -321 +321 @@
 int skill_arrow_create( struct map_session_data *sd,int nameid);
 
-//Custom Jobs (blackmagic)
 int skill_additem(struct block_list* src, struct block_list *bl, int itemid, int amount); // Item giver func [Brain]
-//Custom Job End
+
 
 // mobƒXƒLƒ‹‚Ì‚œ‚ß
@@ -960 +959 @@
 
         ALL_INCCARRY = 681,
-
+        AD_PWBLIND = 700,       // Custom Skills [Brainstorm]
+        AD_PWFEAR,
+        AD_DARKHEAL,
+        AD_BLOODPACT,
+        AD_LUST,
+        AD_FERVOR,
+        AD_PROFANE,
+        AD_DARKFAITH,
+        AD_FAMILIAR,
+        AD_SUMMONS,
+
+<<<<<<< .mine
+        NC_PHYLACTERY, //710
+        NC_UNDEAD,
+        NC_DEATHHAND,
+        NC_GHOULTOUCH,
+        NC_SKELETON,
+        NC_ZOMBIE,
+        NC_ARCHER,
+        NC_MUMMY,
+        NC_GHOST,
+        NC_SHADOW,
+        NC_WRAITH,
+        NC_REQUIEM,
+        NC_DARKMOON,
+        NC_PWSUFFER,
+        NC_DECREPIFY,
+        NC_DRAINLIFE,
+        NC_DEATHPACT,
+=======
         //Custom Jobs (blackmagic)
         AD_PWBLIND = 700,       // Custom Skills [Brainstorm]
@@ -1014 +1042 @@
         
         //Custom Job End
+>>>>>>> .r18
+
+        ALL_ATFIELD, //GM SKILL
+
+        WL_CURSETONGUES, //732
+        WL_CURSEDOOM,
+        WL_CURSEEXHAUST,
+        WL_CURSEWEAKNESS,
+        WL_SEARING,
+        WL_HELLFIRE,
+        WL_CONFLAGRATE,
+        WL_IMMOLATE,
+        WL_SHADOWBOLT,
+        WL_SHADOWBURN,
+        WL_HOWLOFPAIN,
+        WL_DEMONOLOGY,
+        WL_HOWLOFTERROR,
+        WL_PWAGONY,
+        WL_OVERWHELMING,
+        WL_SOULSTEAL,
+        WL_DRAINSOUL,
+        WL_CORRUPTION, //749