summaryrefslogtreecommitdiff
path: root/db
diff options
context:
space:
mode:
authorkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-09 18:13:45 +0000
committerkenpachi2k11 <kenpachi2k11@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-06-09 18:13:45 +0000
commitb0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52 (patch)
tree3b8945a765a9874920165184e7c98d36183276a7 /db
parent4571901919d958af775d52ac71d4a7b5c985cbee (diff)
downloadhercules-b0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52.tar.gz
hercules-b0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52.tar.bz2
hercules-b0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52.tar.xz
hercules-b0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52.zip
Fixed Shining Electric Bulb Hairbands (#5310) script. (bugreport:5805)
Fixed Imperial Guards (#2153) ViewID. (bugreport:5785) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16246 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
-rw-r--r--db/pre-re/item_db.txt4
-rw-r--r--db/re/item_db.txt6
2 files changed, 5 insertions, 5 deletions
diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt
index ce3f43c61..5f2f8a5d1 100644
--- a/db/pre-re/item_db.txt
+++ b/db/pre-re/item_db.txt
@@ -2470,8 +2470,8 @@
5306,Freyja_Crown,Freya\'s Crown,5,0,,500,,12,,0,0xFFFFFFFE,7,2,256,,0,0,328,{ bonus2 bSubRace, RC_DemiHuman, 5; },{},{}
5307,Carmen_Miranda\'s_Hat,Carmen Miranda\'s Hat,5,20,,400,,3,,0,0xFFFFFFFF,7,2,256,,0,1,329,{ bonus bMdef, 3; bonus3 bAutoSpellWhenHit, DC_WINKCHARM, 1, 50; },{},{}
5308,Brazilian_Flag_Hat,Brazil National Flag Hat,5,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,330,{ bonus bSpeedAddRate, 25; },{},{}
-5309,Mahican,Wool Mask,5,20,,200,,1,,0,0xFFFFFFFF,7,2,769,,0,1,331,{ skill RG_GRAFFITI, 1; },{},{}
-5310,Bulb_Hairband,Shining Electric Bulb Hairband,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,332,{ bonus2 bSubEle, Ele_Dark, 10; skill MG_SIGHT, 1; },{},{ sc_end SC_SIGHT; }
+5309,Mahican,Wool Mask,5,20,,200,,1,,0,0xFFFFFFFF,7,2,769,,0,1,331,{ skill "RG_GRAFFITI", 1; },{},{}
+5310,Bulb_Hairband,Shining Electric Bulb Hairband,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,332,{ bonus2 bSubEle, Ele_Dark, 10; skill "MG_SIGHT", 1; },{},{ sc_end SC_SIGHT; }
5311,Large_Hibiscus,Large Hisbiscus,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,333,{ bonus bMdef, 15; },{},{}
5312,Ayothaya_Hat,Ayothaya King\'s Hat,5,20,,100,,5,,1,0x000654E2,7,2,256,,0,1,334,{ bonus bStr, 1; bonus2 bAddRace, RC_DemiHuman, 5; },{},{}
5313,Diadem,Diadem,5,20,,100,,3,,1,0xFFFFFFFF,7,2,768,,0,1,335,{ bonus bInt,1; bonus bMatkRate,3; bonus bCastrate,-3; },{},{}
diff --git a/db/re/item_db.txt b/db/re/item_db.txt
index 9a476b575..9187825c7 100644
--- a/db/re/item_db.txt
+++ b/db/re/item_db.txt
@@ -1201,7 +1201,7 @@
2150,Upg_Buckler,Upg Buckler,5,20,,300,,45,,1,0x000ED5F2,7,2,32,,1,1,2,{ bonus bMaxHPrate,3; },{},{}
2151,Upg_Shield,Upg Shield,5,20,,650,,65,,1,0x00004082,7,2,32,,1,1,3,{ bonus bMaxHPrate,3; },{},{}
2152,Anti_Demon_Shield_C,Anti-Demon Shield,5,0,,0,,120,,0,0xFFFFFFFF,7,2,32,,1,0,3,{ bonus2 bSubRace,RC_DemiHuman,25; bonus2 bSubRace,RC_Demon,25; bonus bMaxHP,400; },{},{}
-2153,Imperial_Guard,Imperial Guard,5,20,,2500,,120,,1,0x00004000,7,2,32,,102,1,0,{ bonus bMdef,5; /* if(getrefine()>=6){ bonus2 bSkillAtk,"LG_SHIELDPRESS",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,"LG_SHIELDPRESS",20; } */ },{},{}
+2153,Imperial_Guard,Imperial Guard,5,20,,2500,,120,,1,0x00004000,7,2,32,,102,1,4,{ bonus bMdef,5; /* if(getrefine()>=6){ bonus2 bSkillAtk,"LG_SHIELDPRESS",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,"LG_SHIELDPRESS",20; } */ },{},{}
2154,Toy_Shield,Toy Shield,5,0,,500,,1,,1,0xFFFFFFFF,7,2,32,,10,1,1,{},{},{}
//2155,
2156,Bible_Of_Promise1,Bible Of Promise Vol1,5,20,,500,,10,,1,0x00000100,7,2,32,,110,1,5,{ /* skill "ALL_ODINS_POWER",1; */ },{},{}
@@ -2886,8 +2886,8 @@
5306,Freyja_Crown,Freya\'s Crown,5,0,,500,,12,,0,0xFFFFFFFE,7,2,256,,0,0,328,{ bonus2 bSubRace, RC_DemiHuman, 5; },{},{}
5307,Carmen_Miranda\'s_Hat,Carmen Miranda\'s Hat,5,20,,400,,3,,0,0xFFFFFFFF,7,2,256,,0,1,329,{ bonus bMdef, 3; bonus3 bAutoSpellWhenHit, DC_WINKCHARM, 1, 50; },{},{}
5308,Brazilian_Flag_Hat,Brazil National Flag Hat,5,20,,300,,3,,1,0xFFFFFFFF,7,2,256,,0,1,330,{ bonus bSpeedAddRate, 25; },{},{}
-5309,Mahican,Wool Mask,5,20,,200,,1,,0,0xFFFFFFFF,7,2,769,,0,1,331,{ skill RG_GRAFFITI, 1; },{},{}
-5310,Bulb_Hairband,Shining Electric Bulb Hairband,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,332,{ bonus2 bSubEle, Ele_Dark, 10; skill MG_SIGHT, 1; },{},{ sc_end SC_SIGHT; }
+5309,Mahican,Wool Mask,5,20,,200,,1,,0,0xFFFFFFFF,7,2,769,,0,1,331,{ skill "RG_GRAFFITI", 1; },{},{}
+5310,Bulb_Hairband,Shining Electric Bulb Hairband,5,20,,100,,3,,1,0xFFFFFFFF,7,2,256,,0,1,332,{ bonus2 bSubEle, Ele_Dark, 10; skill "MG_SIGHT", 1; },{},{ sc_end SC_SIGHT; }
5311,Large_Hibiscus,Large Hisbiscus,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,333,{ bonus bMdef, 15; },{},{}
5312,Ayothaya_Hat,Ayothaya King\'s Hat,5,20,,100,,5,,1,0x000654E2,7,2,256,,0,1,334,{ bonus bStr, 1; bonus2 bAddRace, RC_DemiHuman, 5; },{},{}
5313,Diadem,Diadem,5,20,,100,,3,,1,0xFFFFFFFF,7,2,768,,0,1,335,{ bonus bInt,1; bonus bMatkRate,3; bonus bCastrate,-3; },{},{}