- Fix 3rd class skills on pre-renewal.

- When under Mind Break Matk Effect and Mdef reduction should not show on ALT Q(bug:7915)
- Plagiarism should not copy New 3rd class skills. Thanks to OmegaRed (bug:8118)
- Update Runstone Lux Anima to official formula (bug:8285)
- Add official formula for Demonic Fire
- Update damage formula for Unlimit, apply Def and Mdef to 1 during the skill and adjust the cooldown to official. (bug:8227)
- Flash Combo should not consume hp-sp and the skill not ignore the distance.
- Fix a bug with Full Throttle that not consuming sp correctly and adjust the cooldown to official.
- All WoE items are inactive outside WoE or PVP
- Add bonus3 bSPVanishRate for Vellum Items.
- Script Vellum Items.
- Add 2 new bonus bSetDefRace and bSetMDefRace for the Vellum Items. (rAthena c046668034)
- Fixed Bowling Bash, Brandish Spear, Grand Darkness and Meteor Assault reducing def during cast; the only skill that does this officially is Grand Cross (rAthena 694719048e)
- Implemented official Bowling Bash with all its special behaviors including the gutter line
* As many servers probably want to remove the gutter line problem, it is configurable; just adjust the bowling_bash_area setting in skill.conf (Bug:4209)
- Sonic Blow now has a fixed range of 1, even for monsters; a monster can't use this skill if you tank it from farther away (rAthena a15cee063d)

4 files changed, 121 insertions, 21 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 24638452b..17412756e 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -8314,7 +8314,11 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 95
 	View: 16
