From 85ae075fd230f7e1d08a84dde6a2cfdce8280ecd Mon Sep 17 00:00:00 2001 From: glighta Date: Thu, 1 Nov 2012 01:40:29 +0000 Subject: -Fix bugreport:6547 (bloodylust) upd bloodylust effect to berserk -Fix bugreport:6208, bugreport:6805 (chaos panic) fix range effect -Partial Fix bugreport:5275 (toxin now won't interupt unbreackable castskill) -Folllow up r16847 fix UNT_ZEPHYR get some unwanted bonus, fix Insignia unit range -Add UF_RANGEDSINGLEUNIT unit propriety thx to 3ceam, workaround to fix ranged unit without timer. -Prevent WM_SOUND_OF_DESTRUCTION, SC_MANHOLE, WM_LULLABY_DEEPSLEEP being cast in non pvp map -Fix SC_MAGICMUSHROOM shouldn't force skill if sit -Replace some hardcoded mobid by enum -add some mob_is definition for quicker search (gvg and treasure) -Remove some duplicate check for status_heal (if berserk already done in status heal) -Upd few documentation git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16855 54d463be-8e91-2dee-dedb-b68131a5f0ec --- db/re/skill_cast_db.txt | 4 ++-- db/re/skill_unit_db.txt | 13 +++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'db') diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt index 4366817c7..1b69feab3 100644 --- a/db/re/skill_cast_db.txt +++ b/db/re/skill_cast_db.txt @@ -1368,8 +1368,8 @@ 2301,2000,2000,0,5000:10000:15000,4000:8000:12000,0,-1 //-- SC_MAELSTROM 2302,2000,2000,0,7000:14000:21000,0,0,-1 -//-- SC_BLOODYLUST -2303,2000,2000,0,10000:20000:30000,30000,0,-1 +//-- SC_BLOODYLUST //dur2=intr +2303,2000,2000,0,10000:20000:30000,0,0,-1 //-- SC_FEINTBOMB 2304,1000,0,0,1000,0,5000,-1 //========================================== diff --git a/db/re/skill_unit_db.txt b/db/re/skill_unit_db.txt index 511a60f4d..3b7d9c26c 100644 --- a/db/re/skill_unit_db.txt +++ b/db/re/skill_unit_db.txt @@ -15,6 +15,7 @@ // 0x200(UF_ENSEMBLE) Ensemble skill // 0x400(UF_SONG) Song skill // 0x800(UF_DUALMODE) Spell has effects both at an interval and when you step in/out +// 0x2000(UF_RANGEDSINGLEUNIT) Layout hack, use layout range propriety but only display center. // Example: 0x006 = 0x002+0x004 -> Cannot be stacked nor cast near targets // // Notes: @@ -121,9 +122,9 @@ 2299,0xcc, , 0, 1,1000,all, 0x006 //SC_MANHOLE 2300,0xcd, , 0, 1,1000,all, 0x006 //SC_DIMENSIONDOOR -2301,0xce, , 0, 2, -1,enemy, 0x00E //SC_CHAOSPANIC +2301,0xce, , 2, 0, -1,enemy, 0x200E //SC_CHAOSPANIC 2302,0xcf, , 0, 2, -1,enemy, 0x002 //SC_MAELSTROM -2303,0xd0, , 0, 2, -1,enemy, 0x018 //SC_BLOODYLUST +2303,0xd0, , 3, 0, -1,all, 0x2018 //SC_BLOODYLUST 2304,0xd1, , 0, 2, -1,enemy, 0x000 //SC_FEINTBOMB 2319,0xec, , 0, 3,5000,all, 0x000 //LG_BANDING @@ -140,10 +141,10 @@ 2450,0xe0, , 3, 0, 500,enemy, 0x010 //SO_CLOUD_KILL 2452,0xe4, , 0, 3,3000,all, 0x010 //SO_WARMER 2453,0xeb, , 0, 1:1:2:2:3,1000,enemy,0x010 //SO_VACUUM_EXTREME -2465,0xf1, , 0, 2,1000,all, 0x010 //SO_FIRE_INSIGNIA -2466,0xf2, , 0, 2,1000,all, 0x010 //SO_WATER_INSIGNIA -2467,0xf3, , 0, 2,1000,all, 0x010 //SO_WIND_INSIGNIA -2468,0xf4, , 0, 2,1000,all, 0x010 //SO_EARTH_INSIGNIA +2465,0xf1, , 0, 1,1000,all, 0x010 //SO_FIRE_INSIGNIA +2466,0xf2, , 0, 1,1000,all, 0x010 //SO_WATER_INSIGNIA +2467,0xf3, , 0, 1,1000,all, 0x010 //SO_WIND_INSIGNIA +2468,0xf4, , 0, 1,1000,all, 0x010 //SO_EARTH_INSIGNIA 2479,0xe5, , 0, 1,1000,enemy, 0x000 //GN_THORNS_TRAP 2482,0xe6,0x7f, -1, 1, -1,all, 0x000 //GN_WALLOFTHORN -- cgit v1.2.3-60-g2f50