From b7eb62ffb40a30a572bcccfd382ac6dda1840379 Mon Sep 17 00:00:00 2001
From: aleos89 <aleos89@users.noreply.github.com>
Date: Fri, 8 Jan 2016 13:33:24 -0500
Subject: [PATCH] Follow up to a54bb65 * Fixed the config format. * Adjusted
 atcommand go to properly place players on renewal mode.

---
 conf/char_athena.conf | 4 ++--
 src/common/mapindex.h | 8 +++++++-
 src/map/atcommand.c   | 4 ++++
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/conf/char_athena.conf b/conf/char_athena.conf
index 6e40aa9496..ea0524b493 100644
--- a/conf/char_athena.conf
+++ b/conf/char_athena.conf
@@ -111,8 +111,8 @@ save_log: yes
 // Format: <map_name>,<x>,<y>{:<map_name>,<x>,<y>...}
 // Max number of start points is MAX_STARTPOINT in char.h (default 5)
 // Location is randomly picked on character creation.
-start_point: iz_int,97,90,iz_int01,97,90,iz_int02,97,90,iz_int03,97,90,iz_int04,97,90
-start_point_pre: new_1-1,53,111,new_2-1,53,111,new_3-1,53,111,new_4-1,53,111,new_5-1,53,111
+start_point: iz_int,97,90:iz_int01,97,90:iz_int02,97,90:iz_int03,97,90:iz_int04,97,90
+start_point_pre: new_1-1,53,111:new_2-1,53,111:new_3-1,53,111:new_4-1,53,111:new_5-1,53,111
 
 // Starting items for new characters
 // Max number of items is MAX_STARTITEM in char.c (default 32)
diff --git a/src/common/mapindex.h b/src/common/mapindex.h
index ec36d0e034..ec04750936 100644
--- a/src/common/mapindex.h
+++ b/src/common/mapindex.h
@@ -4,6 +4,8 @@
 #ifndef _MAPINDEX_H_
 #define _MAPINDEX_H_
 
+#include "../config/renewal.h"
+
 #define MAX_MAPINDEX 2000
 
 //Some definitions for the mayor city maps.
@@ -31,7 +33,11 @@
 #define MAP_RACHEL "rachel"
 #define MAP_VEINS "veins"
 #define MAP_JAIL "sec_pri"
-#define MAP_NOVICE "new_1-1"
+#ifdef RENEWAL
+	#define MAP_NOVICE "iz_int"
+#else
+	#define MAP_NOVICE "new_1-1"
+#endif
 #define MAP_MOSCOVIA "moscovia"
 #define MAP_MIDCAMP "mid_camp"
 #define MAP_MANUK "manuk"
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 7a19bc2e44..4aed60fa13 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -1840,7 +1840,11 @@ ACMD_FUNC(go)
 		{ MAP_UMBALA,       89, 157 }, // 12=Umbala
 		{ MAP_NIFLHEIM,     21, 153 }, // 13=Niflheim
 		{ MAP_LOUYANG,     217,  40 }, // 14=Louyang
+#ifdef RENEWAL
+		{ MAP_NOVICE,       97, 90  }, // 15=Training Grounds (Renewal)
+#else
 		{ MAP_NOVICE,       53, 111 }, // 15=Training Grounds
+#endif
 		{ MAP_JAIL,         23,  61 }, // 16=Prison
 		{ MAP_JAWAII,      249, 127 }, // 17=Jawaii
 		{ MAP_AYOTHAYA,    151, 117 }, // 18=Ayothaya