From 97166dfb92d7cbdef8731771c38923cc219a4fc3 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Tue, 11 Dec 2012 17:20:44 +0000 Subject: Happy Holidays and Happy 12/12/12 :) Update Elemental summon to its official behavior - Fixed missing skill features of Ventus(bugreport:6792,bugreport:6723,bugreport:6511) - Note: upgrade_svn17014.sql - And other elemental skills are to follow :) Fixed bugreport:6889 updated const.txt where it cause error to some items. Fixed bugreport:6999 where matk damage deals miss atk to plant type targets. Fixed status calculation where it doesn't give accurate result or how official calculation does. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17014 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/const.txt | 47 ++++++++++++++++++++++++++++++++++++++++++--- db/elemental_db.txt | 41 ++++++++++++++++----------------------- db/pre-re/skill_cast_db.txt | 6 +++++- db/pre-re/skill_db.txt | 4 ++-- db/re/skill_cast_db.txt | 6 +++++- db/re/skill_db.txt | 4 ++-- 6 files changed, 75 insertions(+), 33 deletions(-) (limited to 'db') diff --git a/db/const.txt b/db/const.txt index e271bf68e..6495ff737 100644 --- a/db/const.txt +++ b/db/const.txt @@ -1232,9 +1232,50 @@ SC_TIDAL_WEAPON 504 SC_TIDAL_WEAPON_OPTION 505 SC_ROCK_CRUSHER 506 SC_ROCK_CRUSHER_ATK 507 -SC_INCMHP 529 -SC_INCMSP 530 -SC_PARTYFLEE 531 +SC_LEADERSHIP 508 +SC_GLORYWOUNDS 509 +SC_SOULCOLD 510 +SC_HAWKEYES 511 +SC_ODINS_POWER 512 +SC_RAID 513 +SC_FIRE_INSIGNIA 514 +SC_WATER_INSIGNIA 515 +SC_WIND_INSIGNIA 516 +SC_EARTH_INSIGNIA 517 +SC_PUSH_CART 518 +SC_SPELLBOOK1 519 +SC_SPELLBOOK2 520 +SC_SPELLBOOK3 521 +SC_SPELLBOOK4 522 +SC_SPELLBOOK5 523 +SC_SPELLBOOK6 524 +SC_MAXSPELLBOOK 525 +SC_INCMHP 526 +SC_INCMSP 527 +SC_PARTYFLEE 528 +SC_MEIKYOUSISUI 529 +SC_JYUMONJIKIRI 530 +SC_KYOUGAKU 531 +SC_IZAYOI 532 +SC_ZENKAI 533 +SC_KAGEHUMI 534 +SC_KYOMU 535 +SC_KAGEMUSYA 536 +SC_ZANGETSU 537 +SC_GENSOU 538 +SC_AKAITSUKI 539 +SC_STYLE_CHANGE 540 +SC_GOLDENE_FERSE 541 +SC_ANGRIFFS_MODUS 542 +SC_ERASER_CUTTER 543 +SC_OVERED_BOOST 544 +SC_LIGHT_OF_REGENE 545 +SC_ASH 546 +SC_GRANITIC_ARMOR 547 +SC_MAGMA_FLOW 548 +SC_PYROCLASTIC 549 +SC_PARALYSIS 550 +SC_PAIN_KILLER 551 e_gasp 0 e_what 1 diff --git a/db/elemental_db.txt b/db/elemental_db.txt index 81c0d4836..633ebcdc9 100644 --- a/db/elemental_db.txt +++ b/db/elemental_db.txt @@ -2,30 +2,23 @@ // // Structure of Database: // ID,Sprite_Name,Name,LV,HP,SP,Range1,ATK1,ATK2,DEF,MDEF,STR,AGI,VIT,INT,DEX,LUK,Range2,Range3,Scale,Race,Element,Speed,aDelay,aMotion,dMotion +// NOTE +// Summoned Elemental’s STATs are affected by the Caster’s Base Level and STATs. +// So all value added here will be added and will not override the calculated STATs of the summoned elemental. // Monster Elementals -2114,EL_AGNI_S,Agni,100,5000,1,1,100,100,10,10,1,1,1,1,1,1,5,12,0,0,83,200,504,1020,360 -2115,EL_AGNI_M,Agni,100,7500,1,1,250,250,25,25,1,1,1,1,1,1,5,12,1,0,83,200,504,1020,360 -2116,EL_AGNI_L,Agni,100,10000,1,1,500,500,50,50,1,1,1,1,1,1,5,12,2,0,83,200,504,1020,360 -2117,EL_AQUA_S,Aqua,100,5000,1,1,100,100,10,10,1,1,1,1,1,1,5,12,0,0,81,200,504,1020,360 -2118,EL_AQUA_M,Aqua,100,7500,1,1,250,250,25,25,1,1,1,1,1,1,5,12,1,0,81,200,504,1020,360 -2119,EL_AQUA_L,Aqua,100,10000,1,1,500,500,50,50,1,1,1,1,1,1,5,12,2,0,81,200,504,1020,360 -2120,EL_VENTUS_S,Ventus,100,5000,1,4,100,100,10,10,1,1,1,1,1,1,5,12,0,0,84,200,504,1020,360 -2121,EL_VENTUS_M,Ventus,100,7500,1,4,250,250,25,25,1,1,1,1,1,1,5,12,1,0,84,200,504,1020,360 -2122,EL_VENTUS_L,Ventus,100,10000,1,4,500,500,50,50,1,1,1,1,1,1,5,12,2,0,84,200,504,1020,360 -2123,EL_TERA_S,Tera,100,5000,1,1,100,100,10,10,1,1,1,1,1,1,5,12,0,0,82,200,504,1020,360 -2124,EL_TERA_M,Tera,100,7500,1,1,250,250,25,25,1,1,1,1,1,1,5,12,1,0,82,200,504,1020,360 -2125,EL_TERA_L,Tera,100,10000,1,1,500,500,50,50,1,1,1,1,1,1,5,12,2,0,82,200,504,1020,360 +2114,EL_AGNI_S,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,83,200,504,1020,360 +2115,EL_AGNI_M,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,83,200,504,1020,360 +2116,EL_AGNI_L,Agni,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,83,200,504,1020,360 -//2114,EL_AGNI_S,Agni ,100,5000,500 ,1,250,250 ,10,10, 25,25,25,25,25,25, 10,12,0,0,83,200,504,1020,360 -//2115,EL_AGNI_M,Agni ,100,7500,750 ,1,500,500 ,25,25, 50,50,50,50,50,50, 10,12,1,0,83,200,504,1020,360 -//2116,EL_AGNI_L,Agni ,100,10000,1000 ,1,1000,1000 ,50,50, 100,100,100,100,100,100, 10,12,2,0,83,200,504,1020,360 -//2117,EL_AQUA_S,Aqua ,100,5000,500 ,1,250,250 ,10,10, 25,25,25,25,25,25, 10,12,0,0,81,200,504,1020,360 -//2118,EL_AQUA_M,Aqua ,100,7500,750 ,1,500,500 ,25,25, 50,50,50,50,50,50, 10,12,1,0,81,200,504,1020,360 -//2119,EL_AQUA_L,Aqua ,100,10000,1000 ,1,1000,1000 ,50,50, 100,100,100,100,100,100, 10,12,2,0,81,200,504,1020,360 -//2120,EL_VENTUS_S,Ventus ,100,5000,500 ,4,250,250 ,10,10, 25,25,25,25,25,25, 10,12,0,0,84,200,504,1020,360 -//2121,EL_VENTUS_M,Ventus ,100,7500,750 ,4,500,500 ,25,25, 50,50,50,50,50,50, 10,12,1,0,84,200,504,1020,360 -//2122,EL_VENTUS_L,Ventus ,100,10000,1000 ,4,1000,1000 ,50,50, 100,100,100,100,100,100, 10,12,2,0,84,200,504,1020,360 -//2123,EL_TERA_S,Tera ,100,5000,500 ,1,250,250 ,10,10, 25,25,25,25,25,25, 10,12,0,0,82,200,504,1020,360 -//2124,EL_TERA_M,Tera ,100,7500,750 ,1,500,500 ,25,25, 50,50,50,50,50,50, 10,12,1,0,82,200,504,1020,360 -//2125,EL_TERA_L,Tera ,100,10000,1000 ,1,1000,1000 ,50,50, 100,100,100,100,100,100, 10,12,2,0,82,200,504,1020,360 +2117,EL_AQUA_S,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,81,200,504,1020,360 +2118,EL_AQUA_M,Aqua,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,81,200,504,1020,360 +2119,EL_AQUA_L,Aqua,100,0,1,1,0,0,0,0,1,1,1,1,1,1,5,12,2,0,81,200,504,1020,360 + +2120,EL_VENTUS_S,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,84,200,504,1020,360 +2121,EL_VENTUS_M,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,84,200,504,1020,360 +2122,EL_VENTUS_L,Ventus,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,84,200,504,1020,360 + +2123,EL_TERA_S,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,0,0,82,200,504,1020,360 +2124,EL_TERA_M,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,1,0,82,200,504,1020,360 +2125,EL_TERA_L,Tera,100,0,1,1,0,0,0,0,0,0,0,0,0,0,5,12,2,0,82,200,504,1020,360 diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index d1d938a18..b98202b44 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1884,8 +1884,12 @@ 8424,0,0,0,-1,0,0 //-- EL_TIDAL_WEAPON 8433,0,0,0,-1,0,0 +//-- EL_WIND_SLASH +8434,1000,0,0,0,0,0 +//-- EL_HURRICANE +8435,1000,0,0,0,0,0 //-- EL_TYPOON_MIS -8437,0,0,0,15000,0,0 +8437,1000,0,0,15000,0,0 //-- EL_STONE_HAMMER 8439,0,0,0,5000,0,0 //-- EL_ROCK_CRUSHER diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 149327010..330bccc43 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -1180,8 +1180,8 @@ 8434,11,6,1,4,0,0,1,1,no,0,0,0,weapon,0, EL_WIND_SLASH,Wind Slasher 8435,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_HURRICANE,Hurricane Rage 8436,7,6,1,4,0,0,1,1,no,0,0,0,magic,0, EL_HURRICANE_ATK,Hurricane Rage Attack -8437,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile -8438,11,6,1,4,0,1,1,1,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack +8437,11,8,1,4,0,1,1,-3,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile +8438,11,8,1,4,0,1,1,-3,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack 8439,5,6,1,2,0,0,1,1,no,0,0,0,weapon,0, EL_STONE_HAMMER,Stone Hammer 8440,3,6,1,2,0,1,1,1,no,0,0,0,weapon,0, EL_ROCK_CRUSHER,Rock Launcher 8441,5,6,1,2,0,1,1,1,no,0,0,0,magic,0, EL_ROCK_CRUSHER_ATK,Rock Launcher Attack diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index c03b4c74a..27544aed9 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1884,8 +1884,12 @@ 8424,0,0,0,-1,0,0,-1 //-- EL_TIDAL_WEAPON 8433,0,0,0,-1,0,0,-1 +//-- EL_WIND_SLASH +8434,1000,0,0,0,0,0,-1 +//-- EL_HURRICANE +8435,1000,0,0,0,0,0,-1 //-- EL_TYPOON_MIS -8437,0,0,0,15000,0,0,-1 +8437,1000,0,0,15000,0,0,-1 //-- EL_STONE_HAMMER 8439,0,0,0,5000,0,0,-1 //-- EL_ROCK_CRUSHER diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index 4d25c6e1c..16cdec82d 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -1181,8 +1181,8 @@ 8434,11,6,1,4,0,0,1,1,no,0,0,0,weapon,0, EL_WIND_SLASH,Wind Slasher 8435,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_HURRICANE,Hurricane Rage 8436,7,6,1,4,0,0,1,1,no,0,0,0,magic,0, EL_HURRICANE_ATK,Hurricane Rage Attack -8437,11,6,1,4,0,1,1,1,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile -8438,11,6,1,4,0,1,1,1,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack +8437,11,8,1,4,0,1,1,-3,no,0,0,0,weapon,0, EL_TYPOON_MIS,Typhoon Missile +8438,11,8,1,4,0,1,1,-3,no,0,0,0,magic,0, EL_TYPOON_MIS_ATK,Typhoon Missile Attack 8439,5,6,1,2,0,0,1,1,no,0,0,0,weapon,0, EL_STONE_HAMMER,Stone Hammer 8440,3,6,1,2,0,1,1,1,no,0,0,0,weapon,0, EL_ROCK_CRUSHER,Rock Launcher 8441,5,6,1,2,0,1,1,1,no,0,0,0,magic,0, EL_ROCK_CRUSHER_ATK,Rock Launcher Attack -- cgit v1.2.3-60-g2f50