From 210c963d2851eb880ba3560998ee984d942cde19 Mon Sep 17 00:00:00 2001 From: malufett Date: Wed, 11 Mar 2015 13:02:41 +0800 Subject: RENEWAL Updates: -Fixed card bonuses related to to ATK.(Added 'bRaceTolerance'). Thanks Michi for the support. -Fixed Renewal EDP. Special thanks to Awesome Yommy <3 -Enabled 'display_skill_fail' since '/skillfail' is already available in the client Signed-off-by: malufett --- db/const.txt | 1 + db/pet_db.txt | 6 +- db/re/item_db.conf | 339 ++++++++++++++++++++++++++++------------------------- 3 files changed, 185 insertions(+), 161 deletions(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index c7fff2825..0fec098ef 100644 --- a/db/const.txt +++ b/db/const.txt @@ -593,6 +593,7 @@ bFixedCast 2057 bVariableCast 2058 bSetDefRace 2059 bSetMDefRace 2060 +bAddRaceTolerance 2061 //reference to script.c::script_defaults():equip[] array used for easy-conversion EQI_HEAD_TOP 1 diff --git a/db/pet_db.txt b/db/pet_db.txt index a95154974..fdfc69748 100644 --- a/db/pet_db.txt +++ b/db/pet_db.txt @@ -77,12 +77,12 @@ 1101,BAPHOMET_,Baphomet Jr.,642,9024,10001,518,80,60,10,100,250,20,200,150,0,0,1000,100,200,{ petskillattack "NPC_DARKNESSATTACK",1776,4,0,5; },{ bonus bDef,1; bonus bMdef,1; bonus2 bResEff,Eff_Stun,-100; } 1188,BON_GUN,Bon Gun,659,9025,10020,537,80,60,30,100,250,20,500,150,1,0,600,200,400,{ petskillattack "NPC_DARKNESSATTACK",555,1,1,1; },{ bonus bVit,1; bonus2 bResEff,Eff_Stun,100; } 1200,ZHERLTHSH,Zealotus,660,9026,0,929,80,60,10,100,250,20,300,150,0,0,1000,100,500,{ petskillattack "AS_SONICBLOW",1,0,0,3; },{ bonus2 bAddRace,RC_DemiHuman,2; bonus2 bMagicAddRace,RC_DemiHuman,2; } -1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; bonus2 bSubRace,RC_DemiHuman,1; } +1275,ALICE,Alice,661,9027,0,504,80,60,20,100,250,20,800,150,0,0,100,1000,200,{ petskillsupport "AL_HEAL",5,60,25,100; },{ bonus bMdef,1; if(checkre(0)){bonus2 bAddRaceTolerance,RC_DemiHuman,1;}else{bonus2 bSubRace,RC_DemiHuman,1;} } 1815,EVENT_RICECAKE,Rice Cake,0,9028,0,511,80,60,50,100,250,20,2000,150,1,0,500,500,200,{ petskillsupport "CR_DEFENDER",3,240,50,100; },{ bonus2 bSubEle,Ele_Neutral,1; bonus bMaxHPrate,-1; } 1245,GOBLINE_XMAS,Christmas Goblin,12225,9029,0,911,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "MG_SIGHT",5,0,5,5; },{ bonus bMaxHP,30; bonus2 bSubEle,Ele_Water,1; } // Newest pets. -1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; bonus2 bSubRace,RC_DemiHuman,1; } +1519,CHUNG_E,Green Maiden,12395,9030,0,6115,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "CR_SHIELDCHARGE",5,0,5,5; },{ bonus bDef,1; if(checkre(0)){bonus2 bAddRaceTolerance,RC_DemiHuman,1;}else{bonus2 bSubRace,RC_DemiHuman,1;} } 1879,ECLIPSE_P,Spring Rabbit,0,9031,0,7766,80,60,50,100,250,20,2000,150,0,0,300,300,800,{ petskillattack "TF_THROWSTONE",1,0,5,5; },{} 1122,GOBLIN_1,Goblin,14569,9032,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_WINDATTACK",5,0,5,5; },{} 1123,GOBLIN_2,Goblin,14570,9033,0,7821,80,60,50,100,250,20,800,150,0,0,300,300,800,{ petskillattack "NPC_FIREATTACK",5,0,5,5; },{} @@ -109,7 +109,7 @@ 1504,DULLAHAN,Dullahan,12367,9049,10031,6107,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus bCritAtkRate,5; } 1505,LOLI_RURI,Loli Ruri,12360,9042,10024,6097,80,60,15,100,250,20,200,150,0,0,300,300,800,{},{ bonus bMaxHPrate,3; bonus3 bAutoSpellWhenHit,"AL_HEAL",1,50; } 1513,CIVIL_SERVANT,Mao Guai,12358,9040,10022,6095,80,60,10,100,250,20,500,150,0,0,300,300,800,{},{ bonus bMaxSP,10; } -1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubRace,RC_Brute,3; } +1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ if(checkre(0)){bonus2 bAddRaceTolerance,RC_Brute,2;}else{bonus2 bSubRace,RC_Brute,3;} } 1630,BACSOJIN_,White Lady,12357,9039,10021,6094,80,60,10,100,250,20,2000,150,0,0,300,300,800,{},{} 1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; } diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 796297709..4377d5c6e 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1,4 +1,4 @@ -item_db: ( +item_db: ( // Items Database // /****************************************************************************** @@ -6963,7 +6963,7 @@ item_db: ( Script: <" bonus bIgnoreDefRace,RC_Plant; bonus2 bAddRace,RC_Plant,15; - bonus2 bSubRace,RC_Plant,15; + bonus2 bAddRaceTolerance,RC_Plant,15; "> }, { @@ -6983,7 +6983,7 @@ item_db: ( View: 1 Script: <" bonus bIgnoreDefRace,RC_DemiHuman; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; bonus2 bSubRace,RC_Demon,-10; "> }, @@ -7086,7 +7086,7 @@ item_db: ( View: 1 Script: <" bonus bIgnoreDefRace,RC_Demon; - bonus2 bSubRace,RC_Demon,5; + bonus2 bAddRaceTolerance,RC_Demon,5; bonus2 bSubRace,RC_DemiHuman,-10; "> }, @@ -8498,7 +8498,7 @@ item_db: ( EquipLv: 44 View: 6 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus3 bAddMonsterDropItem,517,RC_Brute,3000; "> }, @@ -11116,8 +11116,8 @@ item_db: ( bonus2 bAddRace,RC_Demon,20; bonus2 bAddRace,RC_Undead,20; bonus2 bSubEle,Ele_Dark,10; - bonus2 bSubRace,RC_Demon,10; - bonus2 bSubRace,RC_Undead,10; + bonus2 bAddRaceTolerance,RC_Demon,10; + bonus2 bAddRaceTolerance,RC_Undead,10; bonus3 bAddEff,Eff_Confusion,10000,ATF_SELF|ATF_SHORT; bonus bHPGainValue,50; "> @@ -11165,8 +11165,8 @@ item_db: ( bonus2 bAddRace,RC_Demon,20; bonus2 bAddRace,RC_Undead,20; bonus2 bSubEle,Ele_Dark,10; - bonus2 bSubRace,RC_Demon,10; - bonus2 bSubRace,RC_Undead,10; + bonus2 bAddRaceTolerance,RC_Demon,10; + bonus2 bAddRaceTolerance,RC_Undead,10; bonus3 bAddEff,Eff_Confusion,10000,ATF_SELF|ATF_SHORT; bonus bHPGainValue,50; "> @@ -18452,8 +18452,8 @@ item_db: ( Script: <" bonus bAtkEle,Ele_Holy; bonus bDex,4; - bonus2 bSubRace,RC_Demon,15; - bonus2 bSubRace,RC_Undead,15; + bonus2 bAddRaceTolerance,RC_Demon,15; + bonus2 bAddRaceTolerance,RC_Undead,15; "> }, { @@ -19138,7 +19138,7 @@ item_db: ( Loc: 32 EquipLv: 20 View: 1 - Script: <" bonus2 bSubRace,RC_Demon,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_Demon,5; "> }, { Id: 2117 @@ -19235,7 +19235,7 @@ item_db: ( bonus bMdef,5; bonus2 bSubSize,Size_Medium,15; bonus2 bSubSize,Size_Large,15; - bonus2 bSubRace,RC_Undead,10; + bonus2 bAddRaceTolerance,RC_Undead,10; bonus5 bAutoSpellWhenHit,NPC_MAGICMIRROR,2,150,BF_MAGIC,0; "> }, @@ -20326,7 +20326,7 @@ item_db: ( Loc: 256 Refine: false View: 4 - Script: <" bonus2 bSubRace,RC_Plant,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,10; "> }, { Id: 2208 @@ -20946,7 +20946,7 @@ item_db: ( Loc: 256 Refine: false View: 37 - Script: <" bonus2 bSubRace,RC_Insect,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_Insect,10; "> }, { Id: 2254 @@ -20964,7 +20964,7 @@ item_db: ( bonus bMdef,3; bonus bAgi,1; bonus bLuk,1; - bonus2 bSubRace,RC_Demon,3; + bonus2 bAddRaceTolerance,RC_Demon,3; "> }, { @@ -20982,7 +20982,7 @@ item_db: ( Script: <" bonus bMdef,2; bonus bStr,1; - bonus2 bSubRace,RC_Angel,3; + bonus2 bAddRaceTolerance,RC_Angel,3; "> }, { @@ -21101,7 +21101,7 @@ item_db: ( Loc: 769 Refine: false View: 51 - Script: <" bonus2 bSubRace,RC_Undead,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_Undead,10; "> }, { Id: 2265 @@ -21143,7 +21143,7 @@ item_db: ( Loc: 1 Refine: false View: 54 - Script: <" bonus2 bSubRace,RC_Insect,3; "> + Script: <" bonus2 bAddRaceTolerance,RC_Insect,3; "> }, { Id: 2268 @@ -21157,7 +21157,7 @@ item_db: ( Loc: 1 Refine: false View: 55 - Script: <" bonus2 bSubRace,RC_Insect,3; "> + Script: <" bonus2 bAddRaceTolerance,RC_Insect,3; "> }, { Id: 2269 @@ -21171,7 +21171,7 @@ item_db: ( Loc: 1 Refine: false View: 56 - Script: <" bonus2 bSubRace,RC_Plant,3; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,3; "> }, { Id: 2270 @@ -21185,7 +21185,7 @@ item_db: ( Loc: 1 Refine: false View: 57 - Script: <" bonus2 bSubRace,RC_Plant,3; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,3; "> }, { Id: 2271 @@ -21439,7 +21439,7 @@ item_db: ( Loc: 256 Refine: false View: 76 - Script: <" bonus2 bSubRace,RC_DemiHuman,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { Id: 2290 @@ -21933,7 +21933,7 @@ item_db: ( EquipLv: 60 Script: <" bonus bMdef,5; - bonus2 bSubRace,RC_Demon,15; + bonus2 bAddRaceTolerance,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; "> }, @@ -22606,7 +22606,7 @@ item_db: ( } Script: <" bonus bUnbreakableArmor,0; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { @@ -22680,7 +22680,7 @@ item_db: ( EquipLv: 60 Script: <" bonus bMdef,5; - bonus2 bSubRace,RC_Demon,15; + bonus2 bAddRaceTolerance,RC_Demon,15; bonus2 bSubEle,Ele_Dark,10; "> }, @@ -22748,7 +22748,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22774,7 +22774,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22800,7 +22800,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22826,7 +22826,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22852,7 +22852,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22878,7 +22878,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -22904,7 +22904,7 @@ item_db: ( Script: <" bonus bMaxHP,150; bonus bMdef,2; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -23167,7 +23167,7 @@ item_db: ( } Script: <" bonus bMaxHPrate,20; - bonus2 bSubRace,RC_DemiHuman,7; + bonus2 bAddRaceTolerance,RC_DemiHuman,7; "> }, { @@ -23700,7 +23700,7 @@ item_db: ( Upper: 63 Loc: 64 Refine: false - Script: <" bonus2 bSubRace,RC_DemiHuman,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { Id: 2429 @@ -23836,7 +23836,7 @@ item_db: ( Script: <" bonus bMaxHP,100; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -23862,7 +23862,7 @@ item_db: ( Script: <" bonus bMaxHP,100; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -23888,7 +23888,7 @@ item_db: ( Script: <" bonus bMaxHP,100; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -24024,7 +24024,7 @@ item_db: ( } Script: <" bonus bMaxHPrate,10; - bonus2 bSubRace,RC_DemiHuman,4; + bonus2 bAddRaceTolerance,RC_DemiHuman,4; bonus3 bAutoSpellWhenHit,AL_INCAGI,1,10; "> }, @@ -24533,16 +24533,16 @@ item_db: ( EquipLv: 100 Script: <" bonus bMaxHP,500; - bonus2 bSubRace,RC_DemiHuman,10; - bonus2 bSubRace,RC_Formless,-10; - bonus2 bSubRace,RC_Undead,-10; - bonus2 bSubRace,RC_Brute,-10; - bonus2 bSubRace,RC_Plant,-10; - bonus2 bSubRace,RC_Insect,-10; - bonus2 bSubRace,RC_Fish,-10; - bonus2 bSubRace,RC_Demon,-10; - bonus2 bSubRace,RC_Angel,-10; - bonus2 bSubRace,RC_Dragon,-10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_Formless,-10; + bonus2 bAddRaceTolerance,RC_Undead,-10; + bonus2 bAddRaceTolerance,RC_Brute,-10; + bonus2 bAddRaceTolerance,RC_Plant,-10; + bonus2 bAddRaceTolerance,RC_Insect,-10; + bonus2 bAddRaceTolerance,RC_Fish,-10; + bonus2 bAddRaceTolerance,RC_Demon,-10; + bonus2 bAddRaceTolerance,RC_Angel,-10; + bonus2 bAddRaceTolerance,RC_Dragon,-10; "> }, { @@ -24741,7 +24741,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -24759,7 +24759,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,5; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -24777,7 +24777,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,10; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -25288,7 +25288,7 @@ item_db: ( Upper: 58 Loc: 4 EquipLv: 48 - Script: <" bonus2 bSubRace,RC_Dragon,15; "> + Script: <" bonus2 bAddRaceTolerance,RC_Dragon,15; "> }, { Id: 2528 @@ -25379,7 +25379,7 @@ item_db: ( Upper: 63 Loc: 4 Refine: false - Script: <" bonus2 bSubRace,RC_DemiHuman,15; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,15; "> }, { Id: 2534 @@ -25482,7 +25482,7 @@ item_db: ( Script: <" bonus bMaxHP,50; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -25508,7 +25508,7 @@ item_db: ( Script: <" bonus bMaxHP,50; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -25534,7 +25534,7 @@ item_db: ( Script: <" bonus bMaxHP,50; bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,1; + bonus2 bAddRaceTolerance,RC_DemiHuman,1; "> }, { @@ -25627,8 +25627,8 @@ item_db: ( Script: <" bonus2 bSubEle,Ele_Water,5; bonus2 bSubEle,Ele_Earth,5; - bonus2 bSubRace,RC_Plant,5; - bonus2 bSubRace,RC_Brute,5; + bonus2 bAddRaceTolerance,RC_Plant,5; + bonus2 bAddRaceTolerance,RC_Brute,5; "> }, { @@ -25725,7 +25725,7 @@ item_db: ( } Script: <" bonus bMaxHPrate,5; - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { @@ -26419,7 +26419,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -26436,7 +26436,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,10; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -26477,6 +26477,7 @@ item_db: ( bonus bAspdRate,readparam(bAgi)/20; bonus bLongAtkRate,readparam(bDex)/20; bonus bCritAtkRate,readparam(bLuk)/20; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { @@ -26726,8 +26727,8 @@ item_db: ( Refine: false Script: <" bonus2 bResEff,Eff_Poison,10000; - bonus2 bSubRace,RC_Undead,4; - bonus2 bSubRace,RC_Demon,4; + bonus2 bAddRaceTolerance,RC_Undead,4; + bonus2 bAddRaceTolerance,RC_Demon,4; "> }, { @@ -28501,7 +28502,7 @@ item_db: ( Upper: 63 Loc: 136 Refine: false - Script: <" bonus2 bSubRace,RC_Undead,1; "> + Script: <" bonus2 bAddRaceTolerance,RC_Undead,1; "> }, { Id: 2716 @@ -33182,7 +33183,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_DemiHuman,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,30; "> }, { Id: 4059 @@ -33192,7 +33193,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Plant,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,30; "> }, { Id: 4060 @@ -33265,7 +33266,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Brute,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Brute,30; "> }, { Id: 4067 @@ -33354,7 +33355,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Insect,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Insect,30; "> }, { Id: 4075 @@ -33459,7 +33460,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Fish,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Fish,30; "> }, { Id: 4084 @@ -33898,7 +33899,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Dragon,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Dragon,30; "> }, { Id: 4121 @@ -33944,7 +33945,7 @@ item_db: ( Weight: 10 Loc: 32 Script: <" - bonus2 bSubRace,RC_Demon,15; + bonus2 bAddRaceTolerance,RC_Demon,15; bonus2 bResEff,Eff_Stone,10000; "> }, @@ -34086,7 +34087,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Demon,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Demon,30; "> }, { Id: 4137 @@ -34106,7 +34107,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Angel,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Angel,30; "> }, { Id: 4139 @@ -36534,7 +36535,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Undead,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Undead,30; "> }, { Id: 4341 @@ -38812,9 +38813,9 @@ item_db: ( Loc: 769 Script: <" bonus bInt,3; - bonus2 bSubRace,RC_Insect,10; + bonus2 bAddRaceTolerance,RC_Insect,10; if(getrefine()>=9) { - bonus2 bSubRace,RC_Insect,5; + bonus2 bAddRaceTolerance,RC_Insect,5; } "> }, @@ -38886,7 +38887,7 @@ item_db: ( Buy: 20 Weight: 10 Loc: 32 - Script: <" bonus2 bSubRace,RC_Plant,30; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,30; "> }, { Id: 4516 @@ -38980,7 +38981,7 @@ item_db: ( Loc: 16 Script: <" bonus bDefEle,Ele_Water; - bonus2 bSubRace,RC_Fish,10; + bonus2 bAddRaceTolerance,RC_Fish,10; "> }, { @@ -41176,7 +41177,7 @@ item_db: ( Type: 6 Buy: 0 Loc: 16 - Script: <" bonus2 bSubRace,RC_DemiHuman,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { Id: 4850 @@ -42837,7 +42838,7 @@ item_db: ( Script: <" bonus bLuk,2; bonus bMdef,10; - bonus2 bSubRace,RC_Brute,5; + bonus2 bAddRaceTolerance,RC_Brute,5; "> }, { @@ -43106,7 +43107,7 @@ item_db: ( Upper: 63 Loc: 256 View: 198 - Script: <" bonus2 bSubRace,RC_Plant,2; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,2; "> }, { Id: 5118 @@ -43164,7 +43165,7 @@ item_db: ( View: 200 Script: <" bonus2 bAddRace,RC_DemiHuman,5; - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { @@ -43302,7 +43303,7 @@ item_db: ( View: 201 Script: <" bonus bAgi,2; - bonus2 bSubRace,RC_Brute,10; + bonus2 bAddRaceTolerance,RC_Brute,10; "> }, { @@ -43359,7 +43360,7 @@ item_db: ( nomail: true noauction: true } - Script: <" bonus2 bSubRace,RC_DemiHuman,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { Id: 5133 @@ -43494,8 +43495,8 @@ item_db: ( EquipLv: 10 View: 211 Script: <" - bonus2 bSubRace,RC_Undead,5; - bonus2 bSubRace,RC_Demon,5; + bonus2 bAddRaceTolerance,RC_Undead,5; + bonus2 bAddRaceTolerance,RC_Demon,5; "> }, { @@ -43530,7 +43531,7 @@ item_db: ( View: 213 Script: <" bonus bVit,1; - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { @@ -43924,7 +43925,7 @@ item_db: ( Loc: 769 Refine: false View: 51 - Script: <" bonus2 bSubRace,RC_Undead,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_Undead,10; "> }, { Id: 5168 @@ -43974,7 +43975,7 @@ item_db: ( View: 224 Script: <" bonus bMdef,1; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { @@ -44003,7 +44004,7 @@ item_db: ( Loc: 256 Refine: false View: 226 - Script: <" bonus2 bSubRace,RC_DemiHuman,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { Id: 5173 @@ -44487,7 +44488,7 @@ item_db: ( Upper: 63 Loc: 256 View: 206 - Script: <" bonus2 bSubRace,RC_Demon,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_Demon,5; "> }, { Id: 5203 @@ -44552,7 +44553,7 @@ item_db: ( noselltonpc: true nogstorage: true } - Script: <" bonus2 bSubRace,RC_Plant,3; "> + Script: <" bonus2 bAddRaceTolerance,RC_Plant,3; "> }, { Id: 5207 @@ -44727,7 +44728,7 @@ item_db: ( bonus bMdef,3; bonus bDex,1; bonus bInt,1; - bonus2 bSubRace,RC_Demon,3; + bonus2 bAddRaceTolerance,RC_Demon,3; "> }, { @@ -44751,7 +44752,7 @@ item_db: ( bonus bStr,1; bonus bAgi,1; bonus bFlee,3; - bonus2 bSubRace,RC_Angel,3; + bonus2 bAddRaceTolerance,RC_Angel,3; "> }, { @@ -44832,7 +44833,7 @@ item_db: ( } Script: <" bonus bVit,1; - bonus2 bSubRace,RC_Brute,5; + bonus2 bAddRaceTolerance,RC_Brute,5; "> }, { @@ -45560,7 +45561,7 @@ item_db: ( Script: <" bonus bStr,1; bonus bCritical,3; - bonus2 bSubRace,RC_Angel,-20; + bonus2 bAddRaceTolerance,RC_Angel,-20; if(getrefine()>=6) { bonus bCritical,getrefine()-5; } @@ -45802,7 +45803,7 @@ item_db: ( } Script: <" bonus bMdef,5; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { @@ -46126,7 +46127,8 @@ item_db: ( bonus bMaxSP,50; skill TF_DOUBLE,2; bonus bDoubleRate,10; - bonus2 bSubRace,RC_DemiHuman,3; + bonus2 bAddRaceTolerance,RC_DemiHuman,3; + bonus2 bAddRaceTolerance,RC_Brute,3; "> }, { @@ -46321,7 +46323,7 @@ item_db: ( noselltonpc: true nogstorage: true } - Script: <" bonus2 bSubRace,RC_Dragon,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_Dragon,5; "> }, { Id: 5293 @@ -46577,7 +46579,7 @@ item_db: ( nomail: true noauction: true } - Script: <" bonus2 bSubRace,RC_DemiHuman,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,5; "> }, { Id: 5307 @@ -46821,7 +46823,13 @@ item_db: ( Upper: 63 Loc: 256 View: 341 - Script: <" bonus bLuk,3; "> + Script: <" + bonus bLuk,3; + bonus2 bAddRaceTolerance,RC_Angel, 5; + bonus2 bAddRace,RC_Angel, 5; + bonus2 bMagicAddRace,RC_Angel,5; + bonus3 bAddMonsterDropItem,12033,RC_Angel,100; + "> }, { Id: 5320 @@ -47215,7 +47223,7 @@ item_db: ( Refine: false View: 354 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus4 bAutoSpellWhenHit,AL_ANGELUS,10,20,0; "> }, @@ -47234,7 +47242,7 @@ item_db: ( Refine: false View: 355 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus bMagicHPGainValue,50; "> }, @@ -47253,7 +47261,7 @@ item_db: ( Refine: false View: 356 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; autobonus "{ bonus bBaseAtk,50; }",20,10000,0,"{ specialeffect2 EF_POTION_BERSERK; }"; "> }, @@ -47272,7 +47280,7 @@ item_db: ( Refine: false View: 357 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus2 bAddItemHealRate,504,10; bonus2 bAddItemHealRate,547,10; "> @@ -47292,7 +47300,7 @@ item_db: ( Refine: false View: 358 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; autobonus "{ bonus bAspdRate,5; }",20,30000,0,"{ specialeffect2 EF_HASTEUP; }"; "> }, @@ -47311,7 +47319,7 @@ item_db: ( Refine: false View: 359 Script: <" - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus2 bAddRace,RC_Undead,5; bonus2 bMagicAddRace,RC_Undead,5; "> @@ -47409,7 +47417,7 @@ item_db: ( Loc: 256 Refine: false View: 37 - Script: <" bonus2 bSubRace,RC_Insect,10; "> + Script: <" bonus2 bAddRaceTolerance,RC_Insect,10; "> }, { Id: 5352 @@ -47730,7 +47738,7 @@ item_db: ( } Script: <" bonus bMdef,3; - bonus2 bSubRace,RC_Demon,10; + bonus2 bAddRaceTolerance,RC_Demon,10; "> }, { @@ -47940,7 +47948,7 @@ item_db: ( } Script: <" bonus bUnbreakableHelm,0; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; "> }, { @@ -48621,7 +48629,7 @@ item_db: ( Script: <" bonus bMaxHP,100; bonus2 bResEff,Eff_Stun,400; - bonus2 bSubRace,RC_DemiHuman,4; + bonus2 bAddRaceTolerance,RC_DemiHuman,4; "> }, { @@ -48877,7 +48885,7 @@ item_db: ( } Script: <" bonus bDex,3; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; "> }, { @@ -48953,7 +48961,7 @@ item_db: ( nomail: true noauction: true } - Script: <" bonus2 bSubRace,RC_DemiHuman,12; "> + Script: <" bonus2 bAddRaceTolerance,RC_DemiHuman,12; "> }, { Id: 5429 @@ -49105,7 +49113,7 @@ item_db: ( Script: <" bonus bInt,1; bonus bMdef,1; - bonus2 bSubRace,RC_Insect,5; + bonus2 bAddRaceTolerance,RC_Insect,5; "> }, { @@ -50020,7 +50028,7 @@ item_db: ( EquipLv: 60 View: 483 Script: <" - bonus2 bSubRace,RC_Brute,5; + bonus2 bAddRaceTolerance,RC_Brute,5; bonus2 bAddRace,RC_Brute,5; bonus2 bMagicAddRace,RC_Brute,5; "> @@ -50719,7 +50727,7 @@ item_db: ( EquipLv: 50 View: 513 Script: <" - bonus2 bSubRace,RC_DemiHuman,12; + bonus2 bAddRaceTolerance,RC_DemiHuman,12; bonus bBaseAtk,(JobLevel*2)/7; "> }, @@ -51041,7 +51049,7 @@ item_db: ( bonus bVit,1; bonus bDex,1; bonus bMdef,3; - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus2 bAddRace,RC_DemiHuman,3; "> }, @@ -51836,7 +51844,7 @@ item_db: ( Script: <" bonus bVit,2; bonus2 bAddEff,Eff_Stun,500; - bonus2 bSubRace,RC_Brute,-10; + bonus2 bAddRaceTolerance,RC_Brute,-10; "> }, { @@ -52085,7 +52093,7 @@ item_db: ( nogstorage: true } Script: <" - bonus2 bSubRace,RC_Demon,3; + bonus2 bAddRaceTolerance,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; "> @@ -52252,7 +52260,7 @@ item_db: ( Script: <" bonus bBaseAtk,10; bonus bMatk,10; - bonus2 bSubRace,RC_DemiHuman,3; + bonus2 bAddRaceTolerance,RC_DemiHuman,3; bonus bDelayrate,-3; if(getrefine()>6) { bonus2 bSubEle,Ele_Neutral,5; @@ -53491,8 +53499,8 @@ item_db: ( nogstorage: true } Script: <" - bonus2 bSubRace,RC_Demon,10; - bonus2 bSubRace,RC_Undead,10; + bonus2 bAddRaceTolerance,RC_Demon,10; + bonus2 bAddRaceTolerance,RC_Undead,10; if(getrefine()>=7) autobonus "{ bonus bCritical,30; bonus bHit,10; }",10,10000,0,"{ specialeffect2 EF_ENHANCE; }"; "> }, @@ -55660,8 +55668,8 @@ item_db: ( EquipLv: 45 View: 610 Script: <" - bonus2 bSubRace,RC_Demon,-5; - bonus2 bSubRace,RC_Undead,-5; + bonus2 bAddRaceTolerance,RC_Demon,-5; + bonus2 bAddRaceTolerance,RC_Undead,-5; bonus3 bAutoSpell,MG_COLDBOLT,1,20; "> }, @@ -55695,7 +55703,7 @@ item_db: ( Upper: 63 Loc: 256 View: 669 - Script: <" bonus2 bSubRace,RC_Fish,1; "> + Script: <" bonus2 bAddRaceTolerance,RC_Fish,1; "> }, { Id: 5793 @@ -55854,7 +55862,7 @@ item_db: ( View: 125 Script: <" bonus bUnbreakableHelm,0; - bonus2 bSubRace,RC_DemiHuman,3; + bonus2 bAddRaceTolerance,RC_DemiHuman,3; "> }, { @@ -55870,7 +55878,7 @@ item_db: ( View: 167 Script: <" bonus bAllStats,2; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; if(getskilllv(AL_HEAL)==10) { bonus3 bAutoSpellWhenHit,AL_HEAL,10,20; } @@ -56046,7 +56054,7 @@ item_db: ( Loc: 1 Refine: false View: 25 - Script: <" bonus2 bSubRace,RC_Brute,5; "> + Script: <" bonus2 bAddRaceTolerance,RC_Brute,5; "> }, { Id: 5812 @@ -56268,8 +56276,8 @@ item_db: ( bonus bLuk,4; bonus bMaxHP,100; bonus bMaxSP,100; - bonus2 bSubRace,RC_Brute,7; - bonus2 bSubRace,RC_DemiHuman,7; + bonus2 bAddRaceTolerance,RC_Brute,7; + bonus2 bAddRaceTolerance,RC_DemiHuman,7; "> }, { @@ -87020,7 +87028,7 @@ item_db: ( } Script: <" bonus bIgnoreDefRace,RC_DemiHuman; - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; bonus2 bSubRace,RC_Demon,-10; bonus bMaxSPrate,10; bonus bSPDrainValue,3; @@ -106667,16 +106675,16 @@ item_db: ( bonus bMdef,10; bonus bStr,1; bonus bInt,1; - bonus2 bSubRace,RC_Demon,10; - bonus2 bSubRace,RC_Undead,10; - bonus2 bSubRace,RC_Formless,-10; - bonus2 bSubRace,RC_Brute,-10; - bonus2 bSubRace,RC_DemiHuman,-10; - bonus2 bSubRace,RC_Plant,-10; - bonus2 bSubRace,RC_Insect,-10; - bonus2 bSubRace,RC_Fish,-10; - bonus2 bSubRace,RC_Angel,-10; - bonus2 bSubRace,RC_Dragon,-10; + bonus2 bAddRaceTolerance,RC_Demon,10; + bonus2 bAddRaceTolerance,RC_Undead,10; + bonus2 bAddRaceTolerance,RC_Formless,-10; + bonus2 bAddRaceTolerance,RC_Brute,-10; + bonus2 bAddRaceTolerance,RC_DemiHuman,-10; + bonus2 bAddRaceTolerance,RC_Plant,-10; + bonus2 bAddRaceTolerance,RC_Insect,-10; + bonus2 bAddRaceTolerance,RC_Fish,-10; + bonus2 bAddRaceTolerance,RC_Angel,-10; + bonus2 bAddRaceTolerance,RC_Dragon,-10; "> }, { @@ -106783,7 +106791,7 @@ item_db: ( Script: <" bonus bMdef,10; bonus bMaxHPrate,getequiprefinerycnt(EQI_ARMOR); - bonus2 bSubRace,RC_DemiHuman,5; + bonus2 bAddRaceTolerance,RC_DemiHuman,5; bonus2 bSubEle,Ele_Neutral,5; "> }, @@ -106958,7 +106966,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,5; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; if(getrefine()>5) { bonus bHealPower2,12; bonus bAddItemHealRate,12; @@ -106983,7 +106991,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,10; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee2,5; bonus bLongAtkDef,20; @@ -107008,7 +107016,7 @@ item_db: ( EquipLv: 95 Script: <" bonus bMdef,20; - bonus2 bSubRace,RC_DemiHuman,2; + bonus2 bAddRaceTolerance,RC_DemiHuman,2; if(getrefine()>5) { bonus bFlee,5; bonus bLongAtkDef,15; @@ -108637,7 +108645,7 @@ item_db: ( { Id: 16457 AegisName: "Tw_Nov_Scroll" - Name: "±???­?­?????" + Name: "±???­?­?????" Type: 2 Buy: 20 Weight: 10 @@ -111806,7 +111814,7 @@ item_db: ( EquipLv: 15 View: 678 Script: <" - bonus2 bSubRace,RC_DemiHuman,10; + bonus2 bAddRaceTolerance,RC_DemiHuman,10; bonus bCritical,10; bonus2 bAddItemHealRate,501,100; bonus2 bAddItemHealRate,504,100; @@ -111990,8 +111998,8 @@ item_db: ( noauction: true } Script: <" - bonus2 bSubRace,RC_Plant,5; - bonus2 bSubRace,RC_Brute,5; + bonus2 bAddRaceTolerance,RC_Plant,5; + bonus2 bAddRaceTolerance,RC_Brute,5; bonus2 bAddRace,RC_Plant,5; bonus2 bAddRace,RC_Brute,5; "> @@ -112214,7 +112222,7 @@ item_db: ( Script: <" bonus bMdef,3; bonus2 bAddRace,RC_Insect,5; - bonus2 bSubRace,RC_Insect,5; + bonus2 bAddRaceTolerance,RC_Insect,5; bonus3 bAddMonsterDropItem,518,RC_Insect,50; "> }, @@ -112551,7 +112559,13 @@ item_db: ( Loc: 256 EquipLv: 10 View: 729 - Script: <" bonus bMdef,3; "> + Script: <" + bonus bMdef,3; + bonus2 bAddRaceTolerance,RC_Dragon,5; + bonus2 bAddRace,RC_Dragon,5; + bonus2 bMagicAddRace,RC_Dragon,5; + bonus3 bAddMonsterDropItem,7444,RC_Dragon,2; + "> }, { Id: 18556 @@ -112636,6 +112650,7 @@ item_db: ( Script: <" bonus bVit,2; bonus bMdef,3; + bonus2 bAddRaceTolerace,RC_DemiHuman,10; "> }, { @@ -113266,11 +113281,11 @@ item_db: ( bonus bAtkRate,5; if(getrefine() > 5 && getrefine() <= 12) { bonus2 bAddRace,RC_DemiHuman,(getrefine() - 5); - bonus2 bSubRace,RC_DemiHuman,(getrefine() - 5); + bonus2 AddRaceTolerace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { bonus2 bAddRace,RC_DemiHuman,7; - bonus2 bSubRace,RC_DemiHuman,7; + bonus2 AddRaceTolerace,RC_DemiHuman,7; } "> }, @@ -113288,11 +113303,11 @@ item_db: ( Script: <" bonus bMdef,5; if(getrefine() > 5 && getrefine() <= 12) { - bonus2 bMagicAddRace,RC_DemiHuman,(getrefine() - 5); + bonus2 bAddRaceTolerace,RC_DemiHuman,(getrefine() - 5); bonus2 bMagicAddRace,RC_DemiHuman,(getrefine() - 5); } if(getrefine() > 12) { - bonus2 bMagicAddRace,RC_DemiHuman,7; + bonus2 bAddRaceTolerace,RC_DemiHuman,7; bonus2 bMagicAddRace,RC_DemiHuman,7; } "> @@ -113996,6 +114011,7 @@ item_db: ( Loc: 1 Refine: false View: 801 + Script: <" bonus2 bAddRaceTolerace,RC_Demon,3; "> }, { Id: 18649 @@ -114310,7 +114326,7 @@ item_db: ( EquipLv: 12 Refine: false View: 818 - Script: <" bonus2 bSubRace,RC_DemiHuman,3; "> + Script: <" bonus2 bAddRaceTolerace,RC_DemiHuman,3; "> }, { Id: 18671 @@ -114503,6 +114519,7 @@ item_db: ( Loc: 1 Refine: false View: 829 + Script: <" bonus2 bAddRaceTolerace,RC_Plant,3;"> }, { Id: 18684 @@ -117308,7 +117325,13 @@ item_db: ( Loc: 2048 Refine: false View: 712 - Script: <" bonus bUnbreakableHelm,0; "> + Script: <" + bonus bUnbreakableHelm,0; + bonus2 bAddRaceTolerace,RC_Angel,1; + bonus2 bAddRaceTolerace,RC_Demon,1; + bonus3 bAddMonsterDropItem,523,RC_Angel,400; + bonus3 bAddMonsterDropItem,12020,RC_Demon,400; + "> }, { Id: 19543 -- cgit v1.2.3-60-g2f50