Skip to content

Commit

Permalink
Fixed #9
Browse files Browse the repository at this point in the history 
Update some of items database.
Update rAthena d6343fb

Signed-off-by: exneval <exneval.rayz@gmail.com>
  • Loading branch information
@exneval
exneval committed Jan 6, 2016
1 parent 680f9e7 commit 4828daa
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 21 deletions.
2 changes: 1 addition & 1 deletion db/pre-re/item_db.txt
View file
Expand Up @@ -942,7 +942,7 @@
1731,Frozen_Bow,Frozen Bow,5,20,,1400,100,,5,1,0x000A0808,7,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Freeze,1000; },{},{}
1732,Earth_Bow,Earth Bow,5,20,,1400,105,,5,1,0x000A0808,7,2,34,3,55,1,11,{},{},{}
1733,Gust_Bow,Gust Bow,5,20,,1400,95,,5,1,0x000A0808,7,2,34,3,55,1,11,{},{},{}
1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,7,2,34,4,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,7,2,34,3,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
1735,Kkakkung,Kkakkung,5,20,,0,120,,5,0,0x000A0848,7,2,34,1,1,0,11,{ bonus2 bAddClass,Class_All,50; },{},{}
1736,Double_Bound,Double Bound,5,20,,900,70,,5,3,0x00000800,2,2,34,3,70,1,11,{ bonus3 bAutoSpell,"AC_DOUBLE",GetSkillLv("AC_DOUBLE"),10; },{},{}
1737,Ixion_Wing,Ixion Wings,5,20,,300,135,,5,1,0x00000800,2,2,34,4,70,1,11,{ autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; bonus2 bAddSkillBlow,"AC_CHARGEARROW",3; },{},{}
Expand Down
18 changes: 9 additions & 9 deletions db/re/item_db.txt
View file
Expand Up @@ -1046,7 +1046,7 @@
1731,Frozen_Bow,Frozen Bow,5,20,,1400,100,,5,1,0x000A0808,63,2,34,3,55,1,11,{ bonus2 bAddEff,Eff_Freeze,1000; },{},{}
1732,Earth_Bow,Earth Bow,5,20,,1400,105,,5,1,0x000A0808,63,2,34,3,55,1,11,{},{},{}
1733,Gust_Bow,Gust Bow,5,20,,1400,95,,5,1,0x000A0808,63,2,34,3,55,1,11,{},{},{}
1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,63,2,34,4,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
1734,Orc_Archer_Bow,Orc Archer Bow,5,20,,1600,120,,5,0,0x000A0808,63,2,34,3,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
1735,Kkakkung,Kkakkung,5,20,,0,120,,5,0,0x000A0848,63,2,34,1,1,0,11,{ bonus2 bAddClass,Class_All,50; },{},{}
1736,Double_Bound,Double Bound,5,20,,900,70,,5,3,0x00000800,18,2,34,3,70,1,11,{ bonus3 bAutoSpell,"AC_DOUBLE",GetSkillLv("AC_DOUBLE"),10; },{},{}
1737,Ixion_Wing,Ixion Wings,5,20,,300,135,,5,1,0x00000800,18,2,34,4,70,1,11,{ autobonus "{ bonus bAspdRate,7; }",10+getrefine()*2,7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; bonus2 bAddSkillBlow,"AC_CHARGEARROW",3; },{},{}
Expand Down Expand Up @@ -2927,10 +2927,10 @@
4860,Evasion3,Flee+3,6,20,,10,,,,,,,,,,,,,{ bonus bFlee,3; },{},{}
4861,MHP1,MHP+1%,6,20,,10,,,,,,,,,,,,,{ bonus bMaxHPrate,1; },{},{}
4862,MHP2,MHP+2%,6,20,,10,,,,,,,,,,,,,{ bonus bMaxHPrate,2; },{},{}
4863,Fatal1Lv,Fatal1Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCriticalRate,4; bonus bCritical,1; },{},{}
4864,Fatal2Lv,Fatal2Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCriticalRate,6; bonus bCritical,2; },{},{}
4865,Fatal3Lv,Fatal3Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCriticalRate,8; bonus bCritical,3; },{},{}
4866,Fatal4Lv,Fatal4Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCriticalRate,10; bonus bCritical,4; },{},{}
4863,Fatal1Lv,Fatal1Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCritAtkRate,4; bonus bCritical,1; },{},{}
4864,Fatal2Lv,Fatal2Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCritAtkRate,6; bonus bCritical,2; },{},{}
4865,Fatal3Lv,Fatal3Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCritAtkRate,8; bonus bCritical,3; },{},{}
4866,Fatal4Lv,Fatal4Lv,6,10,,0,,,,,,,,,,,,,{ bonus bCritAtkRate,10; bonus bCritical,4; },{},{}
4867,MHP3,MHP+3%,6,20,,10,,,,,,,,,,,,,{ bonus bMaxHPrate,3; },{},{}
4868,MHP4,MHP+4%,6,20,,10,,,,,,,,,,,,,{ bonus bMaxHPrate,4; },{},{}
4869,DelayafterAttack1Lv,DelayafterAttack1Lv,6,10,,0,,,,,,,,,,,,,{ bonus bAspdRate,4; bonus bDelayrate,-4; },{},{}
Expand Down Expand Up @@ -3478,7 +3478,7 @@
5461,Adv_Whisper_Mask,Evolved Whisper Mask,4,20,,300,,1,,0,0xFFFFFFFF,63,2,769,,50,1,458,{ bonus bDex,3; bonus2 bSubEle,Ele_Ghost,20; },{},{}
5462,Spiked_Scarf,Spiked Scarf,4,20,,0,,3,,0,0xFFFFFFFF,63,2,1,,1,0,459,{ bonus bBaseAtk,30; bonus bMaxHPrate,-2; /* Gold PC Room: bonus bMaxHPrate,2; bonus bLongAtkRate,2; bonus bAllStats,1; */ },{},{}
5463,Rainbow_Scarf,Rainbow Scarf,4,20,,0,,0,,0,0xFFFFFFFF,63,2,1,,1,0,460,{ bonus bMatk,30; bonus bMaxSPrate,-2; /* Gold PC Room: bonus bMaxSPrate,2; bonus bVariableCastRate,-2; bonus bAllStats,1; */ },{},{}
5464,Zaha_Doll_Hat,Zaha Doll Hat,4,20,,0,,0,,1,0xFFFFFFFF,63,2,256,,1,1,461,{ set .@r,getrefine(); bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,RC_Undead,10; autobonus "{ bonus2 bSPLossRate,10,1000; bonus bMatk,50+(.@r>5?(.@r-5)*10:0); }",5,5000+(.@r>5?(.@r-5)*1000:0),BF_MAGIC,"{ /* specialeffect2 */ transform 1630,5000+(.@r>5?(.@r-5)*1000:0); }"; autobonus2 "{ bonus2 bSPLossRate,10,1000; bonus bMatk,50+(.@r>5?(.@r-5)*10:0); }",5,5000+(.@r>5?(.@r-5)*1000:0),BF_MAGIC,"{ /* specialeffect2 */ transform 1630,5000+(.@r>5?(.@r-5)*1000:0); }"; },{},{}
5464,Zaha_Doll_Hat,Zaha Doll Hat,4,20,,0,,0,,1,0xFFFFFFFF,63,2,256,,1,1,461,{ bonus bInt,3; bonus bMdef,9; bonus2 bMagicAddRace,RC_Undead,10; autobonus "{ bonus2 bSPLossRate,10,1000; bonus bMatk,50+(getrefine()>5?(getrefine()-5)*10:0); }",5,5000+(getrefine()>5?(getrefine()-5)*1000:0),BF_MAGIC,"{ /* specialeffect2 */ transform 1630,5000+(getrefine()>5?(getrefine()-5)*1000:0); }"; autobonus2 "{ bonus2 bSPLossRate,10,1000; bonus bMatk,50+(getrefine()>5?(getrefine()-5)*10:0); }",5,5000+(getrefine()>5?(getrefine()-5)*1000:0),BF_MAGIC,"{ /* specialeffect2 */ transform 1630,5000+(getrefine()>5?(getrefine()-5)*1000:0); }"; },{},{}
5465,Celestial_Hat,Hat of Fortune,4,20,,500,,3,,1,0xFFFFFFFF,63,2,256,,40,1,462,{ set .@r,getrefine(); bonus bLuk,2; bonus bMdef,5; if(.@r>4) bonus bLuk,.@r-4; },{},{}
5466,Wind_Milestone,Wind Milestone,4,20,,100,,2,,1,0xFFFFFFFF,63,2,256,,30,1,463,{ bonus bAgi,2; skill "AL_TELEPORT",1; },{},{}
5467,Helm_Of_Dragoon,Helm of Dragon,4,20,,1000,,10,,1,0xFFFFFFFF,63,2,256,,1,1,464,{ set .@r,getrefine(); bonus bStr,2; bonus bInt,2; bonus bDex,2; bonus2 bExpAddRace,RC_Dragon,(.@r>=9?8:(.@r>=7?3:0)); },{},{}
Expand Down Expand Up @@ -3511,7 +3511,7 @@
5494,Spinx_Helm_I,Sphinx Hat,4,0,,0,,5,,0,0x00004082,63,2,257,,0,0,137,{ bonus bStr,5; },{},{}
5495,Power_Of_Thor,Power of Thor,4,20,,100,,5,,1,0xFFFFFFFF,63,2,256,,1,1,493,{ bonus bInt,1; bonus bDex,1; bonus bMdef,3; bonus2 bSubEle,Ele_Wind,7; if(getrefine()>=8) { autobonus "{ bonus bBaseAtk,40; bonus bMatk,40; }",10,6000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; autobonus "{ bonus bBaseAtk,40; bonus bMatk,40; }",5,6000,BF_MAGIC,"{ specialeffect2 EF_ENHANCE; }"; } },{},{}
5496,Dice_Hat,Dice Hat,4,20,,300,,3,,0,0xFFFFFFFF,63,2,256,,50,0,494,{ bonus bLuk,4; },{},{}
5497,King_Tiger_Doll_Hat,King Tiger Doll Hat,4,20,,400,,6,,1,0xFFFFFFFE,63,2,256,,1,1,495,{ set .@r,getrefine(); bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; bonus2 bMagicAddRace,RC_Brute,10; autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(.@r>2?(.@r-2)*25:0); }",3+.@r*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_5497\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(.@r>2?(.@r-2)*25:0); }",3+.@r*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_5497\"; }"; },{},{}
5497,King_Tiger_Doll_Hat,King Tiger Doll Hat,4,20,,400,,6,,1,0xFFFFFFFE,63,2,256,,1,1,495,{ bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; bonus2 bMagicAddRace,RC_Brute,10; autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(getrefine()>2?(getrefine()-2)*25:0); }",3+getrefine()*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_5497\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(getrefine()>2?(getrefine()-2)*25:0); }",3+getrefine()*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_5497\"; }"; },{},{}
5498,Wondering_Wolf_Helm,Wandering Wolf Helm,4,20,,600,,5,,1,0xFFFFFFFE,63,2,768,,1,0,490,{ set .@r,getrefine(); bonus bAgi,5; bonus bFlee,10; bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10; bonus2 bIgnoreDefRaceRate,RC_Brute,10; if(.@r>=7) bonus3 bAutoSpell,"NPC_WIDEBLEEDING",1,10; if(.@r>=9) bonus3 bAutoSpell,"MC_LOUD",1,1; },{},{}
5499,Pizza_Hat,Pizza Hat,4,20,,600,,0,,0,0xFFFFFFFF,63,2,256,,0,0,487,{ skill "SM_PROVOKE",1; },{},{}
5500,Icecream_Hat,Icecream Hat,4,0,,300,,6,,0,0xFFFFFFFF,63,2,256,,30,1,488,{ bonus bMdef,3; skill "MG_FROSTDIVER",3; },{},{}
Expand Down Expand Up @@ -9159,7 +9159,7 @@
18112,Upg_Bow,Upg Bow,5,20,,600,60,,5,1,0x000A0848,63,2,34,3,1,0,11,{ set .@r,getrefine(); bonus bBaseAtk,.@r*7; bonus bLongAtkRate,.@r*2; if(BaseJob==Job_Hunter) bonus bBaseAtk,20; if(BaseLevel>70) bonus bBaseAtk,((BaseLevel-70)/10)*10; },{},{}
18113,Velum_Arbalest,Vellum Arbalest,5,20,,1100,50,,5,0,0x000A0848,63,2,34,4,95,1,11,{ bonus4 bSPVanishRaceRate,RC_DemiHuman,1000,4,BF_NORMAL; bonus bAspd,-5; },{},{}
18114,Velum_CrossBow,Vellum CrossBow,5,20,,1100,110,,5,0,0x000A0848,63,2,34,4,95,1,11,{ bonus2 bAddRace,RC_DemiHuman,30+getrefine(); bonus2 bIgnoreDefRaceRate,RC_DemiHuman,30; },{},{}
18115,Orc_Archer_Bow_,Orc Archer Bow,5,20,,1600,120,,5,1,0x000A0848,63,2,34,3,65,1,11,{},{},{}
18115,Orc_Archer_Bow_,Orc Archer Bow,5,20,,1600,120,,5,1,0x000A0848,63,2,34,3,65,1,11,{ bonus2 bAddMonsterDropItem,1753,200; },{},{}
18116,Metal_Bow,Metal Bow,5,20,,0,50,,5,1,0x00080800,63,2,34,3,1,1,11,{ set .@r,getrefine(); set .@i,((BaseLevel/10)>12?12:BaseLevel/10); if(BaseJob==Job_Hunter&&Upper!=2) bonus bBaseAtk,10; bonus bBaseAtk,.@r*3+(.@i>2?(.@i-2)*5:0); bonus bLongAtkRate,.@r; },{},{}
18117,Royal_Bow,Royal Bow,5,200000,,1500,80,,5,1,0x000A0808,63,2,34,4,105,1,11,{},{},{}
18119,Thanatos_Bow,Thanatos Bow,5,20,,1300,180:110,,5,1,0x00080808,63,2,34,4,120,1,11,{ bonus bInt,6; bonus bVit,6; bonus bLuk,-6; bonus2 bHPDrainRate,50,5; bonus2 bSPDrainRate,10,5; bonus2 bHPLossRate,100,10000; },{},{ heal -1000,0; }
Expand Down Expand Up @@ -9511,7 +9511,7 @@
18853,Tasty_Strawberry_Hat_,Tasty Strawberry Hat,4,20,,150,,4,,1,0xFFFFFFFF,63,2,256,,30,1,968,{ bonus bAllStats,1; if(getrefine()>=12) bonus bAspd,2; },{},{}
18854,Yellow_Valentine_Heart,Yellow Valentine Heart,4,20,,0,,0,,0,0xFFFFFFFF,63,2,256,,40,1,865,{ bonus bMaxSPrate,5+getrefine()/2; },{},{}
18855,Aviator_Hat,Aviator Hat,4,20,,100,,10,,0,0xFFFFFFFF,63,2,256,,1,1,972,{ bonus bAgi,3; bonus bInt,3; autobonus "{ bonus bAtkEle,Ele_Wind; }",50,180000,BF_NORMAL; },{},{}
18856,W_King_Tiger_Doll_Hat,W King Tiger Doll Hat,4,20,,0,,10,,0,0xFFFFFFFF,63,2,256,,1,1,973,{ set .@r,getrefine(); bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; bonus2 bMagicAddRace,RC_Brute,10; autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(.@r>2?(.@r-2)*25:0); }",3+.@r*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_18856\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(.@r>2?(.@r-2)*25:0); }",3+.@r*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_18856\"; }"; },{},{}
18856,W_King_Tiger_Doll_Hat,W King Tiger Doll Hat,4,20,,0,,10,,0,0xFFFFFFFF,63,2,256,,1,1,973,{ bonus bStr,2; bonus bDex,2; bonus2 bAddRace,RC_Brute,10; bonus2 bMagicAddRace,RC_Brute,10; autobonus "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(getrefine()>2?(getrefine()-2)*25:0); }",3+getrefine()*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_18856\"; }"; autobonus2 "{ bonus2 bSPLossRate,5,1000; bonus bBaseAtk,25+(getrefine()>2?(getrefine()-2)*25:0); }",3+getrefine()*3,3000,BF_WEAPON,"{ specialeffect2 EF_POTION_BERSERK; transform 1115,3000; callfunc \"F_18856\"; }"; },{},{}
18857,Curupira_Hat,Curupira Hat,4,20,,100,,20,,1,0xFFFFFFFF,63,2,256,,1,1,974,{ bonus bDex,3; bonus2 bAddEffWhenHit,Eff_Confusion,500; },{},{}
18859,Angeling_Bubble,Angeling Bubble,4,20,,50,,5,,0,0xFFFFFFFF,63,2,1,,1,0,975,{ bonus bDex,1; bonus bMatkRate,2; bonus bMaxHP,100; },{},{}
18860,Preschool_Hat,Preschool Hat,4,20,,100,,8,,1,0xFFFFFFFF,63,2,256,,1,1,977,{ bonus bMaxHP,500; bonus2 bSubEle,Ele_Fire,(getrefine()>=6?10:5); },{},{}
Expand Down
2 changes: 1 addition & 1 deletion npc/re/quests/quests_dicastes.txt
View file
Expand Up @@ -357,7 +357,7 @@ OnEnable:
mes "- Cannot communicate with him. -";
close;
}
if (ep13_3_invite < 4) {
if (ep13_3_invite < 5) {
mes "[Capital City Guard]";
mes "Access to the city is restricted from other races without permits.";
mes "Please go back.";
Expand Down
2 changes: 1 addition & 1 deletion sql-files/item_db.sql
View file
Expand Up @@ -973,7 +973,7 @@ REPLACE INTO `item_db` VALUES (1730,'Burning_Bow','Burning Bow',5,20,NULL,1400,9
REPLACE INTO `item_db` VALUES (1731,'Frozen_Bow','Frozen Bow',5,20,NULL,1400,100,NULL,5,1,0x000A0808,7,2,34,3,55,1,11,'bonus2 bAddEff,Eff_Freeze,1000;',NULL,NULL);
REPLACE INTO `item_db` VALUES (1732,'Earth_Bow','Earth Bow',5,20,NULL,1400,105,NULL,5,1,0x000A0808,7,2,34,3,55,1,11,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (1733,'Gust_Bow','Gust Bow',5,20,NULL,1400,95,NULL,5,1,0x000A0808,7,2,34,3,55,1,11,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (1734,'Orc_Archer_Bow','Orc Archer Bow',5,20,NULL,1600,120,NULL,5,0,0x000A0808,7,2,34,4,65,1,11,'bonus2 bAddMonsterDropItem,1753,200;',NULL,NULL);
REPLACE INTO `item_db` VALUES (1734,'Orc_Archer_Bow','Orc Archer Bow',5,20,NULL,1600,120,NULL,5,0,0x000A0808,7,2,34,3,65,1,11,'bonus2 bAddMonsterDropItem,1753,200;',NULL,NULL);
REPLACE INTO `item_db` VALUES (1735,'Kkakkung','Kkakkung',5,20,NULL,0,120,NULL,5,0,0x000A0848,7,2,34,1,1,0,11,'bonus2 bAddClass,Class_All,50;',NULL,NULL);
REPLACE INTO `item_db` VALUES (1736,'Double_Bound','Double Bound',5,20,NULL,900,70,NULL,5,3,0x00000800,2,2,34,3,70,1,11,'bonus3 bAutoSpell,"AC_DOUBLE",GetSkillLv("AC_DOUBLE"),10;',NULL,NULL);
REPLACE INTO `item_db` VALUES (1737,'Ixion_Wing','Ixion Wings',5,20,NULL,300,135,NULL,5,1,0x00000800,2,2,34,4,70,1,11,'autobonus "{ bonus bAspdRate,7; }",10+(getrefine()*2),7000,BF_WEAPON,"{ specialeffect2 EF_HASTEUP; }"; bonus2 bAddSkillBlow,"AC_CHARGEARROW",3;',NULL,NULL);
Expand Down

0 comments on commit 4828daa

Please sign in to comment.