Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Autobonus on ground skill and Angelic Ring fixed

Browse Source 
- Autobonus3 will now also trigger when using ground skills (bugreport:6434)
- Fixed trigger chance of the Angelic Ring auto-bonuses (5% -> 10%) and that they didn't display any effect
This commit is contained in:
Playtester 2014-11-17 17:05:10 +01:00
parent 796b97455c
commit a0bd0168cf
5 changed files with 16645 additions and 16645 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/pre-re/item_db.txt
View File

@ -1561,7 +1561,7 @@
2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{} 2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{}
2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{} 2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{}
//2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{} //2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,7,2,136,,0,0,0,{},{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY"; },{},{} 2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }"; },{},{}
2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bCastrate,-10; bonus bDelayRate,-5; },{},{} 2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,2,2,136,,70,0,0,{ bonus bCastrate,-10; bonus bDelayRate,-5; },{},{}
2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,2,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{} 2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,2,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{}
2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,2,2,136,,80,0,0,{ bonus bAgi,3; },{},{} 2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,2,2,136,,80,0,0,{ bonus bAgi,3; },{},{}

2
db/re/item_db.txt
View File

@ -1816,7 +1816,7 @@
2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{} 2740,Rusty_Coin,Rusty Coin,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus2 bAddClass,Class_All,3; bonus bMatkRate,3; },{},{}
2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bVariableCastrate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{} 2741,All_In_One_Ring,All In One Ring,4,20,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{ bonus bAllStats,1; bonus bNoCastCancel,0; bonus bVariableCastrate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1; },{},{}
2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{} 2742,Lucky_Clip,Lucky Clip,4,0,,0,,0,,0,0xFFFFFFFF,63,2,136,,0,0,0,{},{},{}
2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY"; },{},{} 2743,Angelic_Ring,Angelic Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }"; },{},{}
2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bVariableCastrate,-10; bonus bDelayRate,5; },{},{} 2744,Sprint_Ring,Sprint Ring,4,20,,100,,0,,0,0x00CFFF80,18,2,136,,70,0,0,{ bonus bVariableCastrate,-10; bonus bDelayRate,5; },{},{}
2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,18,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{} 2745,Pinguicula_Corsage,Pinguicula Corsage,4,20,,200,,0,,1,0x00CFFF80,18,2,136,,70,0,0,{ bonus bMdef,2; bonus bMaxSP,25; },{},{}
2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,18,2,136,,80,0,0,{ bonus bAgi,3; },{},{} 2746,Cold_Heart,Cold Heart,4,20,,100,,1,,0,0x00001000,18,2,136,,80,0,0,{ bonus bAgi,3; },{},{}

2
sql-files/item_db.sql
View File

