From 524291493e64196d8ce02f4b637ea0ee1a176d0a Mon Sep 17 00:00:00 2001 From: Matheus Macabu Date: Mon, 4 Feb 2013 00:32:19 -0200 Subject: Merged some commits from rAthena. --- db/castle_db.txt | 20 ++++++++++---------- db/pre-re/item_combo_db.txt | 4 ++-- db/pre-re/item_db.txt | 2 +- db/re/item_combo_db.txt | 8 ++++---- db/re/item_trade.txt | 28 ++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 17 deletions(-) (limited to 'db') diff --git a/db/castle_db.txt b/db/castle_db.txt index a77b5de7b..4e0f2e880 100644 --- a/db/castle_db.txt +++ b/db/castle_db.txt @@ -34,13 +34,13 @@ 21,nguild_gef,Air,Agit_N02,2 22,nguild_pay,Water,Agit_N03,2 23,nguild_prt,Fire,Agit_N04,2 -24,schg_cas01,Himinn,Agit_Sc01,1 // kRO : Himinn -25,schg_cas02,Andlangr,Agit_Sc02,1 // kRO : Andlangr -26,schg_cas03,Viblainn,Agit_Sc03,1 // kRO : Viblainn -27,schg_cas04,Hljod,Agit_Sc04,1 // kRO : Hljod -28,schg_cas05,Skidbladnir,Agit_Sc05,1 // kRO : Skidbladnir -29,arug_cas01,Mardol,Agit_Ar01,1 // kRO : Mardol -30,arug_cas02,Cyr,Agit_Ar02,1 // kRO : Cyr -31,arug_cas03,Horn,Agit_Ar03,1 // kRO : Horn -32,arug_cas04,Gefn,Agit_Ar04,1 // kRO : Gefn -33,arug_cas05,Bandis,Agit_Ar05,1 // kRO : Bandis +24,schg_cas01,Himinn,Manager#schg_cas01,1 // kRO : Himinn +25,schg_cas02,Andlangr,Manager#schg_cas02,1 // kRO : Andlangr +26,schg_cas03,Viblainn,Manager#schg_cas03,1 // kRO : Viblainn +27,schg_cas04,Hljod,Manager#schg_cas04,1 // kRO : Hljod +28,schg_cas05,Skidbladnir,Manager#schg_cas05,1 // kRO : Skidbladnir +29,arug_cas01,Mardol,Manager#arug_cas01,1 // kRO : Mardol +30,arug_cas02,Cyr,Manager#arug_cas02,1 // kRO : Cyr +31,arug_cas03,Horn,Manager#arug_cas03,1 // kRO : Horn +32,arug_cas04,Gefn,Manager#arug_cas04,1 // kRO : Gefn +33,arug_cas05,Bandis,Manager#arug_cas05,1 // kRO : Bandis diff --git a/db/pre-re/item_combo_db.txt b/db/pre-re/item_combo_db.txt index 3b8985fb0..c1eb3c039 100644 --- a/db/pre-re/item_combo_db.txt +++ b/db/pre-re/item_combo_db.txt @@ -21,7 +21,7 @@ 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } -1615:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } +1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } 1616:2515,{ bonus bSpeedRate,25; } 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } @@ -29,7 +29,7 @@ 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); } 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } -1636:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } +1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bCastRate,-10; } 1723:2718,{ bonus bDex,1; bonus bMaxSP,50; bonus bSPrecovRate,10; } 1730:1752,{ bonus bLongAtkRate,25; } 1731:1754,{ bonus bLongAtkRate,25; } diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 391954fab..35763c257 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -1777,7 +1777,7 @@ 4149,Gargoyle_Card,Gargoyle Card,6,20,,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,RC_Insect,100; },{},{} 4150,Goat_Card,Goat Card,6,20,,10,,,,,,,,16,,,,,{ if(getrefine()<6) { bonus bDef,2; bonus bMdef,5; } },{},{} 4151,Gajomart_Card,Gajomart Card,6,20,,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{} -4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,533,RC_Insect,300; },{},{} +4152,Galapago_Card,Galapago Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItem,531,RC_Insect,300; bonus3 bAddMonsterDropItem,532,RC_Insect,300; bonus3 bAddMonsterDropItem,534,RC_Insect,300; },{},{} 4153,Crab_Card,Crab Card,6,20,,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; },{},{} 4154,Rice_Cake_Boy_Card,Dumpling Child Card,6,20,,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItem,529,RC_DemiHuman,300; bonus3 bAddMonsterDropItem,530,RC_DemiHuman,100; },{},{} 4155,Goblin_Leader_Card,Goblin Leader Card,6,20,,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{} diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index 81acb7f0d..f6bd7dc01 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -24,7 +24,7 @@ 1573:2334,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2372,{ bonus bMdef,8; bonus bMaxSPRate,10; bonus bInt,4; } 1573:2716:2717,{ bonus bInt,5; bonus bMaxHP,700; bonus bAspdRate,5; } -1615:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } +1615:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } 1616:2515,{ bonus bSpeedRate,25; } 1618:2509,{ bonus bMaxHP,300; bonus bMatkRate,getequiprefinerycnt(EQI_HAND_R)-5; bonus2 bSubEle,Ele_Neutral,getrefine()*3; } 1618:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } @@ -32,7 +32,7 @@ 1620:2535,{ bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,25; } 1629:5045,{ bonus bDex,2; bonus bInt,2; bonus bSPrecovRate,5; bonus bMatkRate,getrefine(); } 1631:2129,{ bonus2 bSkillAtk,"PR_MAGNUS",20; bonus3 bAutoSpellWhenHit,"PR_TURNUNDEAD",1,20; } -1636:18539,{ bonus bEquipmentMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } +1636:18539,{ bonus bMatk,10*getequiprefinerycnt(EQI_HAND_R); bonus bVariableCastrate,-10; } 1657:2471:2569:15029,{ bonus bHealPower,25; } 1660:2471:2569:15029,{ bonus bHealPower,45; bonus3 bAutoSpellWhenHit,"AB_SILENTIUM",1,10; } 1718:1774,{ bonus bLongAtkRate,50; } @@ -117,7 +117,7 @@ 2475:2574:2883:15036,{ bonus bMaxHPRate,14; bonus2 bSkillAtk,"RK_HUNDREDSPEAR",50; skill "CR_AUTOGUARD",1; } 2476:2575:2884:15037,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus2 bSkillAtk,"RK_SONICWAVE",100; bonus2 bSkillAtk,"RK_WINDCUTTER",100; autobonus "{ sc_start SC_CONCENTRATION,10000,getskilllv(\"LK_CONCENTRATION\")?getskilllv(\"LK_CONCENTRATION\"):1; bonus bAspd,2; }",1,10000,BF_WEAPON,"{}"; } 2477:2577:2886:15038,{ bonus bCritical,15; bonus bFlee,10; bonus bCritAtkRate,40; bonus2 bSkillAtk,"GC_CROSSIMPACT",20; } -2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; /* bonus bEquipmentMatk,10; */ if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; } +2478:2578:2887:15039,{ bonus2 bAddRace,RC_NonBoss,10; bonus2 bAddRace,RC_Boss,10; bonus bMatk,10; if(readparam(bStr)>119) { bonus bBaseAtk,30; } bonus3 bAutoSpell,"ASC_BREAKER",getskilllv("ASC_BREAKER"),10; bonus bCritical,-20; } 2479:2580:2890:15042,{ bonus bAspd,2; bonus bLongAtkRate,30; bonus3 bAutoSpell,"AC_DOUBLE",3,10; bonus2 bSkillAtk,"RA_ARROWSTORM",50; } 2480:2581:2891:15043,{ bonus bMaxHPRate,15; bonus2 bSkillAtk,"RA_CLUSTERBOMB",20; bonus bFlee2,20; bonus bLongAtkRate,-30; bonus bAspd,-7; } 2483:2586:15046,{ bonus2 bSubRace,RC_DemiHuman,15; } @@ -147,7 +147,7 @@ 2725:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } 2726:2727,{ bonus bUseSPrate,-25; } 2733:2772,{ bonus2 bAddRace,RC_NonBoss,5; bonus2 bAddRace,RC_Boss,5; bonus bMatkRate,3; bonus bHealPower,5; } -2747:13061,{ bonus bHit,5; /* bonus bEquipmentMatk,5; */ } +2747:13061,{ bonus bHit,5; bonus bMatk,5; } 2777:2778:5479,{ bonus bMaxHP,300; bonus bMatkRate,5; bonus2 bSubEle,Ele_Neutral,5; } 2779:2780:5482,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } 2779:2780:5577,{ bonus bMatkRate,10; bonus bInt,5; bonus2 bSubRace,RC_Angel,10; } diff --git a/db/re/item_trade.txt b/db/re/item_trade.txt index c8f518c12..abc6909c2 100644 --- a/db/re/item_trade.txt +++ b/db/re/item_trade.txt @@ -1870,3 +1870,31 @@ 13425,499,100 // Tourist Sword 15007,467,100 // Time Keeper Robe 16006,499,100 // Tourist Mace + +// Sealed Cards +4489,457,100 // Sealed Pharaoh Card +4490,457,100 // Sealed Moonlight Flower Card +4491,457,100 // Sealed Sniper Card +4492,457,100 // Sealed Orc Hero Card +4493,457,100 // Sealed Tao Gunka Card +4494,457,100 // Sealed Turtle General Card +4495,457,100 // Sealed Amon Ra Card +4496,457,100 // Sealed Drake Card +4497,457,100 // Sealed Stormy Knight Card +4498,457,100 // Sealed Lady Tanee Card +4499,457,100 // Sealed Samurai Spector Card +4500,457,100 // Sealed Orc Lord Card +4501,457,100 // Sealed High Priest Card +4502,457,100 // Sealed MasterSmith Card +4503,457,100 // Sealed Vesper Card +4504,457,100 // Sealed Eddga Card +4535,457,100 // Sealed Randgris Card +4536,457,100 // Sealed Atroce Card +4537,457,100 // Sealed Phreeoni Card +4538,457,100 // Sealed White Lady Card +4539,457,100 // Sealed Fallen Bishop Hibram Card +4540,457,100 // Sealed Lord of The Dead Card +4541,457,100 // Sealed High Wizard Card +4542,457,100 // Sealed Detale Card +4543,457,100 // Sealed Hatii Card +4544,457,100 // Sealed Evil Snake Lord Card -- cgit v1.2.3-70-g09d2