Changeset 19 for src/map/status.c

Timestamp:

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

Author:

jinshiro

Message:

Now Compiles with Cygwin GCC

Files:

• src/map/status.c (modified) (79 diffs)

src/map/status.c

@@ -130 +130 @@
         set_sc( NPC_SILENCEATTACK , SC_SILENCE   , SI_BLANK    , SCB_NONE );
         set_sc( DC_WINKCHARM      , SC_CONFUSION , SI_BLANK    , SCB_NONE );
-        //Custom Jobs (blackmagic)
-        set_sc( AD_PWFEAR         , SC_FEAR      , SI_HALLUCINATION , SCB_SPEED ); //Fear Status by [Brainstorm]
-        //Custom Job End
+        set_sc( AD_PWFEAR        , SC_FEAR        , SI_HALLUCINATION , SCB_SPEED ); //Fear Status by [Brainstorm]
         set_sc( NPC_BLINDATTACK   , SC_BLIND     , SI_BLANK    , SCB_HIT|SCB_FLEE );
         set_sc( LK_HEADCRUSH      , SC_BLEEDING  , SI_BLEEDING , SCB_REGEN );
@@ -410 +408 @@
         set_sc( GD_BATTLEORDER       , SC_BATTLEORDERS    , SI_BLANK           , SCB_STR|SCB_INT|SCB_DEX );
         set_sc( GD_REGENERATION      , SC_REGENERATION    , SI_BLANK           , SCB_REGEN );
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)      
         // Custom Jobs Skills [Brain]
@@ -438 +438 @@
         set_sc( ALL_ATFIELD          , SC_ATFIELD         , SI_UTSUSEMI        ,SCB_NONE);
         //Custom Job End
+>>>>>>> .r18
+
+        // Custom Jobs Skills [Brain]
+        add_sc( AD_PWBLIND         , SC_BLIND);
+        add_sc( AD_PWFEAR               , SC_FEAR);
+        set_sc( AD_LUST           , SC_LUST             , SI_JOINTBEAT     , SCB_ASPD|SCB_BATK|SCB_WATK|SCB_REGEN);
+
+        set_sc( NC_DECREPIFY     , SC_DECREPIFY    , SI_BLEEDING        , SCB_SPEED|SCB_BATK|SCB_WATK|SCB_DEF2|SCB_MDEF2);
+        set_sc( NC_DARKMOON       , SC_DARKMOON , SI_MOON_COMFORT       , SCB_FLEE|SCB_HIT);
+        add_sc( NC_DARKMOON       , SC_BLIND);
+        set_sc( NC_REQUIEM         , SC_REQUIEM  , SI_KAIZEL      , SCB_BATK|SCB_WATK);
+        add_sc( NC_GHOULTOUCH   , SC_POISON);
+        set_sc( NC_PWSUFFER       , SC_SUFFER     , SI_BLANK       , SCB_DEF|SCB_DEF2);
+        set_sc( NC_DEATHPACT     , SC_DEATHPACT    , SI_BIOMOBTRICKDEAD , SCB_DEF_ELE|SCB_REGEN);
+        
+        set_sc( WL_SEARING         , SC_SEARING  , SI_BLANK        , SCB_NONE);
+        set_sc( WL_IMMOLATE       , SC_IMMOLATE , SI_BLANK         , SCB_NONE);
+        add_sc( WL_SHADOWBURN   , SC_STUN);
+        set_sc( WL_PWAGONY         , SC_AGONY      , SI_BLANK      , SCB_MDEF|SCB_MDEF2);
+        set_sc( WL_CURSETONGUES   , SC_CURSETONGUES     , SI_SLOWCAST   , SCB_NONE);
+        set_sc( WL_CURSEDOOM     , SC_DOOM              , SI_BLANK         , SCB_NONE);
+        set_sc( WL_CURSEWEAKNESS         , SC_CURSEWEAKNESS   , SI_STRIPWEAPON   , SCB_BATK|SCB_WATK);
+        set_sc( WL_CURSEEXHAUST   , SC_CURSEEXHAUST     , SI_CRITICALWOUND   , SCB_DEF|SCB_MDEF);
+        add_sc( WL_HOWLOFTERROR   , SC_FEAR);
+        set_sc( WL_HOWLOFPAIN   , SC_PROVOKE     , SI_PROVOKE    , SCB_DEF|SCB_DEF2|SCB_BATK|SCB_WATK);
+        set_sc( WL_OVERWHELMING   , SC_OVERWHELMING     , SI_ENERGYCOAT   , SCB_DEF|SCB_MDEF|SCB_MATK|SCB_REGEN|SCB_DEF_ELE);
+        
+        set_sc( ALL_ATFIELD       , SC_ATFIELD   , SI_UTSUSEMI  ,SCB_NONE);
+
 
         // Storing the target job rather than simply SC_SPIRIT simplifies code later on.
@@ -677 +706 @@
                         status_change_end(target,SC_WINKCHARM,-1);
                         status_change_end(target,SC_CONFUSION,-1);
+                        //error... definately...
+                        if (sc->data[SC_FEAR]) //Fear Status by [Brainstorm]
+                        status_change_end(target, SC_FEAR, -1);
                         status_change_end(target,SC_TRICKDEAD,-1);
                         status_change_end(target,SC_HIDING,-1);
                         status_change_end(target,SC_CLOAKING,-1);
                         status_change_end(target,SC_CHASEWALK,-1);