@ -1592,7 +1592,7 @@ REPLACE INTO `item_db` VALUES (2739,'Ordinary_Coin','Ordinary Coin',4,0,NULL,0,N
REPLACE INTO `item_db` VALUES (2740,'Rusty_Coin','Rusty Coin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus2 bAddClass,Class_All,3; bonus bMatkRate,3;',NULL,NULL); REPLACE INTO `item_db` VALUES (2740,'Rusty_Coin','Rusty Coin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus2 bAddClass,Class_All,3; bonus bMatkRate,3;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2741,'All_In_One_Ring','All In One Ring',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1;',NULL,NULL); REPLACE INTO `item_db` VALUES (2741,'All_In_One_Ring','All In One Ring',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,'bonus bAllStats,1; bonus bNoCastCancel,0; bonus bCastRate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1;',NULL,NULL);
#REPLACE INTO `item_db` VALUES (2742,'Lucky_Clip','Lucky Clip',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,NULL,NULL,NULL); #REPLACE INTO `item_db` VALUES (2742,'Lucky_Clip','Lucky Clip',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,7,2,136,NULL,0,0,0,NULL,NULL,NULL);
REPLACE INTO `item_db` VALUES (2743,'Angelic_Ring','Angelic Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY";',NULL,NULL); REPLACE INTO `item_db` VALUES (2743,'Angelic_Ring','Angelic Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }";',NULL,NULL);
REPLACE INTO `item_db` VALUES (2744,'Sprint_Ring','Sprint Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bCastrate,-10; bonus bDelayRate,-5;',NULL,NULL); REPLACE INTO `item_db` VALUES (2744,'Sprint_Ring','Sprint Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bCastrate,-10; bonus bDelayRate,-5;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2745,'Pinguicula_Corsage','Pinguicula Corsage',4,20,NULL,200,NULL,0,NULL,1,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bMdef,2; bonus bMaxSP,25;',NULL,NULL); REPLACE INTO `item_db` VALUES (2745,'Pinguicula_Corsage','Pinguicula Corsage',4,20,NULL,200,NULL,0,NULL,1,0x00CFFF80,2,2,136,NULL,70,0,0,'bonus bMdef,2; bonus bMaxSP,25;',NULL,NULL);
REPLACE INTO `item_db` VALUES (2746,'Cold_Heart','Cold Heart',4,20,NULL,100,NULL,1,NULL,0,0x00001000,2,2,136,NULL,80,0,0,'bonus bAgi,3;',NULL,NULL); REPLACE INTO `item_db` VALUES (2746,'Cold_Heart','Cold Heart',4,20,NULL,100,NULL,1,NULL,0,0x00001000,2,2,136,NULL,80,0,0,'bonus bAgi,3;',NULL,NULL);

2
sql-files/item_db_re.sql
View File

@ -1847,7 +1847,7 @@ REPLACE INTO `item_db_re` VALUES (2739,'Ordinary_Coin','Ordinary Coin',4,0,NULL,
REPLACE INTO `item_db_re` VALUES (2740,'Rusty_Coin','Rusty Coin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bAddClass,Class_All,3; bonus bMatkRate,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2740,'Rusty_Coin','Rusty Coin',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus2 bAddClass,Class_All,3; bonus bMatkRate,3;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2741,'All_In_One_Ring','All In One Ring',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAllStats,1; bonus bNoCastCancel,0; bonus bVariableCastrate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2741,'All_In_One_Ring','All In One Ring',4,20,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,'bonus bAllStats,1; bonus bNoCastCancel,0; bonus bVariableCastrate,10; skill "AL_HEAL",1; skill "AL_TELEPORT",1;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2742,'Lucky_Clip','Lucky Clip',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (2742,'Lucky_Clip','Lucky Clip',4,0,NULL,0,NULL,0,NULL,0,0xFFFFFFFF,63,2,136,NULL,'0',0,0,NULL,NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2743,'Angelic_Ring','Angelic Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AL_HEAL"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"AM_POTIONPITCHER"; autobonus3 "{ bonus bHealPower,20; }",50,3000,"PR_SANCTUARY";',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2743,'Angelic_Ring','Angelic Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bInt,2; bonus bDex,1; bonus bMdef,2; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AL_HEAL","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"AM_POTIONPITCHER","{ specialeffect2 EF_HEAL3; }"; autobonus3 "{ bonus bHealPower,20; }",100,3000,"PR_SANCTUARY","{ specialeffect2 EF_HEAL3; }";',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2744,'Sprint_Ring','Sprint Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bVariableCastrate,-10; bonus bDelayRate,5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2744,'Sprint_Ring','Sprint Ring',4,20,NULL,100,NULL,0,NULL,0,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bVariableCastrate,-10; bonus bDelayRate,5;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2745,'Pinguicula_Corsage','Pinguicula Corsage',4,20,NULL,200,NULL,0,NULL,1,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bMdef,2; bonus bMaxSP,25;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2745,'Pinguicula_Corsage','Pinguicula Corsage',4,20,NULL,200,NULL,0,NULL,1,0x00CFFF80,18,2,136,NULL,'70',0,0,'bonus bMdef,2; bonus bMaxSP,25;',NULL,NULL);
REPLACE INTO `item_db_re` VALUES (2746,'Cold_Heart','Cold Heart',4,20,NULL,100,NULL,1,NULL,0,0x00001000,18,2,136,NULL,'80',0,0,'bonus bAgi,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (2746,'Cold_Heart','Cold Heart',4,20,NULL,100,NULL,1,NULL,0,0x00001000,18,2,136,NULL,'80',0,0,'bonus bAgi,3;',NULL,NULL);

2
src/map/skill.c
View File

@ -11633,7 +11633,7 @@ int skill_castend_pos2(struct block_list* src, int x, int y, uint16 skill_id, ui
{// consume arrow if this is a ground skill {// consume arrow if this is a ground skill
battle_consume_ammo(sd, skill_id, skill_lv); battle_consume_ammo(sd, skill_id, skill_lv);
} }
skill_onskillusage(sd, NULL, skill_id, tick);
// perform skill requirement consumption // perform skill requirement consumption
skill_consume_requirement(sd,skill_id,skill_lv,2); skill_consume_requirement(sd,skill_id,skill_lv,2);
} }