Merge branch 'master' into testservertestserver

7 files changed, 191 insertions, 162 deletions

diff --git a/db/item_options.conf b/db/item_options.conf
index 9eabad237..cce2306f2 100644
--- a/db/item_options.conf
+++ b/db/item_options.conf
@@ -1050,7 +1050,7 @@ item_options_db: (
 {
 	Id: 187
 	Name: "IOPT_SPLASHDAMAGE"
-	Script: <" bonus(bSplashRange, getequippedoptioninfo(IT_OPT_VALUE)); ">
+	Script: <" bonus(bSplashAddRange, getequippedoptioninfo(IT_OPT_VALUE)); ">
 },
 {
 	Id: 188
@@ -1111,6 +1111,11 @@ item_options_db: (
 	Id: 199
 	Name: "IOPT_CRITDMG"
 	Script: <" bonus(bCritAtkRate, getequippedoptioninfo(IT_OPT_VALUE)); ">
+},
+{
+	Id: 200
+	Name: "IOPT_RICHNESS"
+	Script: <" bonus2(bAddGetZenyNum, -1, getequippedoptioninfo(IT_OPT_VALUE)); ">
 }
 
 
diff --git a/db/map_index.txt b/db/map_index.txt
index 3cf92e99f..2dc2bd3ea 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -126,52 +126,54 @@
 018-5 126
 018-6-0 127
 018-6-1 128
-019-1-1 129
-019-1 130
-019-2 131
-019-3 132
-019-4-1 133
-019-4 134
-020-1 135
-020-2 136
-020-3 137
-020-4 138
-020-5 139
-020-6 140
-020-7-1 141
-020-7-2 142
-020-7 143
-021-1 144
-021-2 145
-021-3 146
-021-4 147
-022-1 148
-023-1 149
-023-2 150
-023-3-1 151
-023-3-2 152
-023-3 153
-024-1 154
-024-10 155
-024-11 156
-024-12 157
-024-13 158
-024-14 159
-024-15 160
-024-16 161
-024-2 162
-024-3 163
-024-4 164
-024-5 165
-024-6 166
-024-7 167
-024-8 168
-024-9 169
-boss 170
-botcheck 171
-guilds 172
-sec_pri 173
-soren-2 174
-soren 175
-test 176
-testbg 177
+018-6-2 129
+018-6-3 130
+019-1-1 131
+019-1 132
+019-2 133
+019-3 134
+019-4-1 135
+019-4 136
+020-1 137
+020-2 138
+020-3 139
+020-4 140
+020-5 141
+020-6 142
+020-7-1 143
+020-7-2 144
+020-7 145
+021-1 146
+021-2 147
+021-3 148
+021-4 149
+022-1 150
+023-1 151
+023-2 152
+023-3-1 153
+023-3-2 154
+023-3 155
+024-1 156
+024-10 157
+024-11 158
+024-12 159
+024-13 160
+024-14 161
+024-15 162
+024-16 163
+024-2 164
+024-3 165
+024-4 166
+024-5 167
+024-6 168
+024-7 169
+024-8 170
+024-9 171
+boss 172
+botcheck 173
+guilds 174
+sec_pri 175
+soren-2 176
+soren 177
+test 178
+testbg 179
diff --git a/db/re/exp_guild.txt b/db/re/exp_guild.txt
index 928047600..cecf66632 100644
--- a/db/re/exp_guild.txt
+++ b/db/re/exp_guild.txt
@@ -1,4 +1,8 @@
 // Guild LvUp experience value table
+// Exp needed for level  5:     5.500.000 Exp
+// Exp needed for level 10:    38.500.000 Exp
+// Exp needed for level 25:   552.500.000 Exp
+// Exp needed for level 50: 4.292.500.000 Exp
 100000
 400000
 900000
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index d035bc5f4..48aeffd17 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2281,7 +2281,7 @@ item_db: (
 {
 	Id: 615
 	AegisName: "HerbalTea"
-	Name: "Herbal Tea"
+	Name: "Nightshade Tea"
 	Type: "IT_USABLE"
 	Buy: 1240
 	Sell: 480
@@ -2291,7 +2291,8 @@ item_db: (
 	UseEffect: "EFFECT_HEAL"
 	Script: <"
 		sc_start SC_ATTHASTE_POTION1, 30000, 60;
-		sc_start SC_POISON, 40000, 0;
+		if (rand(10000) < 6000)
+			sc_start callfunc("any", SC_POISON, SC_SILENCE, SC_POISON, SC_CONFUSE, SC_POISON, SC_POISON), rand(20000, 40000), 0;
 		itemheal 0, rand(10,200);
 	">
 },
@@ -5522,8 +5523,8 @@ item_db: (
 },
 {
 	Id: 912
-	AegisName: "Wurtizite"
-	Name: "Wurtizite Ore"
+	AegisName: "Wurtzite"
+	Name: "Wurtzite Ore"
 	Type: "IT_ETC"
 	Buy: 5000
 	Sell: 500
@@ -8118,8 +8119,8 @@ item_db: (
 	AegisName: "CottonTrousers"
 	Name: "Cotton Trousers"
 	Type: "IT_ARMOR"
-	Buy: 1200
-	Sell: 250
+	Buy: 12000
+	Sell: 2500
 	Weight: 25
 	Def: 22
 	Slots: 1
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 871e8b228..95455f729 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -609,5 +609,9 @@ zones: (
 	
 	disabled_items: {
 	}
+
+	disabled_commands: {
+		pvpon: 100
+	}
 }
 )
diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index b49f0af72..4a5d19db2 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -8844,7 +8844,7 @@ mob_db: (
 	Drops: {
 		Coal: 200
 		CopperOre: 100
-		Wurtizite: 100
+		Wurtzite: 100
 		LeadOre: 40
 		Graphene: 25
 		LightGreenDiamond: 1
@@ -8870,7 +8870,7 @@ mob_db: (
 	Drops: {
 		Coal: 300
 		CopperOre: 200
-		Wurtizite: 200
+		Wurtzite: 200
 		LeadOre: 80
 		Graphene: 45
 		LightGreenDiamond: 2
@@ -8896,7 +8896,7 @@ mob_db: (
 	Drops: {
 		Coal: 500
 		CopperOre: 300
-		Wurtizite: 300
+		Wurtzite: 290
 		LeadOre: 120
 		Graphene: 65
 		LightGreenDiamond: 3
diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf
index a1fd3221f..8cbbc7ab5 100644
--- a/db/re/skill_db.conf
+++ b/db/re/skill_db.conf
@@ -751,33 +751,44 @@ skill_db: (
 	AttackType: "Magic"
 	Element: "Ele_Water"
 	InterruptCast: true
-	CastTime: 640
-	AfterCastActDelay: 1500
+	CastTime: {
+		Lv1: 640
+		Lv2: 600
+		Lv3: 555
+		Lv4: 500
+		Lv5: 450
+		Lv6: 400
+		Lv7: 384
+		Lv8: 384
+		Lv9: 384
+		Lv10: 384
+	}
+	AfterCastActDelay: 300
 	SkillData2: {
-		Lv1: 3000
-		Lv2: 3500
-		Lv3: 4000
-		Lv4: 4500
-		Lv5: 5000
-		Lv6: 5500
-		Lv7: 6000
-		Lv8: 6500
-		Lv9: 7000
-		Lv10: 7500
+		Lv1: 4000
+		Lv2: 4500
+		Lv3: 5000
+		Lv4: 5500
+		Lv5: 6000
+		Lv6: 7000
+		Lv7: 8000
+		Lv8: 9000
+		Lv9: 10000
+		Lv10: 10500
 	}
 	FixedCastTime: 160
 	Requirements: {
 		SPCost: {
-			Lv1: 200
-			Lv2: 210
-			Lv3: 220
-			Lv4: 230
-			Lv5: 240
-			Lv6: 250
-			Lv7: 260
-			Lv8: 270
-			Lv9: 280
-			Lv10: 290
+			Lv1: 100
+			Lv2: 120
+			Lv3: 140
+			Lv4: 160
+			Lv5: 180
+			Lv6: 200
+			Lv7: 220
+			Lv8: 240
+			Lv9: 260
+			Lv10: 280
 		}
 	}
 },
@@ -927,7 +938,7 @@ skill_db: (
 		Lv10: 360
 	}
 	SkillData1: {
-		Lv1: 7500
+		Lv1: 8500
 		Lv2: 10000
 		Lv3: 12000
 		Lv4: 14000
@@ -1761,7 +1772,7 @@ skill_db: (
 	Id: 43
 	Name: "AC_OWL"
 	Description: "Owl's Eye"
-	MaxLevel: 20
+	MaxLevel: 10
 	NumberOfHits: 0
 	SkillInfo: {
 		Quest: true
@@ -3425,13 +3436,13 @@ skill_db: (
 	InterruptCast: true
 	CastTime: {
 		Lv1: 640
-		Lv2: 640
-		Lv3: 576
-		Lv4: 576
-		Lv5: 512
-		Lv6: 512
-		Lv7: 448
-		Lv8: 448
+		Lv2: 576
+		Lv3: 412
+		Lv4: 448
+		Lv5: 384
+		Lv6: 384
+		Lv7: 384
+		Lv8: 384
 		Lv9: 384
 		Lv10: 384
 	}
@@ -3450,27 +3461,27 @@ skill_db: (
 	}
 	FixedCastTime: {
 		Lv1: 160
-		Lv2: 160
-		Lv3: 144
-		Lv4: 144
-		Lv5: 128
-		Lv6: 128
-		Lv7: 112
-		Lv8: 112
+		Lv2: 144
+		Lv3: 128
+		Lv4: 112
+		Lv5: 96
+		Lv6: 96
+		Lv7: 96
+		Lv8: 96
 		Lv9: 96
 		Lv10: 96
 	}
 	Requirements: {
 		SPCost: {
-			Lv1: 140
-			Lv2: 160
-			Lv3: 180
-			Lv4: 200
-			Lv5: 220
-			Lv6: 240
-			Lv7: 260
-			Lv8: 280
-			Lv9: 290
+			Lv1: 120
+			Lv2: 140
+			Lv3: 160
+			Lv4: 180
+			Lv5: 200
+			Lv6: 220
+			Lv7: 240
+			Lv8: 260
+			Lv9: 280
 			Lv10: 300
 		}
 	}
@@ -12387,12 +12398,12 @@ skill_db: (
 	CastTime: 350
 	AfterCastActDelay: 500
 	SkillData2: {
-		Lv1: 10000
+		Lv1: 15000
 		Lv2: 20000
-		Lv3: 30000
-		Lv4: 40000
-		Lv5: 50000
-		Lv6: 60000
+		Lv3: 25000
+		Lv4: 30000
+		Lv5: 35000
+		Lv6: 40000
 		Lv7: 70000
 		Lv8: 80000
 		Lv9: 90000
@@ -12402,15 +12413,15 @@ skill_db: (
 	Requirements: {
 		SPCost: {
 			Lv1: 95
-			Lv2: 100
-			Lv3: 110
-			Lv4: 120
-			Lv5: 130
-			Lv6: 140
-			Lv7: 150
-			Lv8: 160
-			Lv9: 170
-			Lv10: 180
+			Lv2: 120
+			Lv3: 145
+			Lv4: 170
+			Lv5: 200
+			Lv6: 200
+			Lv7: 200
+			Lv8: 200
+			Lv9: 200
+			Lv10: 200
 		}
 	}
 },
@@ -19422,36 +19433,38 @@ skill_db: (
 	MaxLevel: 5
 	Range: {
 		Lv1: 5
-		Lv2: 6
-		Lv3: 7
-		Lv4: 8
-		Lv5: 9
+		Lv2: 7
+		Lv3: 9
+		Lv4: 10
+		Lv5: 10
 		Lv6: 10
-		Lv7: 11
-		Lv8: 12
-		Lv9: 13
-		Lv10: 14
+		Lv7: 10
+		Lv8: 10
+		Lv9: 10
+		Lv10: 10
 	}
 	Hit: "BDT_SKILL"
 	SkillType: {
 		Enemy: true
 	}
+	DamageType: {
+		IgnoreFlee: true
+	}
 	AttackType: "Weapon"
 	Element: "Ele_Weapon"
-	AfterCastActDelay: 1500
-	FixedCastTime: -1
+	FixedCastTime: 100
 	Requirements: {
 		SPCost: {
-			Lv1: 120
-			Lv2: 125
-			Lv3: 130
-			Lv4: 135
-			Lv5: 140
-			Lv6: 145
-			Lv7: 150
-			Lv8: 155
-			Lv9: 160
-			Lv10: 165
+			Lv1: 110
+			Lv2: 115
+			Lv3: 120
+			Lv4: 125
+			Lv5: 130
+			Lv6: 135
+			Lv7: 140
+			Lv8: 145
+			Lv9: 150
+			Lv10: 155
 		}
 	}
 },
@@ -28096,16 +28109,16 @@ skill_db: (
 	Element: "Ele_Fire"
 	InterruptCast: true
 	SkillInstances: {
-		Lv1: 8
-		Lv2: 10
-		Lv3: 12
-		Lv4: 14
-		Lv5: 16
-		Lv6: 18
-		Lv7: 20
-		Lv8: 22
-		Lv9: 24
-		Lv10: 26
+		Lv1: 7
+		Lv2: 9
+		Lv3: 11
+		Lv4: 13
+		Lv5: 15
+		Lv6: 17
+		Lv7: 19
+		Lv8: 21
+		Lv9: 23
+		Lv10: 25
 	}
 	CastTime: 1000
 	CoolDown:  {
@@ -28121,25 +28134,25 @@ skill_db: (
 		Lv10: 20000
 	}
 	AfterCastActDelay: 1000
-	SkillData1: 12000
-	FixedCastTime: -1
+	SkillData1: 9000
+	FixedCastTime: 300
 	Requirements: {
 		SPCost: {
 			Lv1: 130
-			Lv2: 134
-			Lv3: 138
-			Lv4: 142
-			Lv5: 146
-			Lv6: 150
-			Lv7: 154
-			Lv8: 158
-			Lv9: 162
-			Lv10: 166
+			Lv2: 150
+			Lv3: 180
+			Lv4: 220
+			Lv5: 250
+			Lv6: 250
+			Lv7: 250
+			Lv8: 250
+			Lv9: 250
+			Lv10: 250
 		}
 	}
 	Unit: {
 		Id: 0xdc
-		Interval: 500
+		Interval: 750
 		Target: "Enemy"
 		Flag: {
 			UF_NOREITERATION: true