-                        status_change_end(target,SC_FEAR, -1);//Custom Jobs (blackmagic)
                         if ((sce=sc->data[SC_ENDURE]) && !sce->val4) {
                                 //Endure count is only reduced by non-players on non-gvg maps.
@@ -1373 +1404 @@
                 flag|=16;
 
+<<<<<<< .mine
+        if (md->master_id && md->special_state.ai)
+        flag|=32; //Adept/Necro/Warlock Summon Stats Bonus [Brainstorm]
+=======
         //Custom Jobs (blackmagic)              
         if (md->master_id && md->special_state.ai)
                 flag|=32; //Adept/Necro/Warlock Summon Stats Bonus [Brainstorm]
         //Custom Job End
+>>>>>>> .r18
+
 
         if (!flag)
@@ -1494 +1531 @@
                 status->aspd_rate -= 100*md->guardian_data->guardup_lv;
         }
+<<<<<<< .mine
+        //Summon Bonus from Skills [Brainstorm]
+        if(flag&32)
+        {
+        mbl = map_id2bl(md->master_id);
+        if(mbl)
+        {
+                struct unit_data *ud = unit_bl2ud(mbl);
+                //Remove special AI when this is used by regular mobs.
+                if (mbl->type == BL_MOB && !((TBL_MOB*)mbl)->special_state.ai)
+                md->special_state.ai = 0;
+                
+                int master_lv = status_get_lv(mbl);
+                int skill_mastery = pc_checkskill((TBL_PC*)mbl,AD_SUMMONS);
+                int undead_mastery = pc_checkskill((TBL_PC*)mbl,NC_UNDEAD);
+        
+                if (ud->skillid == AD_FAMILIAR)
+                {
+                status->max_hp += (skill_mastery*10) + (master_lv*10);
+                status->str += (master_lv) + (skill_mastery);
+                status->dex += (master_lv) + (skill_mastery);
+                status->agi += (master_lv) + (skill_mastery);
+                status->int_ += (master_lv) + (skill_mastery);
+                status->vit += (master_lv) + (skill_mastery);
+                status->luk += (master_lv) + (skill_mastery);
+                status->rhw.atk += (skill_mastery*3)
+                        + (status->str+((status->str/10)*(status->str/10))+(status->dex/5)+(status->luk/10));
+                status->rhw.atk2 += (skill_mastery*3)
+                        + (status->str+((status->str/10)*(status->str/10))+(status->dex/5)+(status->luk/10));
+                status->speed -= skill_mastery;
+                status->def += (master_lv)/10 + (skill_mastery);
+                status->mdef += (master_lv)/10 + (skill_mastery);
+                //These are not automatically recalculated
+                status->hit += (master_lv*2) + (skill_mastery);
+                status->flee += (master_lv*2) + (skill_mastery);
+                status->def2 += (master_lv) + (skill_mastery);
+                status->mdef2 += (master_lv) + (skill_mastery);
+                }       
+                else if(status->race==RC_UNDEAD)
+                {
+                status->max_hp += (undead_mastery*10) + (master_lv*2);
+                status->str += (undead_mastery*3) + (skill_mastery);
+                status->dex += (undead_mastery*3) + (skill_mastery);
+                status->agi += (undead_mastery*3) + (skill_mastery);
+                status->int_ += (undead_mastery*3) + (skill_mastery);
+                status->vit += (undead_mastery*3) + (skill_mastery);
+                status->luk += (undead_mastery*3) + (skill_mastery);
+                status->rhw.atk += (undead_mastery*3) + (skill_mastery*3)
+                        + (status->str+((status->str/10)*(status->str/10))+(status->dex/5)+(status->luk/10));
+                status->rhw.atk2 += (undead_mastery*3) + (skill_mastery*3)
+                        + (status->str+((status->str/10)*(status->str/10))+(status->dex/5)+(status->luk/10));
+                status->speed -= undead_mastery;
+                status->def += undead_mastery;
+                status->mdef += undead_mastery;
+                //These are not automatically recalculated
+                status->hit += (undead_mastery*3) + (skill_mastery);
+                status->flee += (undead_mastery*3) + (skill_mastery);
+                status->def2 += (undead_mastery*3) + (skill_mastery);
+                status->mdef2 += (undead_mastery*3) + (skill_mastery);
+                }
+=======
 
         //Custom Jobs (blackmagic)
@@ -1557 +1655 @@
                 }
                 else ShowError("status_calc_mob: Monster summoned without a master at %s\n", map[md->bl.m].name);
-        }
-        //Custom Job End
+>>>>>>> .r18
+        }
+        else ShowError("status_calc_mob: Monster summoned without a master at %s\n", map[md->bl.m].name);
+        }
+
 
         //Initial battle status
@@ -1807 +1908 @@
         status->aspd_rate = 1000;
         status->ele_lv = 1;
+<<<<<<< .mine
+        status->race = RC_DEMIHUMAN;// This define players default race to DEMIHUMAN [Brain]
+        if(pc_checkskill(sd,NC_PHYLACTERY)>0) status->def_ele = ELE_UNDEAD; //Phylactery turns you UNDEAD 1 instead of NEUTRAL
+=======
         //Custom Jobs (blackmagic)
         status->race = RC_DEMIHUMAN;// This define players default race to DEMIHUMAN [Brain]
         if(pc_checkskill(sd,NC_PHYLACTERY)>0) status->def_ele = ELE_UNDEAD; //Phylactery turns you UNDEAD 1 instead of NEUTRAL
         //Custom Job End
