From 797e2b728c34e2037da494070913bbe2f84a91c2 Mon Sep 17 00:00:00 2001 From: rud0lp20 Date: Mon, 3 Sep 2012 02:50:41 +0000 Subject: Fixed bugreport:6581 applied balance update to MO_EXTREMITYFIST. Fixed bugreport:6457 where SR_CURSEDCIRCLE is not remove when target dies. Fixed bugreport:6535 updated GN_CRAZY_WEED to its official behavior. Fixed bugreport:6592 added a missing break in Spiral Pierce skillratio at battle.c. Fixed a faulty skillratio formula of GN_CART_TORNADO. Thanks to Lighta git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16738 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/pre-re/skill_cast_db.txt | 4 +++- db/pre-re/skill_db.txt | 4 ++-- db/pre-re/skill_unit_db.txt | 1 + db/re/skill_cast_db.txt | 4 +++- db/re/skill_db.txt | 4 ++-- db/re/skill_unit_db.txt | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) (limited to 'db') diff --git a/db/pre-re/skill_cast_db.txt b/db/pre-re/skill_cast_db.txt index af5f18d3f..912f99264 100644 --- a/db/pre-re/skill_cast_db.txt +++ b/db/pre-re/skill_cast_db.txt @@ -1593,8 +1593,10 @@ 2481,1500,500,0,2000:2000:3000:3000:4000,0,5000 //-- GN_WALLOFTHORN 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000 -//-- GN_CRAZYWEED //CHECK Will need to recheck this skill later if durations needs to be set. +//-- GN_CRAZYWEED 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000 +//-- GN_CRAZYWEED_ATK +2484,0,0,0,100,0,0 //-- GN_DEMONIC_FIRE //CHECK Is duration 2 the burning? 2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,10000,5000 diff --git a/db/pre-re/skill_db.txt b/db/pre-re/skill_db.txt index 8c7a9758f..9c7a32279 100644 --- a/db/pre-re/skill_db.txt +++ b/db/pre-re/skill_db.txt @@ -983,8 +983,8 @@ 2480,11,6,1,0,0x1,0,5,1,yes,0,0,3,misc,0, GN_BLOOD_SUCKER,Blood Sucker //CHECK Data says its a magic attack. Hmmmm.... 2481,11,6,1,-1,0x2,1:2:3:4:5,5,1,yes,0,0,0,weapon,0, GN_SPORE_EXPLOSION,Spore Explosion //CHECK Data says its element is set to neutral. Need to confirm. 2482,11,6,16,0,0,0,5,1,yes,0,0,1,weapon,2, GN_WALLOFTHORN,Wall of Thorns -2483,11,6,2,0,0x3,4,10,1,yes,0,0,0,weapon,0, GN_CRAZYWEED,Crazy Weed -2484,0,6,2,2,0x2,2,10,1,no,0,0,0,weapon,0, GN_CRAZYWEED_ATK,Crazy Weed Attack +2483,11,6,2,0,0x3,4,10,1,yes,0,0x2000,0,weapon,0, GN_CRAZYWEED,Crazy Weed +2484,0,6,2,2,0x2,3,10,1,no,0,0x2000,0,weapon,0, GN_CRAZYWEED_ATK,Crazy Weed Attack 2485,9,6,2,3,0,0,5,1,yes,0,0,0,magic,0, GN_DEMONIC_FIRE,Demonic Fire 2486,9,6,2,0,0,0,5,1,yes,0,0,0,none,0, GN_FIRE_EXPANSION,Fire Expansion //CHECK FIX ME!!!! Level 1 is reducing the damage. Should increase it by 50% 2487,9,6,2,0,0,0,1,1,no,0,0,0,none,0, GN_FIRE_EXPANSION_SMOKE_POWDER,Fire Expansion Smoke Powder diff --git a/db/pre-re/skill_unit_db.txt b/db/pre-re/skill_unit_db.txt index 37f2eb317..17c61dfa9 100644 --- a/db/pre-re/skill_unit_db.txt +++ b/db/pre-re/skill_unit_db.txt @@ -143,6 +143,7 @@ 2479,0xe5, , 0, 1,1000,enemy, 0x000 //GN_THORNS_TRAP 2482,0xe6,0x7f, -1, 1, -1,all, 0x000 //GN_WALLOFTHORN +2484,0x86, , 0, 1, 100,enemy, 0x080 //GN_CRAZYWEED_ATK 2485,0xe7, , 0, 3,1000,enemy, 0x098 //GN_DEMONIC_FIRE 2487,0xe8, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_SMOKE_POWDER 2488,0xe9, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_TEAR_GAS diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 434fc04fa..d5ad33731 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1213,7 +1213,7 @@ //-- WL_COMET 2213,10000:11000:12000:13000:14000,0,15000,0,60000,1000:1500:2000:2500:3000 //-- WL_CHAINLIGHTNING -2214,3500:4000:4500:5000:5500,0,0,0,0,3000,1000 +2214,3500:4000:4500:5000:5500,0,0,100,0,3000,1000 //-- WL_EARTHSTRAIN 2216,2000:3000:4000:5000:6000,1000,0,150,0,10000,2000 @@ -1593,6 +1593,8 @@ 2482,1500,500,0,10000:11000:12000:13000:14000,0,5000,-1 //-- GN_CRAZYWEED 2483,3000:3500:4000:4500:5000:5500:6000:6500:7000:7500,500,0,0,0,5000,0 +//-- GN_CRAZYWEED_ATK +2484,0,0,0,100,0,0,0 //-- GN_DEMONIC_FIRE 2485,3000:3500:4000:4500:5000,500,0,10000:12000:14000:16000:18000,15000,5000,-1 diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt index bf08beaa9..4f06486ac 100644 --- a/db/re/skill_db.txt +++ b/db/re/skill_db.txt @@ -984,8 +984,8 @@ 2480,11,6,1,0,0x1,0,5,1,yes,0,0,3,misc,0, GN_BLOOD_SUCKER,Blood Sucker //CHECK Data says its a magic attack. Hmmmm.... 2481,11,6,1,-1,0x2,1:2:3:4:5,5,1,yes,0,0,0,weapon,0, GN_SPORE_EXPLOSION,Spore Explosion //CHECK Data says its element is set to neutral. Need to confirm. 2482,11,6,16,0,0,0,5,1,yes,0,0,1,weapon,2, GN_WALLOFTHORN,Wall of Thorns -2483,11,6,2,0,0x3,4,10,1,yes,0,0,0,weapon,0, GN_CRAZYWEED,Crazy Weed -2484,0,6,2,2,0x2,2,10,1,no,0,0,0,weapon,0, GN_CRAZYWEED_ATK,Crazy Weed Attack +2483,11,6,2,0,0x3,4,10,1,yes,0,0x2000,0,weapon,0, GN_CRAZYWEED,Crazy Weed +2484,0,6,2,2,0x2,3,10,1,no,0,0x2000,0,weapon,0, GN_CRAZYWEED_ATK,Crazy Weed Attack 2485,9,6,2,3,0,0,5,1,yes,0,0,0,magic,0, GN_DEMONIC_FIRE,Demonic Fire 2486,9,6,2,0,0,0,5,1,yes,0,0,0,none,0, GN_FIRE_EXPANSION,Fire Expansion //CHECK FIX ME!!!! Level 1 is reducing the damage. Should increase it by 50% 2487,9,6,2,0,0,0,1,1,no,0,0,0,none,0, GN_FIRE_EXPANSION_SMOKE_POWDER,Fire Expansion Smoke Powder diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index d59f0a60f..82dd43889 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -145,6 +145,7 @@ 2479,0xe5, , 0, 1,1000,enemy, 0x000 //GN_THORNS_TRAP 2482,0xe6,0x7f, -1, 1, -1,all, 0x000 //GN_WALLOFTHORN +2484,0x86, , 0, 1, 100,enemy, 0x080 //GN_CRAZYWEED_ATK 2485,0xe7, , 0, 3,1000,enemy, 0x098 //GN_DEMONIC_FIRE 2487,0xe8, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_SMOKE_POWDER 2488,0xe9, , 0, 3,1000,enemy, 0x000 //GN_FIRE_EXPANSION_TEAR_GAS -- cgit v1.2.3-60-g2f50