From a4e5237b519d9c8f9029a8330dff4ebbd4b8eb9e Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sat, 17 Oct 2020 12:20:41 +0000
Subject: [PATCH] Addition of missing SP scrolls.
---
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 491 +++++-----------
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 531 ++++++++----------
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 293 ++++------
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 19 +-
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 51 +-
.../game/data/stats/items/49500-49599.xml | 18 +-
.../game/data/stats/skills/39100-39199.xml | 28 +
.../dist/game/data/xsd/skills.xsd | 51 +-
18 files changed, 827 insertions(+), 885 deletions(-)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
index 32e18dfea0..5bf7134415 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49500-49599.xml
@@ -1221,17 +1221,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
index f6c8925a42..18a0f67c4c 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd
index 40d15b4fbf..da11c0101b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skills.xsd
@@ -44,11 +44,11 @@
-
+
@@ -508,11 +508,9 @@
-
+
-
-
@@ -525,14 +523,12 @@
-
+
-
+
-
-
@@ -620,21 +616,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -719,21 +700,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -750,13 +716,13 @@
-
+
-
+
@@ -765,135 +731,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1067,21 +904,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1257,6 +1079,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1303,6 +1260,7 @@
+
@@ -1381,141 +1339,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1531,8 +1354,8 @@
-
-
+
+
@@ -1941,7 +1764,6 @@
-
@@ -2025,26 +1847,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -2063,10 +1866,6 @@
-
-
-
-
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49500-49599.xml
index d9eef38cfd..98080da83d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49500-49599.xml
@@ -1232,17 +1232,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/39100-39199.xml
index 91bb5d8b83..99c93a6534 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skills.xsd
index 60677791ae..c258ab940d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skills.xsd
@@ -105,6 +105,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -446,7 +461,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -502,41 +532,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -582,22 +580,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -614,9 +596,6 @@
-
-
-
@@ -716,6 +695,8 @@
+
+
@@ -763,21 +744,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -833,8 +799,6 @@
-
-
@@ -904,21 +868,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -934,6 +883,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1034,21 +1016,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1079,126 +1046,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1262,6 +1109,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1339,23 +1201,143 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -1433,6 +1415,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1442,6 +1439,7 @@
+
@@ -1459,7 +1457,6 @@
-
@@ -1483,7 +1480,6 @@
-
@@ -1501,14 +1497,15 @@
+
+
-
@@ -1568,7 +1565,7 @@
-
+
@@ -1609,21 +1606,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1654,21 +1636,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1712,8 +1679,8 @@
-
-
+
+
@@ -1780,6 +1747,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1866,26 +1848,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1901,13 +1864,8 @@
-
-
-
-
-
@@ -1935,7 +1893,6 @@
-
@@ -1945,8 +1902,6 @@
-
-
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49500-49599.xml
index a357c0e1ef..c63e66d846 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49500-49599.xml
@@ -1232,17 +1232,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/39100-39199.xml
index 771eb8aa34..f0965cbc9d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skills.xsd
index 4978cb3d90..cbfc66b001 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skills.xsd
@@ -105,6 +105,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -446,7 +461,22 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -502,45 +532,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -586,22 +580,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -618,9 +596,6 @@
-
-
-
@@ -720,6 +695,8 @@
+
+
@@ -767,21 +744,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -837,8 +799,6 @@
-
-
@@ -908,21 +868,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -938,6 +883,39 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1038,21 +1016,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1146,6 +1109,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1349,17 +1327,17 @@
-
+
-
-
+
+
@@ -1437,6 +1415,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1446,6 +1439,7 @@
+
@@ -1463,7 +1457,6 @@
-
@@ -1487,7 +1480,6 @@
-
@@ -1505,14 +1497,15 @@
+
+
-
@@ -1613,21 +1606,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1658,21 +1636,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1716,8 +1679,8 @@
-
-
+
+
@@ -1784,6 +1747,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1870,26 +1848,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1905,13 +1864,8 @@
-
-
-
-
-
@@ -1939,7 +1893,6 @@
-
@@ -1949,8 +1902,6 @@
-
-
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49500-49599.xml
index a877b7c832..ffc73516b0 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49500-49599.xml
@@ -1232,17 +1232,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
index de90fa0228..efd1a4ec3e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skills.xsd
index 0276478d8b..cd6e400ee4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skills.xsd
@@ -427,9 +427,7 @@
-
-
-
+
@@ -1321,13 +1319,14 @@
+
+
-
@@ -1340,8 +1339,8 @@
-
-
+
+
@@ -1481,8 +1480,6 @@
-
-
@@ -1680,8 +1677,8 @@
-
-
+
+
@@ -1865,7 +1862,6 @@
-
@@ -1895,7 +1891,6 @@
-
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
index a877b7c832..ffc73516b0 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49500-49599.xml
@@ -1232,17 +1232,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
index ee4041d1f9..d7268460f5 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/skills.xsd
index 836d5044cb..d22b1e2d19 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/skills.xsd
@@ -427,9 +427,7 @@
-
-
-
+
@@ -883,21 +881,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1139,7 +1122,6 @@
-
@@ -1292,6 +1274,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1322,15 +1319,17 @@
+
+
-
+
@@ -1340,8 +1339,8 @@
-
-
+
+
@@ -1481,8 +1480,6 @@
-
-
@@ -1694,8 +1691,8 @@
-
-
+
+
@@ -1879,7 +1876,6 @@
-
@@ -1909,7 +1905,6 @@
-
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
index a877b7c832..ffc73516b0 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49500-49599.xml
@@ -1232,17 +1232,31 @@
-
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
-
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
index ee4041d1f9..d7268460f5 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/skills/39100-39199.xml
@@ -175,13 +175,41 @@
icon.etc_sp_scroll1_i00
+ false
+ 2
+ 1
+ 49595
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 2000
+
+
icon.etc_sp_scroll2_i00
+ false
+ 2
+ 1
+ 49596
+ 1
A1
2000
+ 5
+ 0
+ SELF
+ SINGLE
+
+
+ 10000
+
+
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd
index be4c342052..c4a6303998 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/xsd/skills.xsd
@@ -441,9 +441,7 @@
-
-
-
+
@@ -893,21 +891,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1135,7 +1118,6 @@
-
@@ -1273,6 +1255,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1303,15 +1300,17 @@
+
+
-
+
@@ -1321,8 +1320,8 @@
-
-
+
+
@@ -1464,8 +1463,6 @@
-
-
@@ -1677,8 +1674,8 @@
-
-
+
+
@@ -1863,7 +1860,6 @@
-
@@ -1893,7 +1889,6 @@
-