From f05667e4fbf4997fe21411f2eeb91cce3366d79b Mon Sep 17 00:00:00 2001 From: Akinari1087 Date: Sun, 25 Aug 2013 00:31:39 -0400 Subject: [PATCH] Removed RENEWAL_EDP option as it is no longer necessary and is not supported between Pre-Renewal and Renewal Updated La'cryma Stick - Fixes bugreport:7980 --- db/pre-re/item_db.txt | 2 +- db/re/item_db.txt | 2 +- doc/script_commands.txt | 5 ++--- sql-files/item_db.sql | 2 +- sql-files/item_db_re.sql | 2 +- src/config/renewal.h | 9 --------- src/map/battle.c | 18 +++++++----------- src/map/script.c | 7 ------- src/map/status.c | 4 ++-- 9 files changed, 15 insertions(+), 36 deletions(-) diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index b2d3bef205..8547b51fe3 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -891,7 +891,7 @@ 1643,Dead_Tree_Cane,Dead Tree Cane,4,20,,100,100,,1,0,0x00818314,7,2,2,4,70,1,10,{ bonus bMatk,15; bonus bInt,4; if(getrefine()>5) { bonus bInt,getrefine()-5; bonus bMaxHP,-200; bonus bMaxSP,-100; } },{},{} 1644,Piercing_Staff_M,Staff of Piercing,4,20,,500,80,,1,0,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bIgnoreMdefRate,10+getrefine(); },{},{} 1645,Lich_Bone_Wand_M,Lich's Bone Wand,4,20,,800,60,,1,2,0x00018314,2,2,2,3,70,1,10,{ bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine(); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; } },{},{} -1646,La'cryma_Stick,La'cryma Stick,4,20,,500,30,,1,2,0x00010204,2,2,2,3,50,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bMdef,1; bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if(getrefine()>9) bonus2 bCastrate,"WZ_STORMGUST",-8; },{},{} +1646,La'cryma_Stick,La'cryma Stick,4,20,,500,30,,1,2,0x00010204,2,2,2,3,50,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bMdef,getrefine(); bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if(getrefine()>9) bonus2 bCastrate,"WZ_STORMGUST",-8; },{},{} 1647,Croce_Staff,Croce Staff,4,20,,500,30,,1,1,0x00008110,2,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20; },{},{} 1648,Staff_Of_Bordeaux,Staff Of Bordeaux,4,20,,500,30,,1,0,0x00010204,2,2,2,4,50,1,10,{ bonus bMatkRate,15; bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY")==5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{} // Bows diff --git a/db/re/item_db.txt b/db/re/item_db.txt index de30528e42..bf4e4ae687 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -944,7 +944,7 @@ 1643,Dead_Tree_Cane,Dead Tree Cane,4,20,,100,100:155,,1,0,0x00818314,63,2,2,4,70,1,10,{ bonus bInt,4; if (getrefine()>5) { bonus bInt,getrefine()-5; bonus bMaxHP,-200; bonus bMaxSP,-100; } },{},{} 1644,Piercing_Staff_M,Staff of Piercing,4,20,,500,80:145,,1,0,0x00018314,18,2,2,3,70,1,10,{ bonus bInt,4; bonus bMatkRate,15; bonus bIgnoreMdefRate,10+getrefine(); },{},{} 1645,Lich_Bone_Wand_M,Lich's Bone Wand,4,20,,800,60:170,,1,2,0x00018314,18,2,2,3,70,1,10,{ bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine(); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; } },{},{} -1646,La'cryma_Stick,La'cryma Stick,4,20,,500,30:180,,1,2,0x00010204,18,2,2,3,50,1,10,{ bonus bInt,4; bonus bMdef,1; bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if (getrefine() > 9) bonus2 bVariableCastrate,"WZ_STORMGUST",-8; },{},{} +1646,La'cryma_Stick,La'cryma Stick,4,20,,500,30:180,,1,2,0x00010204,18,2,2,3,50,1,10,{ bonus bInt,4; bonus bMdef,getrefine(); bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if (getrefine() > 9) bonus2 bVariableCastrate,"WZ_STORMGUST",-8; },{},{} 1647,Croce_Staff,Croce Staff,4,20,,500,30:175,,1,1,0x00008110,18,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20; },{},{} 1648,Staff_Of_Bordeaux,Staff Of Bordeaux,4,20,,500,30:180,,1,0,0x00010200,18,2,2,4,50,1,10,{ bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{} 1649,Rafini_Staff,Laphine Staff,4,20,,500,30:180,,1,0,0x00818315,63,2,2,3,100,1,10,{ bonus bFixedCastRate,-getrefine(); },{},{} diff --git a/doc/script_commands.txt b/doc/script_commands.txt index a9a60e8b79..0c739c71e8 100644 --- a/doc/script_commands.txt +++ b/doc/script_commands.txt @@ -1,4 +1,4 @@ -//===== rAthena Documentation ================================ +//===== rAthena Documentation ================================ //= rAthena Script Commands //===== By: ================================================== //= rAthena Dev Team @@ -3460,8 +3460,7 @@ The renewal feature to check is determined by type. 2 - RENEWAL_DROP (renewal drop rate algorithms) 3 - RENEWAL_EXP (renewal exp rate algorithms) 4 - RENEWAL_LVDMG (renewal level modifier on damage) - 5 - RENEWAL_EDP (renewal enchant deadly poison algorithm) - 6 - RENEWAL_ASPD (renewal ASPD) + 5 - RENEWAL_ASPD (renewal ASPD) --------------------------------------- diff --git a/sql-files/item_db.sql b/sql-files/item_db.sql index f738cbcf2b..61f01b7b37 100644 --- a/sql-files/item_db.sql +++ b/sql-files/item_db.sql @@ -922,7 +922,7 @@ REPLACE INTO `item_db` VALUES (1642,'Staff_Of_Darkness','Staff Of Darkness',4,20 REPLACE INTO `item_db` VALUES (1643,'Dead_Tree_Cane','Dead Tree Cane',4,20,NULL,100,100,NULL,1,0,0x00818314,7,2,2,4,70,1,10,'bonus bMatk,15; bonus bInt,4; if(getrefine()>5) { bonus bInt,getrefine()-5; bonus bMaxHP,-200; bonus bMaxSP,-100; }',NULL,NULL); REPLACE INTO `item_db` VALUES (1644,'Piercing_Staff_M','Staff of Piercing',4,20,NULL,500,80,NULL,1,0,0x00018314,2,2,2,3,70,1,10,'bonus bInt,4; bonus bMatkRate,15; bonus bIgnoreMdefRate,10+getrefine();',NULL,NULL); REPLACE INTO `item_db` VALUES (1645,'Lich_Bone_Wand_M','Lich\'s Bone Wand',4,20,NULL,800,60,NULL,1,2,0x00018314,2,2,2,3,70,1,10,'bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine(); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; }',NULL,NULL); -REPLACE INTO `item_db` VALUES (1646,'La\'cryma_Stick','La\'cryma Stick',4,20,NULL,500,30,NULL,1,2,0x00010204,2,2,2,3,50,1,10,'bonus bInt,4; bonus bMatkRate,15; bonus bMdef,1; bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if(getrefine()>9) bonus2 bCastrate,"WZ_STORMGUST",-8;',NULL,NULL); +REPLACE INTO `item_db` VALUES (1646,'La\'cryma_Stick','La\'cryma Stick',4,20,NULL,500,30,NULL,1,2,0x00010204,2,2,2,3,50,1,10,'bonus bInt,4; bonus bMatkRate,15; bonus bMdef,getrefine(); bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if(getrefine()>9) bonus2 bCastrate,"WZ_STORMGUST",-8;',NULL,NULL); REPLACE INTO `item_db` VALUES (1647,'Croce_Staff','Croce Staff',4,20,NULL,500,30,NULL,1,1,0x00008110,2,2,2,3,50,1,10,'bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20;',NULL,NULL); REPLACE INTO `item_db` VALUES (1648,'Staff_Of_Bordeaux','Staff Of Bordeaux',4,20,NULL,500,30,NULL,1,0,0x00010204,2,2,2,4,50,1,10,'bonus bMatkRate,15; bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY")==5) { bonus bUseSPrate,-15; bonus bInt,3; }',NULL,NULL); # Bows diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index f917abbb15..65036f72a4 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -975,7 +975,7 @@ REPLACE INTO `item_db_re` VALUES (1642,'Staff_Of_Darkness','Staff Of Darkness',4 REPLACE INTO `item_db_re` VALUES (1643,'Dead_Tree_Cane','Dead Tree Cane',4,20,NULL,100,'100:155',NULL,1,0,0x00818314,63,2,2,4,'70',1,10,'bonus bInt,4; if (getrefine()>5) { bonus bInt,getrefine()-5; bonus bMaxHP,-200; bonus bMaxSP,-100; }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1644,'Piercing_Staff_M','Staff of Piercing',4,20,NULL,500,'80:145',NULL,1,0,0x00018314,18,2,2,3,'70',1,10,'bonus bInt,4; bonus bMatkRate,15; bonus bIgnoreMdefRate,10+getrefine();',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1645,'Lich_Bone_Wand_M','Lich\'s Bone Wand',4,20,NULL,800,'60:170',NULL,1,2,0x00018314,18,2,2,3,'70',1,10,'bonus bInt,1; bonus bDex,1; bonus bAtkEle,Ele_Undead; bonus bMatkRate,20; bonus3 bAutoSpellWhenHit,"NPC_WIDECURSE",5,10+getrefine(); if(getrefine()>=9){ bonus bMatkRate,3; bonus bMaxSP,300; }',NULL,NULL); -REPLACE INTO `item_db_re` VALUES (1646,'La\'cryma_Stick','La\'cryma Stick',4,20,NULL,500,'30:180',NULL,1,2,0x00010204,18,2,2,3,'50',1,10,'bonus bInt,4; bonus bMdef,1; bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if (getrefine() > 9) bonus2 bVariableCastrate,"WZ_STORMGUST",-8;',NULL,NULL); +REPLACE INTO `item_db_re` VALUES (1646,'La\'cryma_Stick','La\'cryma Stick',4,20,NULL,500,'30:180',NULL,1,2,0x00010204,18,2,2,3,'50',1,10,'bonus bInt,4; bonus bMdef,getrefine(); bonus2 bSkillAtk,"WZ_STORMGUST",getrefine(); if (getrefine() > 9) bonus2 bVariableCastrate,"WZ_STORMGUST",-8;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1647,'Croce_Staff','Croce Staff',4,20,NULL,500,'30:175',NULL,1,1,0x00008110,18,2,2,3,'50',1,10,'bonus bAtkEle,Ele_Holy; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1648,'Staff_Of_Bordeaux','Staff Of Bordeaux',4,20,NULL,500,'30:180',NULL,1,0,0x00010200,18,2,2,4,'50',1,10,'bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; }',NULL,NULL); REPLACE INTO `item_db_re` VALUES (1649,'Rafini_Staff','Laphine Staff',4,20,NULL,500,'30:180',NULL,1,0,0x00818315,63,2,2,3,'100',1,10,'bonus bFixedCastRate,-getrefine();',NULL,NULL); diff --git a/src/config/renewal.h b/src/config/renewal.h index 339937adba..bcabad92b6 100644 --- a/src/config/renewal.h +++ b/src/config/renewal.h @@ -49,15 +49,6 @@ // leave this line to enable renewal base level modifier on skill damage (selected skills only) #define RENEWAL_LVDMG -/// renewal enchant deadly poison algorithm -/// -/// leave this line to enable the renewed EDP algorithm -/// under renewal mode: -/// - damage is NOT increased by 400% -/// - it does NOT affect grimtooth -/// - weapon and status ATK are increased -#define RENEWAL_EDP - /// renewal ASPD [malufett] /// (disable by commenting the line) /// diff --git a/src/map/battle.c b/src/map/battle.c index 2010e42f6d..b2a5165328 100644 --- a/src/map/battle.c +++ b/src/map/battle.c @@ -3642,14 +3642,15 @@ struct Damage battle_attack_sc_bonus(struct Damage wd, struct block_list *src, u // Pre-Renewal only: Soul Breaker and Meteor Assault ignores EDP // Renewal only: Grimtooth and Venom Knife ignore EDP // Both: Venom Splasher ignores EDP [helvetica] -#ifndef RENEWAL_EDP +#ifndef RENEWAL case ASC_BREAKER: case ASC_METEORASSAULT: #else case AS_GRIMTOOTH: case AS_VENOMKNIFE: #endif break; // skills above have no effect with edp -#if defined RENEWAL && defined RENEWAL_EDP // renewal EDP mode requires renewal enabled as well +#ifdef RENEWAL + // renewal EDP mode requires renewal enabled as well // Renewal EDP: damage gets a half modifier on top of EDP bonus for skills [helvetica] // * Sonic Blow // * Soul Breaker @@ -6910,11 +6911,10 @@ void rAthena_report(char* date, char *time_c) { C_RENEWAL_DROP = 0x0080, C_RENEWAL_EXP = 0x0100, C_RENEWAL_LVDMG = 0x0200, - C_RENEWAL_EDP = 0x0400, - C_RENEWAL_ASPD = 0x0800, - C_SECURE_NPCTIMEOUT = 0x1000, - C_SQL_DBS = 0x2000, - C_SQL_LOGS = 0x4000, + C_RENEWAL_ASPD = 0x0400, + C_SECURE_NPCTIMEOUT = 0x0800, + C_SQL_DBS = 0x1000, + C_SQL_LOGS = 0x2000, }; if( (rev_str = get_svn_revision()) != 0 ) @@ -6965,10 +6965,6 @@ void rAthena_report(char* date, char *time_c) { config |= C_RENEWAL_LVDMG; #endif -#ifdef RENEWAL_EDP - config |= C_RENEWAL_EDP; -#endif - #ifdef RENEWAL_ASPD config |= C_RENEWAL_ASPD; #endif diff --git a/src/map/script.c b/src/map/script.c index 1f471553bf..d91bfec7ba 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -17445,13 +17445,6 @@ BUILDIN_FUNC(checkre) #endif break; case 5: - #ifdef RENEWAL_EDP - script_pushint(st, 1); - #else - script_pushint(st, 0); - #endif - break; - case 6: #ifdef RENEWAL_ASPD script_pushint(st, 1); #else diff --git a/src/map/status.c b/src/map/status.c index 6f7907b5af..c7fe0c9029 100644 --- a/src/map/status.c +++ b/src/map/status.c @@ -978,7 +978,7 @@ void initChangeTables(void) { StatusChangeFlagTable[SC_VITATA_500] |= SCB_REGEN; StatusChangeFlagTable[SC_EXTRACT_SALAMINE_JUICE] |= SCB_ASPD; -#ifdef RENEWAL_EDP +#ifdef RENEWAL // renewal EDP increases your weapon atk StatusChangeFlagTable[SC_EDP] |= SCB_WATK; #endif @@ -7401,7 +7401,7 @@ int status_change_start(struct block_list* src, struct block_list* bl,enum sc_ty break; case SC_EDP: // [Celest] val2 = val1 + 2; //Chance to Poison enemies. -#ifndef RENEWAL_EDP +#ifndef RENEWAL val3 = 50*(val1+1); //Damage increase (+50 +50*lv%) #endif if( sd )//[Ind] - iROwiki says each level increases its duration by 3 seconds