-
+>>>>>>> .r18
 
         //zero up structures...
@@ -2101 +2206 @@
         if((skill=pc_checkskill(sd,AC_OWL))>0)
                 status->dex += skill;
-
+        if((skill=pc_checkskill(sd,WL_DEMONOLOGY))>0) //Warlock Demonology [Brain]
+        status->str += skill/2; //+1 str per 2 skill points
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         
@@ -2107 +2216 @@
                 status->str += skill/2; //+1 str per 2 skill points
         //Custom Job End
+>>>>>>> .r18
 
         // Bonuses from cards and equipment as well as base stat, remember to avoid overflows.
@@ -2144 +2254 @@
         if((skill=pc_checkskill(sd,CR_TRUST))>0)
                 status->max_hp += skill*200;
-
+        if((skill=pc_checkskill(sd,AD_PROFANE))>0) // Adept Profane Soul [Brain]
+        status->max_hp += status->max_hp * (skill*3)/100;
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         if((skill=pc_checkskill(sd,AD_PROFANE))>0) // Adept Profane Soul [Brain]
                 status->max_hp += status->max_hp * (skill*3)/100;
         //Custom Job End
+>>>>>>> .r18
 
         // Apply relative modifiers from equipment
@@ -2178 +2293 @@
         if((skill=pc_checkskill(sd,HW_SOULDRAIN))>0)
                 status->max_sp += status->max_sp * 2*skill/100;
-
+        if((skill=pc_checkskill(sd,AD_PROFANE))>0) // Adept Profane Soul [Brain]
+        status->max_sp += sd->status.max_sp * (skill*3)/100;
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         if((skill=pc_checkskill(sd,AD_PROFANE))>0) // Adept Profane Soul [Brain]
                 status->max_sp += sd->status.max_sp * (skill*3)/100;
         //Custom Job End
+>>>>>>> .r18
 
         // Apply relative modifiers from equipment
@@ -2276 +2396 @@
                 }
         }
-
+        if((skill=pc_checkskill(sd,AD_FERVOR))>0) // Adept Unholy Fevor [Brain]
+        status->hit += skill*2;
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         if((skill=pc_checkskill(sd,AD_FERVOR))>0) // Adept Unholy Fevor [Brain]
@@ -2282 +2406 @@
         //Custom Job End
 
+>>>>>>> .r18
 // ----- FLEE CALCULATION -----
 
@@ -2289 +2414 @@
         if((skill=pc_checkskill(sd,MO_DODGE))>0)
                 status->flee += (skill*3)>>1;
-
+        if((skill=pc_checkskill(sd,AD_FERVOR))>0) // Adept Unholy Fevor [Brain]
+        status->flee += skill*2;
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         if((skill=pc_checkskill(sd,AD_FERVOR))>0) // Adept Unholy Fevor [Brain]
@@ -2295 +2424 @@
         //Custom Job End
 
+>>>>>>> .r18
 // ----- EQUIPMENT-DEF CALCULATION -----
 
@@ -2304 +2434 @@
                 status->def = cap_value(i, CHAR_MIN, CHAR_MAX);
         }
+<<<<<<< .mine
+
+=======
         //Custom Jobs (blackmagic)
         // Absolute modifiers from passive skills
@@ -2309 +2442 @@
                 status->mdef += 1*skill;
         //Custom Job End
+>>>>>>> .r18
         if (!battle_config.weapon_defense_type && status->def > battle_config.max_def)
         {
@@ -2324 +2458 @@
                 status->mdef = cap_value(i, CHAR_MIN, CHAR_MAX);
         }
+        // Absolute modifiers from passive skills
+        if((skill=pc_checkskill(sd,AD_DARKFAITH))>0) // Adept Dark Faith [Brain]
+        status->mdef += 1*skill;
+
 
         if (!battle_config.magic_defense_type && status->mdef > battle_config.max_def)
@@ -2431 +2569 @@
         }
 
+<<<<<<< .mine
+        if((skill=pc_checkskill(sd,AD_DARKFAITH))>0) // Adept Dark Faith [Brain]
+        sd->subele[ELE_DARK] += skill*5;
+        if((skill=pc_checkskill(sd,WL_DEMONOLOGY))>0 ){ //Warlock Demonology [Brain]
+        skill = skill*5;
+        sd->right_weapon.addrace[RC_DEMON]+=skill;
+        sd->magic_addrace[RC_DEMON]+=skill;
+        sd->subrace[RC_DEMON]+=skill;
+=======
 
         //Custom Jobs (blackmagic)
@@ -2440 +2587 @@
                 sd->magic_addrace[RC_DEMON]+=skill;
                 sd->subrace[RC_DEMON]+=skill;
-        }
+>>>>>>> .r18
+        }
+<<<<<<< .mine
+        if((pc_checkskill(sd,NC_PHYLACTERY))>0){ // Necro Phylactery [Brain]
+        sd->subele[ELE_NEUTRAL] += 10;  //And increases neutral resistance by 10%
+        }
+=======
         if((pc_checkskill(sd,NC_PHYLACTERY))>0){ // Necro Phylactery [Brain]
                 sd->subele[ELE_NEUTRAL] += 10;  //And increases neutral resistance by 10%
         }
         //Custom Job End
+>>>>>>> .r18
+
 
         if(sc->count){
@@ -2468 +2623 @@
                         sd->subrace[RC_DEMON] += sc->data[SC_PROVIDENCE]->val2;
                 }
