From 3d903d2c8fcbe2bd5bb50125ee1386e4fcfd63c7 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Fri, 17 Nov 2017 23:15:03 +0000
Subject: [PATCH] Training Camp improvements.

---
 .../{Recruiter => TrainingCamp}/4378-01.htm   |  2 +-
 .../ai/others/TrainingCamp}/4378-02.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-03.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-04.htm       |  4 ++--
 .../ai/others/TrainingCamp}/4378-05.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-06.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-07.htm       |  2 +-
 .../{Recruiter => TrainingCamp}/4378.htm      |  6 ++---
 .../TrainingCamp.java}                        | 22 ++++++++++---------
 .../model/holders/TrainingHolder.java         |  6 ++---
 .../ai/others/TrainingCamp}/4378-01.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-02.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-03.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-04.htm       |  4 ++--
 .../ai/others/TrainingCamp}/4378-05.htm       |  2 +-
 .../{Recruiter => TrainingCamp}/4378-06.htm   |  2 +-
 .../ai/others/TrainingCamp}/4378-07.htm       |  2 +-
 .../scripts/ai/others/TrainingCamp}/4378.htm  |  6 ++---
 .../TrainingCamp.java}                        | 22 ++++++++++---------
 .../model/holders/TrainingHolder.java         |  6 ++---
 .../ai/others/TrainingCamp}/4378-01.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-02.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-03.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-04.htm       |  4 ++--
 .../{Recruiter => TrainingCamp}/4378-05.htm   |  2 +-
 .../ai/others/TrainingCamp}/4378-06.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-07.htm       |  2 +-
 .../scripts/ai/others/TrainingCamp}/4378.htm  |  6 ++---
 .../TrainingCamp.java}                        | 22 ++++++++++---------
 .../model/holders/TrainingHolder.java         |  6 ++---
 .../ai/others/TrainingCamp}/4378-01.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-02.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-03.htm       |  2 +-
 .../ai/others/TrainingCamp}/4378-04.htm       |  4 ++--
 .../{Recruiter => TrainingCamp}/4378-05.htm   |  2 +-
 .../{Recruiter => TrainingCamp}/4378-06.htm   |  2 +-
 .../ai/others/TrainingCamp}/4378-07.htm       |  2 +-
 .../scripts/ai/others/TrainingCamp}/4378.htm  |  6 ++---
 .../TrainingCamp.java}                        | 22 ++++++++++---------
 .../model/holders/TrainingHolder.java         |  6 ++---
 .../model/holders/TrainingHolder.java         |  6 ++---
 41 files changed, 107 insertions(+), 99 deletions(-)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378-01.htm (56%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-02.htm (88%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-03.htm (83%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-04.htm (67%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-05.htm (62%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-06.htm (58%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp}/4378-07.htm (61%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378.htm (61%)
 rename L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/{Recruiter/Recruiter.java => TrainingCamp/TrainingCamp.java} (92%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-01.htm (56%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-02.htm (88%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-03.htm (83%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-04.htm (67%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-05.htm (62%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378-06.htm (58%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378-07.htm (61%)
 rename {L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp}/4378.htm (61%)
 rename L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/{Recruiter/Recruiter.java => TrainingCamp/TrainingCamp.java} (92%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-01.htm (56%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-02.htm (88%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-03.htm (83%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-04.htm (67%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378-05.htm (62%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-06.htm (58%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378-07.htm (61%)
 rename {L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp}/4378.htm (61%)
 rename L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/{Recruiter/Recruiter.java => TrainingCamp/TrainingCamp.java} (92%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378-01.htm (56%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378-02.htm (88%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378-03.htm (83%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378-04.htm (67%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378-05.htm (62%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/{Recruiter => TrainingCamp}/4378-06.htm (58%)
 rename {L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378-07.htm (61%)
 rename {L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter => L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp}/4378.htm (61%)
 rename L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/{Recruiter/Recruiter.java => TrainingCamp/TrainingCamp.java} (94%)

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
similarity index 56%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
index 9d3db1101f..669ed8f45c 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 Sorry, but you can't enter the camp unless you're on a premium subscription.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
similarity index 88%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
index 91bc6fcbb6..2b39359478 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
@@ -2,5 +2,5 @@
 If you're on Premium subscription, and reached Lv. 18, you can request to enter the Training Camp through a recruiter in any town.<br1>Don't worry about the severity of the training, though. Our systematic training will guarantee your growth no matter what.<br1>
 Remember, time will continue to pass while training, so &nbsp;<font color="LEVEL">the clock is ticking on your buffs and enchants</font>. Also, items that affect XP such as &nbsp;<font color="LEVEL">Runes and Agathions </font> have no effect there.<br>
 The training is limited to 5 hours a day, so no need to push yourself beyond that. Also, feel free to leave and come back to fill up the rest of the 5 hours!<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
similarity index 83%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
index 3fdcd9522a..c98d395aee 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
@@ -1,5 +1,5 @@
 <html><body>Recruiter:<br>
 Not a minute goes wasted in the Royal Training Camp. All training is recorded, and you check how much XP and SP you gained by using the camp button. Results will vary by your level upon entry, but rest assured that your training will be adjusted to your level as you become stronger.<br>
 After 5 hours, or upon your desired exit, you will get your training results calculated into points. Talk to the recruiters and they will help you with it.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
similarity index 67%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
index 20dca10271..eb4b422400 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
@@ -5,6 +5,6 @@ Start Level: &nbsp;<font color="LEVEL">%training_level%</font><br>
 Training Duration: &nbsp;<font color="LEVEL">%training_time%&nbsp;min.</font><br>
 XP Earned: &nbsp;<font color="LEVEL">%training_exp%</font><br>
 SP Earned: &nbsp;<font color="LEVEL">%training_sp%</font><br><br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Recruiter calculate">"Can you calculate my points?"</Button>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest TrainingCamp calculate">"Can you calculate my points?"</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html> 
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
similarity index 62%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
index 0f8a50b391..7e1ec96645 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 It seems you haven't done much training since you joined. Get some training and then come check your results.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
similarity index 58%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
index c673561cb9..27c630049f 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 There is a report on your training. Look at the results and come back to practice more.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
similarity index 61%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
index 86db4f13e9..207f4877a1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 I hasten to inform you that if you are not a user of a premium subscription, get training in camp will not work.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378-02.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378-02.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
similarity index 61%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378.htm
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
index a295d94222..3974b3df3e 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
@@ -22,17 +22,17 @@
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
+							<button action="bypass -h Quest TrainingCamp enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
+							<button action="bypass -h Quest TrainingCamp info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
+							<button action="bypass -h Quest TrainingCamp 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
 						</td>
 					</tr>
 				</table>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
similarity index 92%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index ddb5903c40..4765a39167 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.others.Recruiter;
+package ai.others.TrainingCamp;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,17 +41,17 @@ import com.l2jmobius.gameserver.network.serverpackets.training.ExTrainingZone_Le
 import ai.AbstractNpcAI;
 
 /**
- * Recruiter AI.
- * @author Gladicek
+ * TrainingCamp AI.
+ * @author Gladicek, Mobius
  */
-public final class Recruiter extends AbstractNpcAI
+public final class TrainingCamp extends AbstractNpcAI
 {
 	// NPC
 	private static final int RECRUITER = 4378;
 	// Misc
 	private static final Location TRAINING_LOCATION = new Location(-56516, 135938, -2672);
 	
-	private Recruiter()
+	private TrainingCamp()
 	{
 		addStartNpc(RECRUITER);
 		addFirstTalkId(RECRUITER);
@@ -312,8 +312,9 @@ public final class Recruiter extends AbstractNpcAI
 		
 		if (holder.isValid(player) && holder.isTraining())
 		{
-			final long elapsedTime = holder.getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS);
-			if (elapsedTime < Config.TRAINING_CAMP_MAX_DURATION)
+			final long elapsedTime = holder.getElapsedTime();
+			final long remainingPlayerTime = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration();
+			if (elapsedTime < remainingPlayerTime)
 			{
 				player.setLastLocation();
 				player.disableAllSkills();
@@ -321,14 +322,15 @@ public final class Recruiter extends AbstractNpcAI
 				player.setInvisible(true);
 				player.teleToLocation(TRAINING_LOCATION);
 				player.setIsImmobilized(true);
-				final long remainingDuration = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration() - elapsedTime;
+				final long remainingDuration = remainingPlayerTime - elapsedTime;
 				player.sendPacket(new ExTrainingZone_Admission(holder.getLevel(), TimeUnit.SECONDS.toMinutes(elapsedTime), remainingDuration));
 				startQuestTimer("finish", TimeUnit.SECONDS.toMillis(remainingDuration), null, player);
 			}
 			else
 			{
-				holder.setEndTime(holder.getStartTime() + (Config.TRAINING_CAMP_MAX_DURATION * 1000));
+				holder.setEndTime(holder.getStartTime() + (remainingPlayerTime * 1000));
 				player.setTraingCampInfo(holder);
+				player.sendPacket(SystemMessageId.YOU_HAVE_COMPLETED_THE_DAY_S_TRAINING);
 			}
 		}
 	}
@@ -352,6 +354,6 @@ public final class Recruiter extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new Recruiter();
+		new TrainingCamp();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
index cee0b2d34d..b5355f61fa 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
@@ -83,14 +83,14 @@ public class TrainingHolder implements Serializable
 		return Config.TRAINING_CAMP_ENABLE && (player.getObjectId() == _objectId) && (player.getClassIndex() == _classIndex);
 	}
 	
-	public long getElapsedTime(long time, TimeUnit unit)
+	public long getElapsedTime()
 	{
-		return unit.convert(time - _startTime, TimeUnit.MILLISECONDS);
+		return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS);
 	}
 	
 	public long getRemainingTime()
 	{
-		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS));
+		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime());
 	}
 	
 	public long getRemainingTime(long time)
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
similarity index 56%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
index 9d3db1101f..669ed8f45c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 Sorry, but you can't enter the camp unless you're on a premium subscription.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
similarity index 88%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
index 91bc6fcbb6..2b39359478 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
@@ -2,5 +2,5 @@
 If you're on Premium subscription, and reached Lv. 18, you can request to enter the Training Camp through a recruiter in any town.<br1>Don't worry about the severity of the training, though. Our systematic training will guarantee your growth no matter what.<br1>
 Remember, time will continue to pass while training, so &nbsp;<font color="LEVEL">the clock is ticking on your buffs and enchants</font>. Also, items that affect XP such as &nbsp;<font color="LEVEL">Runes and Agathions </font> have no effect there.<br>
 The training is limited to 5 hours a day, so no need to push yourself beyond that. Also, feel free to leave and come back to fill up the rest of the 5 hours!<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
similarity index 83%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
index 3fdcd9522a..c98d395aee 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
@@ -1,5 +1,5 @@
 <html><body>Recruiter:<br>
 Not a minute goes wasted in the Royal Training Camp. All training is recorded, and you check how much XP and SP you gained by using the camp button. Results will vary by your level upon entry, but rest assured that your training will be adjusted to your level as you become stronger.<br>
 After 5 hours, or upon your desired exit, you will get your training results calculated into points. Talk to the recruiters and they will help you with it.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
similarity index 67%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
index 20dca10271..eb4b422400 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
@@ -5,6 +5,6 @@ Start Level: &nbsp;<font color="LEVEL">%training_level%</font><br>
 Training Duration: &nbsp;<font color="LEVEL">%training_time%&nbsp;min.</font><br>
 XP Earned: &nbsp;<font color="LEVEL">%training_exp%</font><br>
 SP Earned: &nbsp;<font color="LEVEL">%training_sp%</font><br><br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Recruiter calculate">"Can you calculate my points?"</Button>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest TrainingCamp calculate">"Can you calculate my points?"</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html> 
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
similarity index 62%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
index 0f8a50b391..7e1ec96645 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 It seems you haven't done much training since you joined. Get some training and then come check your results.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
similarity index 58%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
index c673561cb9..27c630049f 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 There is a report on your training. Look at the results and come back to practice more.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
similarity index 61%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
index 86db4f13e9..207f4877a1 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 I hasten to inform you that if you are not a user of a premium subscription, get training in camp will not work.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378-02.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378-02.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378.htm b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
similarity index 61%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378.htm
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
index a295d94222..3974b3df3e 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
@@ -22,17 +22,17 @@
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
+							<button action="bypass -h Quest TrainingCamp enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
+							<button action="bypass -h Quest TrainingCamp info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
+							<button action="bypass -h Quest TrainingCamp 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
 						</td>
 					</tr>
 				</table>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
similarity index 92%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
rename to L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index ddb5903c40..4765a39167 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.others.Recruiter;
+package ai.others.TrainingCamp;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,17 +41,17 @@ import com.l2jmobius.gameserver.network.serverpackets.training.ExTrainingZone_Le
 import ai.AbstractNpcAI;
 
 /**
- * Recruiter AI.
- * @author Gladicek
+ * TrainingCamp AI.
+ * @author Gladicek, Mobius
  */
-public final class Recruiter extends AbstractNpcAI
+public final class TrainingCamp extends AbstractNpcAI
 {
 	// NPC
 	private static final int RECRUITER = 4378;
 	// Misc
 	private static final Location TRAINING_LOCATION = new Location(-56516, 135938, -2672);
 	
-	private Recruiter()
+	private TrainingCamp()
 	{
 		addStartNpc(RECRUITER);
 		addFirstTalkId(RECRUITER);
@@ -312,8 +312,9 @@ public final class Recruiter extends AbstractNpcAI
 		
 		if (holder.isValid(player) && holder.isTraining())
 		{
-			final long elapsedTime = holder.getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS);
-			if (elapsedTime < Config.TRAINING_CAMP_MAX_DURATION)
+			final long elapsedTime = holder.getElapsedTime();
+			final long remainingPlayerTime = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration();
+			if (elapsedTime < remainingPlayerTime)
 			{
 				player.setLastLocation();
 				player.disableAllSkills();
@@ -321,14 +322,15 @@ public final class Recruiter extends AbstractNpcAI
 				player.setInvisible(true);
 				player.teleToLocation(TRAINING_LOCATION);
 				player.setIsImmobilized(true);
-				final long remainingDuration = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration() - elapsedTime;
+				final long remainingDuration = remainingPlayerTime - elapsedTime;
 				player.sendPacket(new ExTrainingZone_Admission(holder.getLevel(), TimeUnit.SECONDS.toMinutes(elapsedTime), remainingDuration));
 				startQuestTimer("finish", TimeUnit.SECONDS.toMillis(remainingDuration), null, player);
 			}
 			else
 			{
-				holder.setEndTime(holder.getStartTime() + (Config.TRAINING_CAMP_MAX_DURATION * 1000));
+				holder.setEndTime(holder.getStartTime() + (remainingPlayerTime * 1000));
 				player.setTraingCampInfo(holder);
+				player.sendPacket(SystemMessageId.YOU_HAVE_COMPLETED_THE_DAY_S_TRAINING);
 			}
 		}
 	}
@@ -352,6 +354,6 @@ public final class Recruiter extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new Recruiter();
+		new TrainingCamp();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
index cee0b2d34d..b5355f61fa 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
@@ -83,14 +83,14 @@ public class TrainingHolder implements Serializable
 		return Config.TRAINING_CAMP_ENABLE && (player.getObjectId() == _objectId) && (player.getClassIndex() == _classIndex);
 	}
 	
-	public long getElapsedTime(long time, TimeUnit unit)
+	public long getElapsedTime()
 	{
-		return unit.convert(time - _startTime, TimeUnit.MILLISECONDS);
+		return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS);
 	}
 	
 	public long getRemainingTime()
 	{
-		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS));
+		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime());
 	}
 	
 	public long getRemainingTime(long time)
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
similarity index 56%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
index 9d3db1101f..669ed8f45c 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 Sorry, but you can't enter the camp unless you're on a premium subscription.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
similarity index 88%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
index 91bc6fcbb6..2b39359478 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
@@ -2,5 +2,5 @@
 If you're on Premium subscription, and reached Lv. 18, you can request to enter the Training Camp through a recruiter in any town.<br1>Don't worry about the severity of the training, though. Our systematic training will guarantee your growth no matter what.<br1>
 Remember, time will continue to pass while training, so &nbsp;<font color="LEVEL">the clock is ticking on your buffs and enchants</font>. Also, items that affect XP such as &nbsp;<font color="LEVEL">Runes and Agathions </font> have no effect there.<br>
 The training is limited to 5 hours a day, so no need to push yourself beyond that. Also, feel free to leave and come back to fill up the rest of the 5 hours!<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
similarity index 83%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
index 3fdcd9522a..c98d395aee 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
@@ -1,5 +1,5 @@
 <html><body>Recruiter:<br>
 Not a minute goes wasted in the Royal Training Camp. All training is recorded, and you check how much XP and SP you gained by using the camp button. Results will vary by your level upon entry, but rest assured that your training will be adjusted to your level as you become stronger.<br>
 After 5 hours, or upon your desired exit, you will get your training results calculated into points. Talk to the recruiters and they will help you with it.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
similarity index 67%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
index 20dca10271..eb4b422400 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
@@ -5,6 +5,6 @@ Start Level: &nbsp;<font color="LEVEL">%training_level%</font><br>
 Training Duration: &nbsp;<font color="LEVEL">%training_time%&nbsp;min.</font><br>
 XP Earned: &nbsp;<font color="LEVEL">%training_exp%</font><br>
 SP Earned: &nbsp;<font color="LEVEL">%training_sp%</font><br><br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Recruiter calculate">"Can you calculate my points?"</Button>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest TrainingCamp calculate">"Can you calculate my points?"</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html> 
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
similarity index 62%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
index 0f8a50b391..7e1ec96645 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 It seems you haven't done much training since you joined. Get some training and then come check your results.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
similarity index 58%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
index c673561cb9..27c630049f 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 There is a report on your training. Look at the results and come back to practice more.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
similarity index 61%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
index 86db4f13e9..207f4877a1 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 I hasten to inform you that if you are not a user of a premium subscription, get training in camp will not work.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378-02.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378-02.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
similarity index 61%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378.htm
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
index a295d94222..3974b3df3e 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
@@ -22,17 +22,17 @@
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
+							<button action="bypass -h Quest TrainingCamp enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
+							<button action="bypass -h Quest TrainingCamp info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
+							<button action="bypass -h Quest TrainingCamp 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
 						</td>
 					</tr>
 				</table>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
similarity index 92%
rename from L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
rename to L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index ddb5903c40..4765a39167 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.others.Recruiter;
+package ai.others.TrainingCamp;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,17 +41,17 @@ import com.l2jmobius.gameserver.network.serverpackets.training.ExTrainingZone_Le
 import ai.AbstractNpcAI;
 
 /**
- * Recruiter AI.
- * @author Gladicek
+ * TrainingCamp AI.
+ * @author Gladicek, Mobius
  */
-public final class Recruiter extends AbstractNpcAI
+public final class TrainingCamp extends AbstractNpcAI
 {
 	// NPC
 	private static final int RECRUITER = 4378;
 	// Misc
 	private static final Location TRAINING_LOCATION = new Location(-56516, 135938, -2672);
 	
-	private Recruiter()
+	private TrainingCamp()
 	{
 		addStartNpc(RECRUITER);
 		addFirstTalkId(RECRUITER);
@@ -312,8 +312,9 @@ public final class Recruiter extends AbstractNpcAI
 		
 		if (holder.isValid(player) && holder.isTraining())
 		{
-			final long elapsedTime = holder.getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS);
-			if (elapsedTime < Config.TRAINING_CAMP_MAX_DURATION)
+			final long elapsedTime = holder.getElapsedTime();
+			final long remainingPlayerTime = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration();
+			if (elapsedTime < remainingPlayerTime)
 			{
 				player.setLastLocation();
 				player.disableAllSkills();
@@ -321,14 +322,15 @@ public final class Recruiter extends AbstractNpcAI
 				player.setInvisible(true);
 				player.teleToLocation(TRAINING_LOCATION);
 				player.setIsImmobilized(true);
-				final long remainingDuration = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration() - elapsedTime;
+				final long remainingDuration = remainingPlayerTime - elapsedTime;
 				player.sendPacket(new ExTrainingZone_Admission(holder.getLevel(), TimeUnit.SECONDS.toMinutes(elapsedTime), remainingDuration));
 				startQuestTimer("finish", TimeUnit.SECONDS.toMillis(remainingDuration), null, player);
 			}
 			else
 			{
-				holder.setEndTime(holder.getStartTime() + (Config.TRAINING_CAMP_MAX_DURATION * 1000));
+				holder.setEndTime(holder.getStartTime() + (remainingPlayerTime * 1000));
 				player.setTraingCampInfo(holder);
+				player.sendPacket(SystemMessageId.YOU_HAVE_COMPLETED_THE_DAY_S_TRAINING);
 			}
 		}
 	}
@@ -352,6 +354,6 @@ public final class Recruiter extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new Recruiter();
+		new TrainingCamp();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
index cee0b2d34d..b5355f61fa 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
@@ -83,14 +83,14 @@ public class TrainingHolder implements Serializable
 		return Config.TRAINING_CAMP_ENABLE && (player.getObjectId() == _objectId) && (player.getClassIndex() == _classIndex);
 	}
 	
-	public long getElapsedTime(long time, TimeUnit unit)
+	public long getElapsedTime()
 	{
-		return unit.convert(time - _startTime, TimeUnit.MILLISECONDS);
+		return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS);
 	}
 	
 	public long getRemainingTime()
 	{
-		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS));
+		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime());
 	}
 	
 	public long getRemainingTime(long time)
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
similarity index 56%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
index 9d3db1101f..669ed8f45c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-01.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-01.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 Sorry, but you can't enter the camp unless you're on a premium subscription.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
similarity index 88%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
index 91bc6fcbb6..2b39359478 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-02.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-02.htm
@@ -2,5 +2,5 @@
 If you're on Premium subscription, and reached Lv. 18, you can request to enter the Training Camp through a recruiter in any town.<br1>Don't worry about the severity of the training, though. Our systematic training will guarantee your growth no matter what.<br1>
 Remember, time will continue to pass while training, so &nbsp;<font color="LEVEL">the clock is ticking on your buffs and enchants</font>. Also, items that affect XP such as &nbsp;<font color="LEVEL">Runes and Agathions </font> have no effect there.<br>
 The training is limited to 5 hours a day, so no need to push yourself beyond that. Also, feel free to leave and come back to fill up the rest of the 5 hours!<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
similarity index 83%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
index 3fdcd9522a..c98d395aee 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378-03.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-03.htm
@@ -1,5 +1,5 @@
 <html><body>Recruiter:<br>
 Not a minute goes wasted in the Royal Training Camp. All training is recorded, and you check how much XP and SP you gained by using the camp button. Results will vary by your level upon entry, but rest assured that your training will be adjusted to your level as you become stronger.<br>
 After 5 hours, or upon your desired exit, you will get your training results calculated into points. Talk to the recruiters and they will help you with it.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
similarity index 67%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
index 20dca10271..eb4b422400 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-04.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-04.htm
@@ -5,6 +5,6 @@ Start Level: &nbsp;<font color="LEVEL">%training_level%</font><br>
 Training Duration: &nbsp;<font color="LEVEL">%training_time%&nbsp;min.</font><br>
 XP Earned: &nbsp;<font color="LEVEL">%training_exp%</font><br>
 SP Earned: &nbsp;<font color="LEVEL">%training_sp%</font><br><br>
-<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Recruiter calculate">"Can you calculate my points?"</Button>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest TrainingCamp calculate">"Can you calculate my points?"</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html> 
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
similarity index 62%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
index 0f8a50b391..7e1ec96645 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-05.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-05.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 It seems you haven't done much training since you joined. Get some training and then come check your results.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
similarity index 58%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
index c673561cb9..27c630049f 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/4378-06.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-06.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 There is a report on your training. Look at the results and come back to practice more.<br>
-<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378.htm">Back</Button>
+<Button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378.htm">Back</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
similarity index 61%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
index 86db4f13e9..207f4877a1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/others/Recruiter/4378-07.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378-07.htm
@@ -1,4 +1,4 @@
 <html><body>Recruiter:<br>
 I hasten to inform you that if you are not a user of a premium subscription, get training in camp will not work.<br>
-<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest Recruiter 4378-02.htm">Back</button>
+<button ALIGN=LEFT ICON="RETURN" action="bypass -h Quest TrainingCamp 4378-02.htm">Back</button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
similarity index 61%
rename from L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378.htm
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
index a295d94222..3974b3df3e 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/others/Recruiter/4378.htm
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/4378.htm
@@ -22,17 +22,17 @@
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
+							<button action="bypass -h Quest TrainingCamp enter" value="Let me enter." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingBtn_down" fore="BranchSys3.icon2.ArmyTrainingBtn">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
+							<button action="bypass -h Quest TrainingCamp info" value="Tell me about this place." width=200 height=31 back="BranchSys3.icon2.ArmyTrainingInfo_down" fore="BranchSys3.icon2.ArmyTrainingInfo">
 						</td>
 					</tr>
 					<tr>
 						<td align=center>
-							<button action="bypass -h Quest Recruiter 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
+							<button action="bypass -h Quest TrainingCamp 4378-04.htm" value="Calculate my points." width=200 height=31 back="L2UI_CT1.HtmlWnd_DF_Awake_Down" fore="L2UI_CT1.HtmlWnd_DF_Awake">
 						</td>
 					</tr>
 				</table>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
similarity index 94%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
index cf5b3188a6..e9ec902048 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/Recruiter/Recruiter.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/others/TrainingCamp/TrainingCamp.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package ai.others.Recruiter;
+package ai.others.TrainingCamp;
 
 import java.util.concurrent.TimeUnit;
 
@@ -41,17 +41,17 @@ import com.l2jmobius.gameserver.network.serverpackets.training.ExTrainingZone_Le
 import ai.AbstractNpcAI;
 
 /**
- * Recruiter AI.
- * @author Gladicek
+ * TrainingCamp AI.
+ * @author Gladicek, Mobius
  */
-public final class Recruiter extends AbstractNpcAI
+public final class TrainingCamp extends AbstractNpcAI
 {
 	// NPC
 	private static final int RECRUITER = 4378;
 	// Misc
 	private static final Location TRAINING_LOCATION = new Location(-56516, 135938, -2672);
 	
-	private Recruiter()
+	private TrainingCamp()
 	{
 		addStartNpc(RECRUITER);
 		addFirstTalkId(RECRUITER);
@@ -312,8 +312,9 @@ public final class Recruiter extends AbstractNpcAI
 		
 		if (holder.isValid(player) && holder.isTraining())
 		{
-			final long elapsedTime = holder.getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS);
-			if (elapsedTime < Config.TRAINING_CAMP_MAX_DURATION)
+			final long elapsedTime = holder.getElapsedTime();
+			final long remainingPlayerTime = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration();
+			if (elapsedTime < remainingPlayerTime)
 			{
 				player.setLastLocation();
 				player.disableAllSkills();
@@ -321,14 +322,15 @@ public final class Recruiter extends AbstractNpcAI
 				player.setInvisible(true);
 				player.teleToLocation(TRAINING_LOCATION);
 				player.setIsImmobilized(true);
-				final long remainingDuration = Config.TRAINING_CAMP_MAX_DURATION - player.getTraingCampDuration() - elapsedTime;
+				final long remainingDuration = remainingPlayerTime - elapsedTime;
 				player.sendPacket(new ExTrainingZone_Admission(holder.getLevel(), TimeUnit.SECONDS.toMinutes(elapsedTime), remainingDuration));
 				startQuestTimer("finish", TimeUnit.SECONDS.toMillis(remainingDuration), null, player);
 			}
 			else
 			{
-				holder.setEndTime(holder.getStartTime() + (Config.TRAINING_CAMP_MAX_DURATION * 1000));
+				holder.setEndTime(holder.getStartTime() + (remainingPlayerTime * 1000));
 				player.setTraingCampInfo(holder);
+				player.sendPacket(SystemMessageId.YOU_HAVE_COMPLETED_THE_DAY_S_TRAINING);
 			}
 		}
 	}
@@ -352,6 +354,6 @@ public final class Recruiter extends AbstractNpcAI
 	
 	public static void main(String[] args)
 	{
-		new Recruiter();
+		new TrainingCamp();
 	}
 }
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
index 353f080aab..05ce165be8 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
@@ -83,14 +83,14 @@ public class TrainingHolder implements Serializable
 		return Config.TRAINING_CAMP_ENABLE && (player.getObjectId() == _objectId) && (player.getClassIndex() == _classIndex);
 	}
 	
-	public long getElapsedTime(long time, TimeUnit unit)
+	public long getElapsedTime()
 	{
-		return unit.convert(time - _startTime, TimeUnit.MILLISECONDS);
+		return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS);
 	}
 	
 	public long getRemainingTime()
 	{
-		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS));
+		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime());
 	}
 	
 	public long getRemainingTime(long time)
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
index cee0b2d34d..b5355f61fa 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/holders/TrainingHolder.java
@@ -83,14 +83,14 @@ public class TrainingHolder implements Serializable
 		return Config.TRAINING_CAMP_ENABLE && (player.getObjectId() == _objectId) && (player.getClassIndex() == _classIndex);
 	}
 	
-	public long getElapsedTime(long time, TimeUnit unit)
+	public long getElapsedTime()
 	{
-		return unit.convert(time - _startTime, TimeUnit.MILLISECONDS);
+		return TimeUnit.SECONDS.convert(System.currentTimeMillis() - _startTime, TimeUnit.MILLISECONDS);
 	}
 	
 	public long getRemainingTime()
 	{
-		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime(System.currentTimeMillis(), TimeUnit.SECONDS));
+		return TimeUnit.SECONDS.toMinutes(Config.TRAINING_CAMP_MAX_DURATION - getElapsedTime());
 	}
 	
 	public long getRemainingTime(long time)