Index: db/pre-re/skill_db.txt --- db/pre-re/skill_db.txt Base (BASE) +++ db/pre-re/skill_db.txt Locally Modified (Based On LOCAL) @@ -38,6 +38,7 @@ // 0x1000- disable usage on enemies (for non-offensive skills). // 0x2000- skill ignores land protector (e.g. arrow shower) // 0x4000- chorus skill +// 0x8000- skill that doesn't stop camouflage // 13 maxcount: max amount of skill instances to place on the ground when // player_land_skill_limit/monster_land_skill_limit is enabled. For skills // that attack using a path, this is the path length to be used. @@ -167,12 +168,12 @@ 121,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0, HT_FREEZINGTRAP,Freezing Trap 122,3,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0, HT_BLASTMINE,Blast Mine 123,3,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0, HT_CLAYMORETRAP,Claymore Trap -124,2,6,32,0,0x1,0,1,1,no,0,0,0,misc,0, HT_REMOVETRAP,Remove Trap +124,2,6,32,0,0x1,0,1,1,no,0,0x8000,0,misc,0, HT_REMOVETRAP,Remove Trap 125,3,6,2,0,0x1,0,1,1,no,0,0x80,0,misc,0, HT_TALKIEBOX,Talkie Box 126,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, HT_BEASTBANE,Beast Bane 127,0,0,0,0,0,0,1,0,no,0,0,0,misc,0, HT_FALCON,Falconry Mastery 128,0,0,0,0,0,0,10,0,no,0,0,0,misc,0, HT_STEELCROW,Steel Crow -129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0,0,misc,0, HT_BLITZBEAT,Blitz Beat +129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0x8000,0,misc,0, HT_BLITZBEAT,Blitz Beat 130,3:5:7:9,6,2,0,0x3,3,4,1,no,0,0,0,misc,0, HT_DETECTING,Detect 131,4:5:6:7:8,6,32,0,0x1,0,5,1,no,0,0,0,misc,0, HT_SPRINGTRAP,Spring Trap 132,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, AS_RIGHT,Righthand Mastery @@ -423,10 +424,10 @@ //377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0, ASC_HALLUCINATION,Hallucination Walk 378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0, ASC_EDP,Enchant Deadly Poison 379,7,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0, ASC_BREAKER,Soul Destroyer -380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, SN_SIGHT,Falcon Eyes -381,5,8,1,0,0x40,0,5,1,yes,0,0,0,misc,0, SN_FALCONASSAULT,Falcon Assault -382,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0, SN_SHARPSHOOTING,Focused Arrow Strike -383,0,6,4,0,0x3,-1,10,1,yes,0,0,0,weapon,0, SN_WINDWALK,Wind Walker +380,0,6,4,0,0x1,0,10,1,no,0,0x8000,0,weapon,0, SN_SIGHT,Falcon Eyes +381,5,8,1,0,0x40,0,5,1,yes,0,0x8000,0,misc,0, SN_FALCONASSAULT,Falcon Assault +382,9,8,1,-1,0,2,5,1,yes,0,0x8000,13,weapon,0, SN_SHARPSHOOTING,Focused Arrow Strike +383,0,6,4,0,0x3,-1,10,1,yes,0,0x8000,0,weapon,0, SN_WINDWALK,Wind Walker 384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0, WS_MELTDOWN,Shattering Strike //385,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0, WS_CREATECOIN,Create Coins //386,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0, WS_CREATENUGGET,Create Nuggets @@ -785,21 +786,21 @@ //**** // RA Ranger //**** -2233,9,8,1,-1,0x2,3:3:3:3:3:4:4:4:4:5,10,-3,yes,0,0,0,weapon,0, RA_ARROWSTORM,Arrow Storm -2234,0,6,4,0,0,0,5,1,yes,0,0,0,none,0, RA_FEARBREEZE,Fear Breeze +2233,9,8,1,-1,0x2,3:3:3:3:3:4:4:4:4:5,10,-3,yes,0,0x8000,0,weapon,0, RA_ARROWSTORM,Arrow Storm +2234,0,6,4,0,0,0,5,1,yes,0,0x8000,0,none,0, RA_FEARBREEZE,Fear Breeze 2235,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RA_RANGERMAIN,Ranger Main -2236,9,8,1,-1,0,0,10,1,yes,0,0,0,weapon,0, RA_AIMEDBOLT,Aimed Bolt +2236,9,8,1,-1,0,0,10,1,yes,0,0x8000,0,weapon,0, RA_AIMEDBOLT,Aimed Bolt 2237,9,6,2,0,0x3,3,1,1,no,0,0,0,none,0, RA_DETONATOR,Detonator 2238,3,6,2,0,0x3,2,5,1,no,0,0x80,3,misc,0, RA_ELECTRICSHOCKER,Electric Shocker 2239,3,6,2,0,0x42,3,5,1,no,0,0x80,3,misc,0, RA_CLUSTERBOMB,Cluster Bomb -2240,0,6,4,0,0,0,1,1,no,0,0,0,none,0, RA_WUGMASTERY,Warg Mastery -2241,0,6,4,0,0,0,3,1,no,0,0,0,none,0, RA_WUGRIDER,Warg Rider -2242,0,6,4,-1,0x2,1,1,0,no,0,0,0,weapon,0, RA_WUGDASH,Warg Dash -2243,9,6,1,0,0,0,5,1,no,0,0,0,weapon,0, RA_WUGSTRIKE,Warg Strike -2244,9,6,1,0,0,0,5,1,no,0,0,0,weapon,0, RA_WUGBITE,Warg Bite +2240,0,6,4,0,0,0,1,1,no,0,0x8000,0,none,0, RA_WUGMASTERY,Warg Mastery +2241,0,6,4,0,0,0,3,1,no,0,0x8000,0,none,0, RA_WUGRIDER,Warg Rider +2242,0,6,4,-1,0x2,1,1,0,no,0,0x8000,0,weapon,0, RA_WUGDASH,Warg Dash +2243,9,6,1,0,0,0,5,1,no,0,0x8000,0,weapon,0, RA_WUGSTRIKE,Warg Strike +2244,9,6,1,0,0,0,5,1,no,0,0x8000,0,weapon,0, RA_WUGBITE,Warg Bite 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RA_TOOTHOFWUG,Tooth of Warg 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0,0,weapon,0, RA_SENSITIVEKEEN,Sensitive Keen -2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_CAMOUFLAGE,Camouflage +2247,0,6,4,0,0x1,0,5,1,no,0,0x8000,0,none,0, RA_CAMOUFLAGE,Camouflage 2248,0,0,0,0,0,0,5,0,no,0,0,0,none,0, RA_RESEARCHTRAP,Research Trap 2249,3,6,2,3,0x43,2,1,1,no,0,0x80,1,misc,0, RA_MAGENTATRAP,Magenta Trap 2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0, RA_COBALTTRAP,Cobalt Trap Index: db/re/skill_db.txt --- db/re/skill_db.txt Base (BASE) +++ db/re/skill_db.txt Locally Modified (Based On LOCAL) @@ -38,6 +38,7 @@ // 0x1000- disable usage on enemies (for non-offensive skills). // 0x2000- skill ignores land protector (e.g. arrow shower) // 0x4000- chorus skill +// 0x8000- skill that doesn't stop camouflage // 13 maxcount: max amount of skill instances to place on the ground when // player_land_skill_limit/monster_land_skill_limit is enabled. For skills // that attack using a path, this is the path length to be used. @@ -167,12 +168,12 @@ 121,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0, HT_FREEZINGTRAP,Freezing Trap 122,3,6,2,4,0x42,1,5,1,no,0,0x80,0,misc,0, HT_BLASTMINE,Blast Mine 123,3,6,2,3,0x42,2,5,1,no,0,0x80,0,misc,0, HT_CLAYMORETRAP,Claymore Trap -124,2,6,32,0,0x1,0,1,1,no,0,0,0,misc,0, HT_REMOVETRAP,Remove Trap +124,2,6,32,0,0x1,0,1,1,no,0,0x8000,0,misc,0, HT_REMOVETRAP,Remove Trap 125,3,6,2,0,0x1,0,1,1,no,0,0x80,0,misc,0, HT_TALKIEBOX,Talkie Box 126,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0, HT_BEASTBANE,Beast Bane 127,0,0,0,0,0,0,1,0,no,0,0,0,misc,0, HT_FALCON,Falconry Mastery 128,0,0,0,0,0,0,10,0,no,0,0,0,misc,0, HT_STEELCROW,Steel Crow -129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0,0,misc,0, HT_BLITZBEAT,Blitz Beat +129,5,8,1,0,0x42,1,5,1:2:3:4:5,yes,0,0x8000,0,misc,0, HT_BLITZBEAT,Blitz Beat 130,3:5:7:9,6,2,0,0x3,3,4,1,no,0,0,0,misc,0, HT_DETECTING,Detect 131,4:5:6:7:8,6,32,0,0x1,0,5,1,no,0,0,0,misc,0, HT_SPRINGTRAP,Spring Trap 132,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0, AS_RIGHT,Righthand Mastery @@ -423,10 +424,10 @@ //377,0,0,4,0,0x1,0,10,1,no,0,0,0,misc,0, ASC_HALLUCINATION,Hallucination Walk 378,0,6,4,5,0x1,0,5,1,no,0,0,0,weapon,0, ASC_EDP,Enchant Deadly Poison 379,7,6,1,-1,0x8,0,10,1,yes,0,0,0,weapon,0, ASC_BREAKER,Soul Destroyer -380,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0, SN_SIGHT,Falcon Eyes -381,5,8,1,0,0x40,0,5,1,yes,0,0,0,misc,0, SN_FALCONASSAULT,Falcon Assault -382,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0, SN_SHARPSHOOTING,Focused Arrow Strike -383,0,6,4,0,0x3,-1,10,1,yes,0,0,0,weapon,0, SN_WINDWALK,Wind Walker +380,0,6,4,0,0x1,0,10,1,no,0,0x8000,0,weapon,0, SN_SIGHT,Falcon Eyes +381,5,8,1,0,0x40,0,5,1,yes,0,0x8000,0,misc,0, SN_FALCONASSAULT,Falcon Assault +382,9,8,1,-1,0,2,5,1,yes,0,0x8000,13,weapon,0, SN_SHARPSHOOTING,Focused Arrow Strike +383,0,6,4,0,0x3,-1,10,1,yes,0,0x8000,0,weapon,0, SN_WINDWALK,Wind Walker 384,0,0,4,0,0x1,0,10,1,yes,0,0,0,weapon,0, WS_MELTDOWN,Shattering Strike //385,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0, WS_CREATECOIN,Create Coins //386,0,0,4,0,0x1,0,1,1,yes,0,0,0,none,0, WS_CREATENUGGET,Create Nuggets @@ -786,21 +787,21 @@ //**** // RA Ranger //**** -2233,9,8,1,-1,0x2,3:3:3:3:3:4:4:4:4:5,10,-3,yes,0,0,0,weapon,0, RA_ARROWSTORM,Arrow Storm -2234,0,6,4,0,0,0,5,1,yes,0,0,0,none,0, RA_FEARBREEZE,Fear Breeze +2233,9,8,1,-1,0x2,3:3:3:3:3:4:4:4:4:5,10,-3,yes,0,0x8000,0,weapon,0, RA_ARROWSTORM,Arrow Storm +2234,0,6,4,0,0,0,5,1,yes,0,0x8000,0,none,0, RA_FEARBREEZE,Fear Breeze 2235,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RA_RANGERMAIN,Ranger Main -2236,9,8,1,-1,0,0,10,1,yes,0,0,0,weapon,0, RA_AIMEDBOLT,Aimed Bolt +2236,9,8,1,-1,0,0,10,1,yes,0,0x8000,0,weapon,0, RA_AIMEDBOLT,Aimed Bolt 2237,9,6,2,0,0x3,3,1,1,no,0,0,0,none,0, RA_DETONATOR,Detonator 2238,3,6,2,0,0x3,2,5,1,no,0,0x80,3,misc,0, RA_ELECTRICSHOCKER,Electric Shocker 2239,3,6,2,0,0x42,3,5,1,no,0,0x80,3,misc,0, RA_CLUSTERBOMB,Cluster Bomb -2240,0,6,4,0,0,0,1,1,no,0,0,0,none,0, RA_WUGMASTERY,Warg Mastery -2241,0,6,4,0,0,0,3,1,no,0,0,0,none,0, RA_WUGRIDER,Warg Rider -2242,0,6,4,-1,0x2,1,1,0,no,0,0,0,weapon,0, RA_WUGDASH,Warg Dash -2243,9,6,1,0,0,0,5,1,no,0,0,0,weapon,0, RA_WUGSTRIKE,Warg Strike -2244,9,6,1,0,0,0,5,1,no,0,0,0,weapon,0, RA_WUGBITE,Warg Bite +2240,0,6,4,0,0,0,1,1,no,0,0x8000,0,none,0, RA_WUGMASTERY,Warg Mastery +2241,0,6,4,0,0,0,3,1,no,0,0x8000,0,none,0, RA_WUGRIDER,Warg Rider +2242,0,6,4,-1,0x2,1,1,0,no,0,0x8000,0,weapon,0, RA_WUGDASH,Warg Dash +2243,9,6,1,0,0,0,5,1,no,0,0x8000,0,weapon,0, RA_WUGSTRIKE,Warg Strike +2244,9,6,1,0,0,0,5,1,no,0,0x8000,0,weapon,0, RA_WUGBITE,Warg Bite 2245,0,0,0,0,0,0,10,0,no,0,0,0,none,0, RA_TOOTHOFWUG,Tooth of Warg 2246,0,6,4,0,0x2,3:4:5:6:7,5,1,no,0,0,0,weapon,0, RA_SENSITIVEKEEN,Sensitive Keen -2247,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0, RA_CAMOUFLAGE,Camouflage +2247,0,6,4,0,0x1,0,5,1,no,0,0x8000,0,none,0, RA_CAMOUFLAGE,Camouflage 2248,0,0,0,0,0,0,5,0,no,0,0,0,none,0, RA_RESEARCHTRAP,Research Trap 2249,3,6,2,3,0x43,2,1,1,no,0,0x80,1,misc,0, RA_MAGENTATRAP,Magenta Trap 2250,3,6,2,1,0x43,2,1,1,no,0,0x80,1,misc,0, RA_COBALTTRAP,Cobalt Trap Index: src/char/int_auction.c --- src/char/int_auction.c Base (BASE) +++ src/char/int_auction.c Locally Modified (Based On LOCAL) Index: src/map/skill.c --- src/map/skill.c Base (BASE) +++ src/map/skill.c Locally Modified (Based On LOCAL) @@ -9356,7 +9356,7 @@ // SC_MAGICPOWER needs to switch states before any damage is actually dealt skill_toggle_magicpower(src, ud->skill_id); - if( ud->skill_id != RA_CAMOUFLAGE ) // only normal attack and auto cast skills benefit from its bonuses + if(!(skill_get_inf2(ud->skill_id)&INF2_CAMOUFLAGE)) // only normal attack, auto cast and marked skills benefit from its bonuses status_change_end(src,SC_CAMOUFLAGE, INVALID_TIMER); if (skill_get_casttype(ud->skill_id) == CAST_NODAMAGE) @@ -9566,7 +9566,8 @@ // } // } unit_set_walkdelay(src, tick, battle_config.default_walk_delay+skill_get_walkdelay(ud->skill_id, ud->skill_lv), 1); - status_change_end(src,SC_CAMOUFLAGE, INVALID_TIMER);// only normal attack and auto cast skills benefit from its bonuses + if(!(skill_get_inf2(ud->skill_id)&INF2_CAMOUFLAGE)) // only normal attack, auto cast skills, amd ,arked skill benefit from its bonuses + status_change_end(src,SC_CAMOUFLAGE, INVALID_TIMER); map_freeblock_lock(); skill_castend_pos2(src,ud->skillx,ud->skilly,ud->skill_id,ud->skill_lv,tick,0); Index: src/map/skill.h --- src/map/skill.h Base (BASE) +++ src/map/skill.h Locally Modified (Based On LOCAL) @@ -70,6 +70,7 @@ INF2_NO_ENEMY = 0x1000, INF2_NOLP = 0x2000, // Spells that can ignore Land Protector INF2_CHORUS_SKILL = 0x4000, // Chorus skill + INF2_CAMOUFLAGE = 0x8000, //skill that let camouflage continue }; //Walk intervals at which chase-skills are attempted to be triggered.