-
+                if(sd->sc.data[SC_DEATHPACT]) //Necro Death Pact [Brain]
+                sd->subele[ELE_NEUTRAL] += sd->sc.data[SC_DEATHPACT]->val2;
+
+<<<<<<< .mine
+=======
                 //Custom Jobs (blackmagic)
                 if(sd->sc.data[SC_DEATHPACT]) //Necro Death Pact [Brain]
@@ -2474 +2633 @@
                 //Custom Job End
 
+>>>>>>> .r18
                 if(sc->data[SC_ARMOR_ELEMENT])
                 {       //This status change should grant card-type elemental resist.
@@ -2629 +2789 @@
         status->rhw.atk2 = status->str + hom->level;
 
+        /*Passive bonus from Wolf Mastery (will only take effect when first created or level up) [Brainstorm]
+        if((skill=pc_checkskill(hd->master,QHT_WOLFMASTERY)) > 0)
+        {
+        status->rhw.atk +=      skill * 3;
+        status->rhw.atk2 +=     skill * 3;
+        status->str +=  skill;
+        status->agi +=  skill;
+        status->vit +=  skill;
+        status->dex +=  skill;
+        status->int_ += skill;
+        status->luk +=  skill;
+        }*/
+
+
         status->aspd_rate = 1000;
 
@@ -2795 +2969 @@
                 || sc->data[SC_TRICKDEAD]
                 || sc->data[SC_BLEEDING]
+<<<<<<< .mine
+                || sc->data[SC_LUST]    // Adept Blood Lust, stops hp regen [Brain]
+=======
                 //Custom Jobs (blackmagic)
                 || sc->data[SC_LUST]            // Adept Blood Lust, stops hp regen [Brain]
+>>>>>>> .r18
                 || sc->data[SC_DEATHPACT]       // Necro Death Pact
-                //Custom Job End
+
         )       //No regen
                 regen->flag = 0;
@@ -2807 +2985 @@
                 || (sc->data[SC_EXPLOSIONSPIRITS]
                         && (!sc->data[SC_SPIRIT] || sc->data[SC_SPIRIT]->val2 != SL_MONK))
-//Custom Jobs (blackmagic)
                 || sc->data[SC_OVERWHELMING]    // Warlock Overwhelming Evil, stops sp regen [Brain]
-//Custom Job End
+
         )       //No natural SP regen
                 regen->flag &=~RGN_SP;
@@ -3578 +3755 @@
         if(sc->data[SC_MADNESSCANCEL])
                 batk += 100;
+<<<<<<< .mine
+        if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
+        batk += batk * sc->data[SC_LUST]->val2/100;
+        if(sc->data[SC_CURSEWEAKNESS]) // Warlock Curse of Weakness [Brain]
+        batk -= batk * sc->data[SC_CURSEWEAKNESS]->val2/100;
+        if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
+        if(sc->data[SC_DECREPIFY]->val2>=2)
+                batk -= batk * 25/100;
+
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
@@ -3588 +3775 @@
         
         //Custom Job End
+>>>>>>> .r18
         return (unsigned short)cap_value(batk,0,USHRT_MAX);
 }
@@ -3630 +3818 @@
         if(sc->data[SC_STRIPWEAPON])
                 watk -= watk * sc->data[SC_STRIPWEAPON]->val2/100;
+<<<<<<< .mine
+        if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
+        watk += watk * sc->data[SC_LUST]->val2/100;
+        if(sc->data[SC_REQUIEM]){       //Necro Requiem [Brain]
+        if(sc->data[SC_REQUIEM]->val2)
+                watk += sc->data[SC_REQUIEM]->val2*10;
+        if(sc->data[SC_REQUIEM]->val3)
+                watk -= sc->data[SC_REQUIEM]->val3*10;
+        }
+        if(sc->data[SC_CURSEWEAKNESS]) // Warlock Curse of Weakness [Brain]
+        watk -= watk * sc->data[SC_CURSEWEAKNESS]->val2/100;
+        if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
+        if(sc->data[SC_DECREPIFY]->val2>=2)
+                watk -= watk * 25/100;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
@@ -3645 +3848 @@
                         watk -= watk * 25/100;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (unsigned short)cap_value(watk,0,USHRT_MAX);
@@ -3664 +3869 @@
         if(sc->data[SC_INCMATKRATE])
                 matk += matk * sc->data[SC_INCMATKRATE]->val1/100;
+<<<<<<< .mine
+        if(sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
+        matk += matk * sc->data[SC_OVERWHELMING]->val2/100;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
                 matk += matk * sc->data[SC_OVERWHELMING]->val2/100;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (unsigned short)cap_value(matk,0,USHRT_MAX);
@@ -3715 +3926 @@
         if(sc->data[SC_INCREASING])
                 hit += 20; // RockmanEXE; changed based on updated [Reddozen]
+<<<<<<< .mine
+        if(sc->data[SC_DARKMOON]){      //Necro Dark Moon [Brain]
+        if(sc->data[SC_DARKMOON]->val2)
+                hit += sc->data[SC_DARKMOON]->val2;
+        if(sc->data[SC_DARKMOON]->val3)
+                hit -= sc->data[SC_DARKMOON]->val3;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_DARKMOON]){      //Necro Dark Moon [Brain]
@@ -3721 +3939 @@
                 if(sc->data[SC_DARKMOON]->val3)
                         hit -= sc->data[SC_DARKMOON]->val3;
-        }
-        //Custom Job End
+>>>>>>> .r18
+        }
+
         
         return (short)cap_value(hit,1,SHRT_MAX);
