From b0c8c19ef8af59b8dff9d61398fa8bbb8b2f9c52 Mon Sep 17 00:00:00 2001 From: kenpachi2k11 Date: Sat, 9 Jun 2012 18:13:45 +0000 Subject: 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 --- db/pre-re/item_db.txt | 4 ++-- db/re/item_db.txt | 6 +++--- sql-files/item_db.sql | 2 +- 3 files changed, 6 insertions(+), 6 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; },{},{} diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index 1154d78c4..3f9740d1e 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -1225,7 +1225,7 @@ REPLACE INTO `item_db` VALUES (2149,'Upg_Guard','Upg Guard',5,20,NULL,150,NULL,2 REPLACE INTO `item_db` VALUES (2150,'Upg_Buckler','Upg Buckler',5,20,NULL,300,NULL,45,NULL,1,0x000ED5F2,7,2,32,NULL,1,1,2,'bonus bMaxHPrate,3;',NULL,NULL); REPLACE INTO `item_db` VALUES (2151,'Upg_Shield','Upg Shield',5,20,NULL,650,NULL,65,NULL,1,0x00004082,7,2,32,NULL,1,1,3,'bonus bMaxHPrate,3;',NULL,NULL); REPLACE INTO `item_db` VALUES (2152,'Anti_Demon_Shield_C','Anti-Demon Shield',5,0,NULL,0,NULL,120,NULL,0,0xFFFFFFFF,7,2,32,NULL,1,0,3,'bonus2 bSubRace,RC_DemiHuman,25; bonus2 bSubRace,RC_Demon,25; bonus bMaxHP,400;',NULL,NULL); -REPLACE INTO `item_db` VALUES (2153,'Imperial_Guard','Imperial Guard',5,20,NULL,2500,NULL,120,NULL,1,0x00004000,7,2,32,NULL,102,1,0,'bonus bMdef,5; /* if(getrefine()>=6){ bonus2 bSkillAtk,\"LG_SHIELDPRESS\",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,\"LG_SHIELDPRESS\",20; } */',NULL,NULL); +REPLACE INTO `item_db` VALUES (2153,'Imperial_Guard','Imperial Guard',5,20,NULL,2500,NULL,120,NULL,1,0x00004000,7,2,32,NULL,102,1,4,'bonus bMdef,5; /* if(getrefine()>=6){ bonus2 bSkillAtk,\"LG_SHIELDPRESS\",20+((getrefine()-5)*2); } else { bonus2 bSkillAtk,\"LG_SHIELDPRESS\",20; } */',NULL,NULL); REPLACE INTO `item_db` VALUES (2154,'Toy_Shield','Toy Shield',5,0,NULL,500,NULL,1,NULL,1,0xFFFFFFFF,7,2,32,NULL,10,1,1,NULL,NULL,NULL); # 2155, REPLACE INTO `item_db` VALUES (2156,'Bible_Of_Promise1','Bible Of Promise Vol1',5,20,NULL,500,NULL,10,NULL,1,0x00000100,7,2,32,NULL,110,1,5,'/* skill \"ALL_ODINS_POWER\",1; */',NULL,NULL); -- cgit v1.2.3-70-g09d2