-	Script: <" bonus bAspdRate,getrefine(); ">
+	Script: <"
+		bonus bAspdRate,getrefine();
+		bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+		bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
+	">
 },
 {
 	Id: 1294
@@ -8331,7 +8335,7 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 95
 	View: 16
-	Script: <" bonus2 bSPVanishRate,10000,10; ">
+	Script: <" bonus3 bSPVanishRate,10000,10,BF_NORMAL; ">
 },
 {
 	Id: 1295
@@ -9737,7 +9741,7 @@ item_db: (
 	View: 7
 	Script: <"
 		bonus bUnbreakableWeapon,0;
-		bonus2 bSPVanishRate,10000,10;
+		bonus3 bSPVanishRate,10000,10,BF_NORMAL;
 	">
 },
 {
@@ -87834,7 +87838,11 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 95
 	View: 1
-	Script: <" bonus bAspdRate,getrefine(); ">
+	Script: <"
+		bonus bAspdRate,getrefine();
+		bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+		bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
+	">
 },
 {
 	Id: 13073
@@ -107399,6 +107407,8 @@ item_db: (
 		bonus bUnbreakableWeapon,0;
 		bonus2 bAddEff,Eff_Stun,1000+getrefine();
 		bonus bAspdRate,getrefine();
+		bonus4 bSetDefRace,RC_DemiHuman,10000,5000,1;
+		bonus4 bSetMDefRace,RC_DemiHuman,10000,5000,1;
 	">
 },
 {
@@ -111241,7 +111251,7 @@ item_db: (
 	EquipLv: 95
 	View: 11
 	Script: <"
-		bonus2 bSPVanishRate,10000,4;
+		bonus3 bSPVanishRate,10000,4,BF_NORMAL;
 		bonus bAspd,-5;
 	">
 },
@@ -117936,7 +117946,7 @@ item_db: (
 	WeaponLv: 4
 	EquipLv: 95
 	View: 3
-	Script: <" bonus2 bSPVanishRate,10000,8; ">
+	Script: <" bonus3 bSPVanishRate,10000,8,BF_NORMAL; ">
 },
 {
 	Id: 21003
@@ -118079,10 +118089,8 @@ item_db: (
 		bonus bHit,8;
 		bonus bCritical,8;
 		bonus2 bAddRace,RC_DemiHuman,30;
-		bonus2 bAddRace,RC_Player,30;
 		bonus2 bVariableCastrate,"GS_TRACKING",-20;
 		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
-		bonus2 bIgnoreDefRaceRate,RC_Player,10;
 		bonus bUnbreakableWeapon,0;
 	">
 },
@@ -118104,9 +118112,7 @@ item_db: (
 		bonus bDex,2;
 		bonus bSplashRange,1;
 		bonus2 bAddRace,RC_DemiHuman,30;
-		bonus2 bAddRace,RC_Player,30;
 		bonus2 bIgnoreDefRaceRate,RC_DemiHuman,10;
-		bonus2 bIgnoreDefRaceRate,RC_Player,10;
 		autobonus "{ bonus bBaseAtk,80; bonus2 bHPLossRate,100,1000; }",30,6000,BF_WEAPON,"{ specialeffect2 EF_BASH3D; }";
 		bonus bUnbreakableWeapon,0;
 	">
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index fc2ec0aff..b9723a99b 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -71,7 +71,38 @@ zones: (
 	}
 	
 	disabled_items: {
-	
+		Velum_Jamadhar: true
+		Velum_Scare: true
+		Velum_Buster: true
+		Velum_Guillotine: true
+		Velum_Spear: true
+		Velum_Glaive: true
+		Velum_Bible: true
+		Velum_Encyclopedia: true
+		Velum_Claw: true
+		Velum_Arc_Wand: true
+		Velum_Damascus: true
+		Velum_Stunner: true
+		Velum_Flail: true
+		Velum_Arbalest: true
+		Velum_CrossBow: true
+		Velum_Claymore: true
+		Velum_Katzbalger: true
+		Siege_Arrow_A: true
+		Siege_Arrow_S: true
+		Siege_Greave: true
+		Siege_Boots: true
+		Siege_Shoes: true
+		Siege_Manteau: true
+		Siege_Muffler: true
+		Siege_White_Potion: true
+		Siege_Blue_Potion: true
+		Woe_Violet_Potion: true
+		Woe_White_Potion: true
+		Woe_Blue_Potion: true
+		Siege_Plate: true
+		Siege_Suits: true
+		Siege_Robe: true
 	}
 	mapflags: (
 	)
@@ -214,6 +245,38 @@ zones: (
 	disabled_items: {
 		Assumptio_5_Scroll: true
 		Pty_Assumptio_Scroll: true
+		Velum_Jamadhar: true
+		Velum_Scare: true
+		Velum_Buster: true
+		Velum_Guillotine: true
+		Velum_Spear: true
+		Velum_Glaive: true
+		Velum_Bible: true
+		Velum_Encyclopedia: true
+		Velum_Claw: true
+		Velum_Arc_Wand: true
+		Velum_Damascus: true
+		Velum_Stunner: true
+		Velum_Flail: true
+		Velum_Arbalest: true
+		Velum_CrossBow: true
+		Velum_Claymore: true
+		Velum_Katzbalger: true
+		Siege_Arrow_A: true
+		Siege_Arrow_S: true
+		Siege_Greave: true
+		Siege_Boots: true
+		Siege_Shoes: true
+		Siege_Manteau: true
+		Siege_Muffler: true
+		Siege_White_Potion: true
+		Siege_Blue_Potion: true
+		Woe_Violet_Potion: true
+		Woe_White_Potion: true
+		Woe_Blue_Potion: true
+		Siege_Plate: true
+		Siege_Suits: true
+		Siege_Robe: true
 	}	
 	
 	/* knockback disabled */
@@ -346,6 +409,38 @@ zones: (
 	
 	disabled_items: {
 		Greed_Scroll: true
+		Velum_Jamadhar: true
+		Velum_Scare: true
+		Velum_Buster: true
+		Velum_Guillotine: true
+		Velum_Spear: true
+		Velum_Glaive: true
+		Velum_Bible: true
+		Velum_Encyclopedia: true
+		Velum_Claw: true
+		Velum_Arc_Wand: true
+		Velum_Damascus: true
+		Velum_Stunner: true
+		Velum_Flail: true
+		Velum_Arbalest: true
+		Velum_CrossBow: true
+		Velum_Claymore: true
+		Velum_Katzbalger: true
+		Siege_Arrow_A: true
+		Siege_Arrow_S: true
+		Siege_Greave: true
+		Siege_Boots: true
+		Siege_Shoes: true
+		Siege_Manteau: true
+		Siege_Muffler: true
+		Siege_White_Potion: true
+		Siege_Blue_Potion: true
+		Woe_Violet_Potion: true
+		Woe_White_Potion: true
+		Woe_Blue_Potion: true
+		Siege_Plate: true
+		Siege_Suits: true
+		Siege_Robe: true
 	}
 }
 )
diff --git a/db/re/skill_cast_db.txt b/db/re/skill_cast_db.txt
index c19ecb20f..959402d53 100644
--- a/db/re/skill_cast_db.txt
+++ b/db/re/skill_cast_db.txt
@@ -1279,7 +1279,7 @@
 //-- RA_ICEBOUNDTRAP
 2254,0,0,0,15000,20000,0,0
 //-- RA_UNLIMIT
-5002,0,500,0,60000,0,240000,1000
+5002,0,500,0,60000,0,300000,1000
 //==========================================
 
 //===== Mechanic ===========================
@@ -1723,7 +1723,7 @@
 //==========================================
 
 //-- ALL_FULL_THROTTLE
-5014,0,0,0,10000:15000:20000:25000:30000,10000,20000:25000:30000:35000:40000,-1
+5014,0,0,0,10000:15000:20000:25000:30000,10000,1800000,-1
 
 //===== Homunculus Skills ==================
 //-- HLIF_HEAL
diff --git a/db/re/skill_db.txt b/db/re/skill_db.txt
index c453d4eaf..85da031f9 100644
--- a/db/re/skill_db.txt
+++ b/db/re/skill_db.txt
@@ -101,12 +101,12 @@
 54,9,6,16,6,0x1,0,4,1,yes,0,0,0,magic,0,		ALL_RESURRECTION,Resurrection
 55,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,		KN_SPEARMASTERY,Spear Mastery
 56,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0,		KN_PIERCE,Pierce
-57,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3,	KN_BRANDISHSPEAR,Brandish Spear
+57,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3,	KN_BRANDISHSPEAR,Brandish Spear
 58,-4,6,1,-1,0x2,0,10,1,no,0,0,0,weapon,6,	KN_SPEARSTAB,Spear Stab
 59,3:5:7:9:11,6,1,-1,0,0,5,1,no,0,0,0,weapon,0,	KN_SPEARBOOMERANG,Spear Boomerang
 60,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,		KN_TWOHANDQUICKEN,Twohand Quicken
 61,0,6,4,-1,0x20,0,5,1,no,0,0,0,weapon,0,	KN_AUTOCOUNTER,Counter Attack
-62,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1,	KN_BOWLINGBASH,Bowling Bash
+62,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1,	KN_BOWLINGBASH,Bowling Bash
 63,0,0,0,0,0,0,1,0,no,0,0,0,weapon,0,		KN_RIDING,Peco Peco Riding
 64,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,		KN_CAVALIERMASTERY,Cavalier Mastery
 65,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,		PR_MACEMASTERY,Mace Mastery
@@ -179,7 +179,7 @@
 133,0,0,0,0,0,0,5,0,no,0,0,0,weapon,0,		AS_LEFT,Lefthand Mastery
 134,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,		AS_KATAR,Katar Mastery
 135,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	AS_CLOAKING,Cloaking
-136,-1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0,	AS_SONICBLOW,Sonic Blow
+136,1,8,1,-1,0,0,10,-8,no,0,0,0,weapon,0,	AS_SONICBLOW,Sonic Blow
 137,3:4:5:6:7,6,1,-1,0x2,1,5,1,no,0,0,0,weapon,0,AS_GRIMTOOTH,Grimtooth
 138,1,6,16,5,0x1,0,10,1,no,0,0x400,0,weapon,0,	AS_ENCHANTPOISON,Enchant Poison
 139,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0,		AS_POISONREACT,Poison React
@@ -382,7 +382,7 @@
 336,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0,	WE_CALLPARTNER,I miss You
 337,9,6,1,-1,0,0,1,1,no,0,0x2,0,weapon,0,	ITM_TOMAHAWK,Throw Tomahawk
 338,-1,8,1,7,0,0,10,-2,no,0,0x2,0,weapon,0,	NPC_DARKCROSS,Cross of Darkness
-339,5,6,4,7,0x48,0,10,1,no,33,0x102,0,magic,0,	NPC_GRANDDARKNESS,Grand cross of Darkness
+339,5,6,4,7,0x48,0,10,1,no,0,0x102,0,magic,0,	NPC_GRANDDARKNESS,Grand cross of Darkness
 340,9,8,1,7,0,0,10,1:1:2:2:3:3:4:4:5:5,yes,0,0x2,0,magic,0,	NPC_DARKSTRIKE,Soul Strike of Darkness
 341,9,8,1,7,0,0,10,3:4:5:6:7:8:9:10:11:12,yes,0,0x2,0,magic,2:3:3:4:4:5:5:6:6:7,	NPC_DARKTHUNDER,Darkness Jupitel
 342,9,6,1,0,0x1,0,1,0,no,0,0x2,0,none,0,		NPC_STOP,Stop
@@ -449,7 +449,7 @@
 403,0,0,4,0,0x1,0,1,1,yes,0,0,0,magic,0,		PF_MEMORIZE,Foresight
 404,9,6,2,2,0x1,0,5,1,yes,0,0x100,2,magic,0,	PF_FOGWALL,Blinding Mist
 405,7,6,1,0,0x1,0,1,1,no,0,0,3,magic,0,		PF_SPIDERWEB,Fiber Lock
-406,0,6,4,-1,0xA,2,10,1,no,33,0,0,weapon,0,	ASC_METEORASSAULT,Meteor Assault
+406,0,6,4,-1,0xA,2,10,1,no,0,0,0,weapon,0,	ASC_METEORASSAULT,Meteor Assault
 407,0,6,4,0,0x1,0,1,0,no,0,0,0,none,0,		ASC_CDP,Create Deadly Poison
 408,9,6,4,0,0x1,0,1,1,yes,0,0x4,0,none,0,	WE_BABY,Baby
 409,9,6,4,0,0x1,3,1,1,yes,0,0x4,1,none,0,	WE_CALLPARENT,Call Parent
@@ -1125,7 +1125,6 @@
 5017,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SR_FLASHCOMBO_ATK_STEP3,Flash Combo Attack Step 3
 5018,0,6,4,0,0x1,0,5,1,no,0,0,0,none,0,		SR_FLASHCOMBO_ATK_STEP4,Flash Combo Attack Step 4
 
-
 8001,9,6,4,0,0x1,0,5,1,no,0,0,0,magic,0,	HLIF_HEAL,Healing Touch
 8002,0,6,4,0,0x3,-1,5,1,no,0,0,0,none,0,	HLIF_AVOID,Avoid
 8003,0,0,0,0,0,1,5,0,no,0,0,0,none,0,		HLIF_BRAIN,Brain Surgery
@@ -1173,7 +1172,7 @@
 // Mercenary Skill Place holders
 8201,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,	MS_BASH,Bash
 8202,0,6,4,3,0x2,2,10,1,no,0,0,0,weapon,2,	MS_MAGNUM,Magnum_Break
-8203,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1,	MS_BOWLINGBASH,Bowling_Bash
+8203,-2,6,1,-1,0x2,1,10,1,no,0,0,0,weapon,1,	MS_BOWLINGBASH,Bowling_Bash
 8204,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	MS_PARRYING,Parry
 8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0,	MS_REFLECTSHIELD,Shield_Reflect
 8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,	MS_BERSERK,Frenzy
@@ -1187,7 +1186,7 @@
 8214,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6,	MA_CHARGEARROW,Arrow_Repel
 8215,9,8,1,-1,0,2,5,1,yes,0,0,13,weapon,0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
 8216,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0,	ML_PIERCE,Pierce
-8217,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3,	ML_BRANDISH,Brandish_Spear
+8217,-2,6,1,-1,0x1,0,10,1,no,0,0,0,weapon,3,	ML_BRANDISH,Brandish_Spear
 8218,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0,	ML_SPIRALPIERCE,Spiral_Pierce
 8219,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,	ML_DEFENDER,Defending_Aura
 8220,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	ML_AUTOGUARD,Guard