@@ -3763 +3982 @@
         if(sc->data[SC_SPEED])
                 flee += 10 + sc->data[SC_SPEED]->val1 * 10 ;
+<<<<<<< .mine
+        if(sc->data[SC_DARKMOON]){      //Necro Dark Moon [Brain]
+        if(sc->data[SC_DARKMOON]->val2)
+                flee += sc->data[SC_DARKMOON]->val2;
+        if(sc->data[SC_DARKMOON]->val3)
+                flee -= sc->data[SC_DARKMOON]->val3;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_DARKMOON]){      //Necro Dark Moon [Brain]
@@ -3769 +3995 @@
                 if(sc->data[SC_DARKMOON]->val3)
                         flee -= sc->data[SC_DARKMOON]->val3;
-        }
-        //Custom Job End
+>>>>>>> .r18
+        }
+
 
         return (short)cap_value(flee,1,SHRT_MAX);
@@ -3829 +4056 @@
         if (sc->data[SC_FLING])
                 def -= def * (sc->data[SC_FLING]->val2)/100;
+<<<<<<< .mine
+        if(sc->data[SC_SUFFER]) // Necro Power Word: Suffer [Brain]
+        def <<=1; // -25% def
+        if (sc->data[SC_CURSEEXHAUST]) // Warlock Curse of Exhaustion [Brain]
+        def -= sc->data[SC_CURSEEXHAUST]->val2;
+        if (sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
+         def += sc->data[SC_OVERWHELMING]->val1;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_SUFFER]) // Necro Power Word: Suffer [Brain]
@@ -3837 +4072 @@
                 def += sc->data[SC_OVERWHELMING]->val1;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (signed char)cap_value(def,CHAR_MIN,CHAR_MAX);
@@ -3871 +4108 @@
         if(sc->data[SC_FLING])
                 def2 -= def2 * (sc->data[SC_FLING]->val3)/100;
-
+        if(sc->data[SC_SUFFER]) // Necro Power Word: Suffer [Brain]
+        def2 -= def2 * 25/100; // -25% def
+        if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
+        if(sc->data[SC_DECREPIFY]->val2>=4)
+                def2 -= def2 * 25/100;
+
+<<<<<<< .mine
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_SUFFER]) // Necro Power Word: Suffer [Brain]
@@ -3879 +4123 @@
                         def2 -= def2 * 25/100;
         //Custom Job End
+>>>>>>> .r18
 
         return (short)cap_value(def2,1,SHRT_MAX);
@@ -3906 +4151 @@
         if(sc->data[SC_CONCENTRATION])
                 mdef += 1; //Skill info says it adds a fixed 1 Mdef point.
+<<<<<<< .mine
+        if(sc->data[SC_AGONY])   // Warlock Power Word: Agony [Brain]
+        mdef -= 25*mdef/100; // -25% mdef
+        if (sc->data[SC_CURSEEXHAUST]) // Warlock Curse of Exhaustion [Brain]
+        mdef -= sc->data[SC_CURSEEXHAUST]->val2;
+        if (sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
+         mdef += sc->data[SC_OVERWHELMING]->val1;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_AGONY])   // Warlock Power Word: Agony [Brain]
@@ -3914 +4167 @@
                 mdef += sc->data[SC_OVERWHELMING]->val1;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (signed char)cap_value(mdef,CHAR_MIN,CHAR_MAX);
@@ -3927 +4182 @@
         if(sc->data[SC_MINDBREAKER])
                 mdef2 -= mdef2 * sc->data[SC_MINDBREAKER]->val3/100;
+<<<<<<< .mine
+        if(sc->data[SC_AGONY])   // Warlock Power Word: Agony [Brain]
+        mdef2 -= mdef2 * 25/100; // -25% mdef
+        if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
+        if(sc->data[SC_DECREPIFY]->val2>=5)
+                mdef2 -= mdef2 * 25/100;
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_AGONY])   // Warlock Power Word: Agony [Brain]
@@ -3934 +4196 @@
                         mdef2 -= mdef2 * 25/100;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (short)cap_value(mdef2,1,SHRT_MAX);
@@ -3987 +4251 @@
                         else if(sc->data[SC_WINDWALK])
                                 new_speed -= new_speed * sc->data[SC_WINDWALK]->val3/100;
+<<<<<<< .mine
+                else if(sc->data[SC_FEAR]) //Fear Status by [Brainstorm]
+                new_speed -= new_speed * 25/100;
+
+=======
                         //Custom Jobs (blackmagic)
                         else if(sc->data[SC_FEAR]) //Fear Status by [Brainstorm]
                                 new_speed -= new_speed * 25/100;
                         //Custom Job End
+>>>>>>> .r18
                 }
 
@@ -4034 +4304 @@
         if(sc->data[SC_SLOWDOWN])
                 speed = speed * 100/75;
+<<<<<<< .mine
+        if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
+        speed = speed * 100/75; //-25% walkspeed
+
+=======
         //Custom Jobs (blackmagic)
         if(sc->data[SC_DECREPIFY]) // Necromancer Decrepify [Brain]
                 speed = speed * 100/75; //-25% walkspeed
         //Custom Job End
+>>>>>>> .r18
         
         return (short)cap_value(speed,10,USHRT_MAX);
