summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorshadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-16 14:38:50 +0000
committershadow <shadow@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-16 14:38:50 +0000
commitf5654582b6a469a652efa5c52786d471d89b9753 (patch)
tree3ba4a74d39b53193c6bc2032e26af54f6214744f /db
parent583bd00e1ec300316c38f83e82563083f83d7618 (diff)
downloadhercules-f5654582b6a469a652efa5c52786d471d89b9753.tar.gz
hercules-f5654582b6a469a652efa5c52786d471d89b9753.tar.bz2
hercules-f5654582b6a469a652efa5c52786d471d89b9753.tar.xz
hercules-f5654582b6a469a652efa5c52786d471d89b9753.zip
Fixed 1425,Assaulter's_Spear using BaseClass instead of BaseJob, bugreport:1694
Fixed missing capital M on Silver Tiara script. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12840 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/Changelog.txt5
-rw-r--r--db/item_db.txt4
2 files changed, 7 insertions, 2 deletions
diff --git a/db/Changelog.txt b/db/Changelog.txt
index 38d280f64..2789c6656 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -43,6 +43,10 @@
2385 Recuvative_Armor Should trigger HP/SP return with magical kills as well.
=======================
+2008/06/16
+ * Fixed 1425,Assaulter's_Spear using BaseClass instead of BaseJob, bugreport:1694
+ * Fixed missing capital M on Silver Tiara script.
+
2008/06/15
* Fixed the next items:
- Naght Seiger Twin Edge Fixed Level Meteor Storm to 3.
@@ -51,6 +55,7 @@
- Free Ticket for Kafra Storage, Free Ticket for Kafra Transportation, Free Ticket for the Cart Service Weight: 0
- Hunter Cap Bonus damage VS Brute and Demi human monster
- Koneko Hat Bonus INT + 1
+
2008/06/14
* Fixed 5286,Pecopeco_Hairband level requeriment as reported by Lone Wolf.
diff --git a/db/item_db.txt b/db/item_db.txt
index adf848be8..b734cce71 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -693,7 +693,7 @@
1422,Hunting_Spear,Hunting Spear,4,,10,4200,180,,3,1,0x00004082,2,2,2,4,60,1,4,{ bonus bIgnoreDefRace,RC_Brute; bonus3 bAddMonsterDropItem,517,RC_Brute,1000; bonus3 bAutoSpell,"LK_JOINTBEAT",3,100; },{},{}
1423,Pole_XO,Pole XO,4,,10,0,120,,3,0,0x00004082,7,2,2,1,1,0,4,{ bonus2 bAddRace,RC_Boss,50; bonus2 bAddRace,RC_NonBoss,50; },{},{}
1424,Skewer_C,Refined Brocca,4,,0,0,149,,3,0,0x00004082,7,2,2,4,1,0,4,{ bonus bIgnoreDefRace,RC_NonBoss; bonus2 bAddSize,1,20; },{},{}
-1425,Assaulter's_Spear,Assaulter's Spear,4,,0,0,60,,3,0,0x00004082,7,2,2,3,80,1,4,{ bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,95; bonus bUnbreakableWeapon,0; if (BaseClass == Job_Crusader) bonus bAspdRate,20; },{},{}
+1425,Assaulter's_Spear,Assaulter's Spear,4,,0,0,60,,3,0,0x00004082,7,2,2,3,80,1,4,{ bonus bStr,2; bonus2 bAddRace,RC_DemiHuman,95; bonus bUnbreakableWeapon,0; if (BaseJob == Job_Crusader) bonus bAspdRate,20; },{},{}
// 2-Handed Spears
1451,Guisarme,Guisarme,4,13000,,1000,84,,3,2,0x00004082,7,2,34,2,18,1,5,{},{},{}
1452,Guisarme_,Guisarme,4,13000,,1000,84,,3,3,0x00004082,7,2,34,2,18,1,5,{},{},{}
@@ -2152,7 +2152,7 @@
5258,Afro_Wig,Dokebi's Wig,5,,10,100,,0,,0,0xFFFFFFFF,7,2,768,,10,1,302,{ bonus3 bAutoSpellWhenHit,"NV_FIRSTAID",1,300; bonus2 bSubEle,Ele_Neutral,1; },{},{}
5259,Elephant_Hat_,Elephant Hat,5,0,,500,,3,,0,0xFFFFFFFF,7,2,256,,0,1,215,{ bonus bVit,1; bonus3 bAutoSpell,"WZ_WATERBALL",3,10; skill "AL_HOLYWATER",1; },{},{}
5260,Cookie_Hat,Cookie Hat,5,0,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,217,{ bonus bAgi,1; bonus bFlee2,5; bonus bCritAtkRate,5; },{},{}
-5261,Silver_Tiara_,Silver Tiara,5,0,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,218,{ bonus bInt,2; if (BaseClass == Job_mage) bonus bMatkRate,(JobLevel/20); if (Baseclass == Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if (BaseClass == Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
+5261,Silver_Tiara_,Silver Tiara,5,0,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,218,{ bonus bInt,2; if (BaseClass == Job_Mage) bonus bMatkRate,(JobLevel/20); if (Baseclass == Job_Acolyte) bonus bUseSPrate,-(JobLevel/10); if (BaseClass == Job_Archer) bonus bMaxSP,(JobLevel*2); },{},{}
5262,Gold_Tiara_,Golden Tiara,5,0,,500,,2,,0,0xFFFFFFFF,7,2,256,,0,1,232,{ bonus bStr,2; bonus bUnbreakableHelm,0; if ((readparam(bDex) < 56) && (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief)) bonus bDex,JobLevel/7; },{},{}
5263,Ati_Atihan_Hat,Pagdayaw,5,,10,100,,1,,0,0xFFFFFFFE,7,2,769,,20,1,303,{ bonus2 bSubEle,Ele_Water,1; bonus2 bSubEle,Ele_Earth,1; bonus2 bSubEle,Ele_Fire,1; bonus2 bSubEle,Ele_Wind,1; bonus2 bAddEff,Eff_Curse,3; },{},{}
5264,Aussie_Flag_Hat,Australian Flag Hat,5,,10,500,,4,,0,0xFFFFFFFF,7,2,256,,0,1,304,{ end; bonus bAllStats,2; },{},{}