@@ -4108 +4384 @@
                 else if(sc->data[SC_MADNESSCANCEL])
                         aspd_rate -= 200;
+<<<<<<< .mine
+        else if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
+                aspd_rate -= sc->data[SC_LUST]->val2*10;
+
+=======
                 //Custom Jobs (blackmagic)
                 else if(sc->data[SC_LUST]) // Adept Blood Lust [Brain]
                         aspd_rate -= sc->data[SC_LUST]->val2*10;
                 //Custom Job End
+>>>>>>> .r18
         }
 
@@ -4205 +4487 @@
         if(sc->data[SC_ELEMENTALCHANGE])
                 return sc->data[SC_ELEMENTALCHANGE]->val2;
+<<<<<<< .mine
+        if( sc->data[SC_DEATHPACT]) // Necro Death Pact [Brain]
+        return ELE_UNDEAD;
+        if( sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
+        return ELE_DARK;
+
+=======
         //Custom Jobs (blackmagic)
         if( sc->data[SC_DEATHPACT]) // Necro Death Pact [Brain]
@@ -4211 +4500 @@
                 return ELE_DARK;
         //Custom Job End
+>>>>>>> .r18
         return (unsigned char)cap_value(element,0,UCHAR_MAX);
 }
@@ -4229 +4519 @@
         if(sc->data[SC_ELEMENTALCHANGE])
                 return sc->data[SC_ELEMENTALCHANGE]->val1;
+<<<<<<< .mine
+        if( sc->data[SC_DEATHPACT]) // Necro Death Pact [Brain]
+        return 1;
+        if( sc->data[SC_OVERWHELMING]) // Warlock Overwhelming Evil [Brain]
+        return 1;
+=======
         //Custom Jobs (blackmagic)
         if( sc->data[SC_DEATHPACT]) // Necro Death Pact [Brain]
@@ -4235 +4531 @@
                 return 1;
         //Custom Job End
+>>>>>>> .r18
+
 
         return (unsigned char)cap_value(lv,1,4);
@@ -4972 +5270 @@
         case SC_CARTBOOST:
         case SC_ASSNCROS:
-        //Custom Jobs (blackmagic)
         case SC_LUST: // Adept Blood Lust [Brain]
-        //Custom Job End
+
                 if (sc->data[SC_QUAGMIRE])
                         return 0;
@@ -5092 +5389 @@
                         case SC_RICHMANKIM:
                         case SC_ROKISWEIL:
+                //New status [Brainstorm]
+                case SC_FEAR:
+                case SC_DECREPIFY:
+                case SC_DARKMOON:
+                case SC_REQUIEM:
+                case SC_CURSETONGUES:
+                case SC_CURSEWEAKNESS:
+                case SC_CURSEEXHAUST:
+
                         case SC_FOGWALL:
+<<<<<<< .mine
+=======
                         //Custom Jobs (blackmagic)
                         //New status [Brainstorm]
@@ -5103 +5411 @@
                         case SC_CURSEEXHAUST:
                         //Custom Job End
+>>>>>>> .r18
                                 return 0;
                 }
@@ -5118 +5427 @@
                         if (sc->data[SC_STONE] && sc->opt1 == OPT1_STONE)
                                 status_change_end(bl,SC_STONE,-1);
+<<<<<<< .mine
+                // Warlock Curses are canceled by blessing [Brain]
+                if (sc->data[SC_CURSEWEAKNESS])
+                status_change_end(bl,SC_CURSEWEAKNESS,-1);
+                if (sc->data[SC_CURSETONGUES])
+                status_change_end(bl,SC_CURSETONGUES,-1);
+                if (sc->data[SC_CURSEEXHAUST])
+                status_change_end(bl,SC_CURSEEXHAUST,-1);
+                if (sc->data[SC_DOOM]) // This skill would be way funnier if we could igore this concept, no?
+                status_change_end(bl,SC_DOOM,-1);//But then people would abuse on WoEs
+
+=======
                         //Custom Jobs (blackmagic)
                         // Warlock Curses are canceled by blessing [Brain]
@@ -5129 +5450 @@
                                 status_change_end(bl,SC_DOOM,-1);//But then people would abuse on WoEs
                         //Custom Job End
-                }
-                break;
+>>>>>>> .r18
+                }
+                break;
+<<<<<<< .mine
+        case SC_CURSEWEAKNESS: // Warlock Curse of Weakness removes Impositio Manus [Brain]
+        if (sc->data[SC_IMPOSITIO])
+                status_change_end(bl,SC_IMPOSITIO,-1);
+        if (sc->data[SC_BLESSING]) //The opposite is also valid, curses cancel blessing [Brain]
+                status_change_end(bl,SC_BLESSING,-1);
+        break;
+        case SC_CURSETONGUES: // Warlock Curse of Tongues removes Suffragium [Brain]
+        if (sc->data[SC_SUFFRAGIUM])
+                status_change_end(bl,SC_SUFFRAGIUM,-1);
+        if (sc->data[SC_BLESSING])
+                status_change_end(bl,SC_BLESSING,-1);
+        break;
+        case SC_CURSEEXHAUST: // Warlock Curse of Exhaustion removes angelus [Brain]
+        if (sc->data[SC_ANGELUS])
+                status_change_end(bl,SC_ANGELUS,-1);
+        case SC_DOOM:
+        if (sc->data[SC_BLESSING])
+                status_change_end(bl,SC_BLESSING,-1);
+        break;
+        case SC_IMPOSITIO: // Impositio Manus removes Curse of Weakness [Brain]
+        if (sc->data[SC_CURSEWEAKNESS])
+                status_change_end(bl,SC_CURSEWEAKNESS,-1);
+        break;
+        case SC_SUFFRAGIUM: // Suffragium removes Curse of Tongues [Brain]
+        if (sc->data[SC_CURSETONGUES])
+                status_change_end(bl,SC_CURSETONGUES,-1);
+        break;
+        case SC_ANGELUS: // Angelus removes Curse of Exhaustion [Brain]
+        if (sc->data[SC_CURSEEXHAUST])
+                status_change_end(bl,SC_CURSEEXHAUST,-1);
+        break;
+
+=======
                 //Custom Jobs (blackmagic)
         case SC_CURSEWEAKNESS: // Warlock Curse of Weakness removes Impositio Manus [Brain]
@@ -5164 +5520 @@
                 break;
                 //Custom Job End
+>>>>>>> .r18
         case SC_INCREASEAGI:
                 status_change_end(bl,SC_DECREASEAGI,-1);
@@ -5182 +5539 @@
                 status_change_end(bl,SC_TWOHANDQUICKEN,-1);
                 status_change_end(bl,SC_ONEHAND,-1);
+<<<<<<< .mine
+                if(sc->data[SC_LUST])   // Adept Blood Lust [Brain]
+=======
                 //Custom Jobs (blackmagic)
                 if(sc->data[SC_LUST])   // Adept Blood Lust [Brain]
+>>>>>>> .r18
                 status_change_end(bl,SC_LUST,-1);
-                //Custom Job End
+
                 break;
         case SC_ONEHAND:
@@ -5244 +5605 @@
                 status_change_end(bl,SC_MADNESSCANCEL,-1);
                 break;
+<<<<<<< .mine
+        case SC_FREEZE: //Frozen status ends immolating AND searing status [Brain]
+        if(sc->data[SC_IMMOLATE])
+                status_change_end(bl,SC_IMMOLATE,-1);
+        case SC_IMMOLATE: // Warlock Immolate [Brain]
+        if(sc->data[SC_SEARING]) //Immolating status ends searing status
+                status_change_end(bl,SC_SEARING,-1);
+        break;
+
+=======
                 //Custom Jobs (blackmagic)
         case SC_FREEZE: //Frozen status ends immolating AND searing status [Brain]
@@ -5253 +5624 @@
                 break;
                 //Custom Job End
+>>>>>>> .r18
         case SC_MADNESSCANCEL:
                 status_change_end(bl,SC_ADJUSTMENT,-1);
@@ -5284 +5656 @@
                         case SC_SILENCE:
                         case SC_CONFUSION:
-                                //Custom Jobs (blackmagic)
                         case SC_FEAR: //Fear Status by [Brainstorm]
-                                //Custom Job End
                         case SC_BLIND:
                         case SC_BLEEDING:
@@ -5596 +5966 @@
                         clif_emotion(bl,1);
                         break;
+<<<<<<< .mine
+        case SC_FEAR: //Fear Status by [Brainstorm]
+                clif_emotion(bl,16); // e_wah
+                if(sd) tick /= 2;
+                break;
+
+=======
                         //Custom Jobs (blackmagic)
                 case SC_FEAR: //Fear Status by [Brainstorm]
@@ -5602 +5979 @@
                         break;
                         //Custom Job End
+>>>>>>> .r18
                 case SC_BLEEDING:
                         val4 = tick/10000;
@@ -5979 +6357 @@
                         break;
 
+<<<<<<< .mine
+        case SC_ATFIELD: // AT-Field [Brainstorm]
+                val2 = 100; // 100% Block chance
+                val3 = 100; // Dodge 100 attacks total.
+                val4 = tick/1000;
+                tick = 1000;
+                break;
+=======
                         //Custom Jobs (blackmagic)
                 case SC_ATFIELD: // AT-Field [Brainstorm]
@@ -5987 +6373 @@
                         break;
                         //Custom Job End
+>>>>>>> .r18
+
 
                 case SC_COMBO:
@@ -6035 +6423 @@
                                 val2 = 0; //0 -> Half stat.
                         break;
+<<<<<<< .mine
+        case SC_REQUIEM: //Necro Requiem and Dark Moon [Brain]
+        case SC_DARKMOON:
+                if (undead_flag || status->race==RC_UNDEAD || status->race==RC_DEMON)
+                val2 = val1; //Demon and Undead get buffed
+                else if(status->race==RC_FORMLESS || status->def_ele==ELE_GHOST || bl->type == BL_PC)
+                {
+                val1 = 0; //No status change for Formless and Ghosts, and non-undead players
+                tick = 0; //Cancel status to not show requiem icon without a reason
+                }
+                else
+                val3 = val1; //Everything else (living) get negative status (requiem only)
+=======
                         //Custom Jobs (blackmagic)
                 case SC_REQUIEM: //Necro Requiem and Dark Moon [Brain]
@@ -6050 +6451 @@
                 case SC_DECREPIFY: //Necro Decrepify [Brain]
                         val2 = val1;
-                break;
-                        //Custom Job End
+>>>>>>> .r18
+                break;
+        case SC_DECREPIFY: //Necro Decrepify [Brain]
+                val2 = val1;
+        break;
+
                 case SC_TRICKDEAD:
                         if (vd) vd->dead_sit = 1;
@@ -6092 +6497 @@
                         val2 = 5*val1; //watk increase
                         break;
+<<<<<<< .mine
+        case SC_CURSEWEAKNESS: // Warlock Curse of Weakness [Brain]
+                val2 = 5*val1; //batk/watk decrease
+                break;
+        case SC_CURSEEXHAUST: // Warlock Curse of Exhaustion [Brain]
+                val2 = 2*val1; //def/mdef decrease
+                break;
+        case SC_CURSETONGUES: // Warlock Curse of Tongues [Brain]
+                val2 = 10*val1; //casttime increase
+                break;
+
+=======
                         //Custom Jobs (blackmagic)
                 case SC_CURSEWEAKNESS: // Warlock Curse of Weakness [Brain]
@@ -6103 +6520 @@
                         break;
                         //Custom Job End
+>>>>>>> .r18
                 case SC_MELTDOWN:
                         val2 = 100*val1; //Chance to break weapon
@@ -6158 +6576 @@
                         val3 = 5+5*val1; //bAtk/wAtk rate change
                         break;
+<<<<<<< .mine
+                case SC_LUST: // Adept Blood Lust [Brain]
+                val2 = 5+3*val1; //Aspd/bAtk/wAtk change
+                val3 = tick>0?tick:1000; //Interval at which HP is drained.
+                break;
+        case SC_DEATHPACT: // Necro Death Pact [Brain]
+                val2 = 5*val1; //Neutral property resistance
+                val3 = tick>0?tick:10000; //Interval at which HP is drained.
+                break;
+        case SC_OVERWHELMING: // Warlock Overwhelming Evil [Brain]
+                val2 = 2*val1; //matk bonus
+                val3 = tick>0?tick:1000; //Interval at which SP is drained.
+                break;
+
+=======
                         //Custom Jobs (blackmagic)
                 case SC_LUST: // Adept Blood Lust [Brain]
@@ -6172 +6605 @@
                         break;
                         //Custom Job End
+>>>>>>> .r18
                 case SC_MINDBREAKER:
                         val2 = 20*val1; //matk increase.
@@ -6355 +6789 @@
                                 unit_skillcastcancel(bl, 0);
                 break;
+<<<<<<< .mine
+
+        case SC_FEAR: //Fear Status by [Brainstorm]
+                unit_stop_attack(bl);
+        break;
+
+
+=======
                 //Custom Jobs (blackmagic)
                 case SC_FEAR: //Fear Status by [Brainstorm]
@@ -6360 +6802 @@
                 break;
                 //Custom Job End
+>>>>>>> .r18
         }
 
@@ -6794 +7237 @@
                                 clif_status_change(bl,SI_MOONLIT,0);
 
-                        status_change_end(bl,SC_LONGING,-1);                            
+                        status_change_end(bl,SC_LONGING,-1);
                         break;
                 case SC_NOCHAT:
@@ -6805 +7248 @@
                         }
                         break;
+<<<<<<< .mine
+        case SC_SPLASHER:
+        case SC_DOOM: // Warlock Curse of Doom [Brain]
+        
+=======
 //Custom Jobs (blackmagic)
                 case SC_SPLASHER:
                 case SC_DOOM: // Warlock Curse of Doom [Brain]
 //Custom Job End
+>>>>>>> .r18
                         {
                                 struct block_list *src=map_id2bl(sce->val3);
@@ -7176 +7625 @@
                 sc_timer_next(sce->val2+tick, status_change_timer, bl->id, data);
                 return 0;
+<<<<<<< .mine
+=======
                 //Custom Jobs (blackmagic)
         case SC_LUST:   // Adept Blood Lust [Brain]
@@ -7193 +7644 @@
                 return 0;
                 //Custom Job End
+>>>>>>> .r18
+
+        case SC_LUST:   // Adept Blood Lust [Brain]
+        if(!status_charge(bl, status->max_hp/100, 0))
+                break; //Not enough HP to continue.
+        sc_timer_next(sce->val3+tick, status_change_timer, bl->id, data);
+        return 0;
+        case SC_DEATHPACT:      // Necro Death Pact [Brain]
+         // Drains 1 HP every second (status wont kill, but dying will cancel it)
+        status_charge(bl, 1, 0);
+        sc_timer_next(sce->val3+tick, status_change_timer, bl->id, data);
+        return 0;
+        case SC_OVERWHELMING:   // Warlock Overwhelming Evil [Brain]
+        if(!status_charge(bl, 0, status->max_sp/100))
+                break; //Not enough SP to continue.
+        sc_timer_next(sce->val3+tick, status_change_timer, bl->id, data);
+        return 0;
+
 
         case SC_CHASEWALK:
@@ -7427 +7896 @@
                 }
                 break;
+<<<<<<< .mine
+        case SC_DOOM: // Warlock Curse of Doom [Brain]
+        if((sce->val4 -= 500) > 0) {
+                sc_timer_next(500 + tick, status_change_timer, bl->id, data);
+                return 0;
+        }
+        break;
+=======
                 //Custom Jobs (blackmagic)
         case SC_DOOM: // Warlock Curse of Doom [Brain]
@@ -7435 +7912 @@
                 break;
                 //Custom Job End
+>>>>>>> .r18
 
         case SC_MARIONETTE:
@@ -7602 +8080 @@
                         case SC_WATKFOOD:
                         case SC_MATKFOOD:
-                                //Custom Jobs (blackmagic)
                         case SC_DOOM: // Warlock Curse of Doom [Brain]
-                                //Custom Job End
+
                                 continue;