8 files changed, 25 insertions, 7 deletions

diff --git a/conf-tmpl/Changelog.txt b/conf-tmpl/Changelog.txt
index 543406640..b63e3cbb3 100644
--- a/conf-tmpl/Changelog.txt
+++ b/conf-tmpl/Changelog.txt
@@ -1,5 +1,7 @@
 Date	Added
 
+2007/06/08
+	* Added Moscovia maps into mapflags [Lupus]
 2007/06/06
 	* Added Moscovia maps in the map index [Lupus]
 2007/06/01
diff --git a/conf-tmpl/mapflag/indoors.txt b/conf-tmpl/mapflag/indoors.txt
index d21f300cf..19ee69828 100644
--- a/conf-tmpl/mapflag/indoors.txt
+++ b/conf-tmpl/mapflag/indoors.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= eAthena Dev Team
 //===== Current Version: =====================================
-//= 1.3 [Lupus]
+//= 1.3a [Lupus]
 //===== Compatible With: =====================================
 //=
 //===== Description: =========================================
@@ -17,6 +17,7 @@ gef_tower	mapflag	indoors
 geffen_in	mapflag	indoors
 moc_castle	mapflag	indoors
 morocc_in	mapflag	indoors
+mosk_in	mapflag	indoors
 payon_in01	mapflag	indoors
 payon_in02	mapflag	indoors
 payon_in03	mapflag	indoors
@@ -26,6 +27,7 @@ prt_church	mapflag	indoors
 in_orcs01	mapflag	indoors
 aldeba_in	mapflag	indoors
 monk_in	mapflag	indoors
+nameless_in	mapflag	indoors
 prt_are_in	mapflag	indoors
 arena_room	mapflag	indoors
 job_sword1	mapflag	indoors
diff --git a/conf-tmpl/mapflag/nobranch.txt b/conf-tmpl/mapflag/nobranch.txt
index 1c29d68ba..ecf813578 100644
--- a/conf-tmpl/mapflag/nobranch.txt
+++ b/conf-tmpl/mapflag/nobranch.txt
@@ -4,7 +4,7 @@
 //= eAthena Dev Team
 //= 1.2 [Lupus]
 //= 1.3 [massdriller]
-//= 1.6 [Lupus]
+//= 1.6a [Lupus]
 //===== Current Version: =====================================
 
 // Cities ================>\\
@@ -29,6 +29,8 @@ lou_in01	mapflag	nobranch
 lou_in02	mapflag	nobranch
 moc_castle	mapflag	nobranch
 morocc_in	mapflag	nobranch
+moscovia	mapflag	nobranch
+mosk_in	mapflag	nobranch
 new_zone01	mapflag	nobranch
 new_zone02	mapflag	nobranch
 new_zone03	mapflag	nobranch
diff --git a/conf-tmpl/mapflag/noicewall.txt b/conf-tmpl/mapflag/noicewall.txt
index 1af89a886..048d4e53e 100644
--- a/conf-tmpl/mapflag/noicewall.txt
+++ b/conf-tmpl/mapflag/noicewall.txt
@@ -5,7 +5,7 @@
 //=============================================================
 //= noicewall: Disables Icewall skill.
 //= To disable Icewall on a specific map add the mapname here.
-//= 1.6 Re-enabled icewalls for cities [Lupus]
+//= 1.6a Re-enabled icewalls for cities [Lupus]
 //============================================================
 
 ayo_in01	mapflag	noicewall
@@ -40,6 +40,7 @@ moc_castle	mapflag	noicewall
 monk_in	mapflag	noicewall
 morocc_in	mapflag	noicewall
 //morocc	mapflag	noicewall
+mosk_in	mapflag	noicewall
 payon_in01	mapflag	noicewall
 payon_in02	mapflag	noicewall
 payon_in03	mapflag	noicewall
diff --git a/conf-tmpl/mapflag/nomemo.txt b/conf-tmpl/mapflag/nomemo.txt
index ea9b489c7..cf8c177f4 100644
--- a/conf-tmpl/mapflag/nomemo.txt
+++ b/conf-tmpl/mapflag/nomemo.txt
@@ -2,7 +2,7 @@
 //= Map flags that disable warp portal memory
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.6 added up to Hugel maps. [Lupus]
+//= 1.6a added up to Hugel maps. [Lupus]
 //===== Current Version: =====================================
 
 
@@ -28,6 +28,14 @@ lou_in01	mapflag	nomemo
 lou_in02	mapflag	nomemo
 moc_castle	mapflag	nomemo
 morocc_in	mapflag	nomemo
+mosk_in	mapflag	nomemo
+mosk_ship	mapflag	nomemo
+mosk_fild01	mapflag	nomemo
+mosk_fild02	mapflag	nomemo
+mosk_dun01	mapflag	nomemo
+mosk_dun02	mapflag	nomemo
+mosk_dun03	mapflag	nomemo
+nameless_in	mapflag	nomemo
 niflheim	mapflag	nomemo
 nif_in	mapflag	nomemo
 new_zone01	mapflag	nomemo
diff --git a/conf-tmpl/mapflag/nopvp.txt b/conf-tmpl/mapflag/nopvp.txt
index 0a0e74071..6ffed366b 100644
--- a/conf-tmpl/mapflag/nopvp.txt
+++ b/conf-tmpl/mapflag/nopvp.txt
@@ -1,7 +1,7 @@
 ///===== Description: =============================================
 //= pvp	off: Disables Player versus Player mode.
 //= To disable PvP mode on a specific map add the mapname here.
-//= v 1.1
+//= v 1.1a
 //============================================================
 
 ayo_in01	mapflag	pvp	off
@@ -42,6 +42,7 @@ moc_castle	mapflag	pvp	off
 monk_in	mapflag	pvp	off
 morocc_in	mapflag	pvp	off
 morocc	mapflag	pvp	off
+mosk_in	pvp	off
 nif_in	mapflag	pvp	off
 payon_in01	mapflag	pvp	off
 payon_in02	mapflag	pvp	off
diff --git a/conf-tmpl/mapflag/noreturn.txt b/conf-tmpl/mapflag/noreturn.txt
index cbf969577..ee3720da0 100644
--- a/conf-tmpl/mapflag/noreturn.txt
+++ b/conf-tmpl/mapflag/noreturn.txt
@@ -2,7 +2,7 @@
 //= Map flags that disable use of Butterfly wings
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.4 [Lupus]
+//= 1.4a [Lupus]
 //===== Notes: ===============================================
 //= For disabling Fly wings use noteleport
 //= 1.3 According to the patch, enabled Butterfly wings in the Castles [Lupus]
@@ -32,6 +32,7 @@ lou_in01	mapflag	noreturn
 lou_in02	mapflag	noreturn
 moc_castle	mapflag	noreturn
 morocc_in	mapflag	noreturn
+mosk_in	mapflag	noreturn
 new_zone01	mapflag	noreturn
 new_zone02	mapflag	noreturn
 new_zone03	mapflag	noreturn
diff --git a/conf-tmpl/mapflag/noteleport.txt b/conf-tmpl/mapflag/noteleport.txt
index 95efc6a6f..33d4bea04 100644
--- a/conf-tmpl/mapflag/noteleport.txt
+++ b/conf-tmpl/mapflag/noteleport.txt
@@ -2,7 +2,7 @@
 //= Map flags that disable use of fly wings
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.6 [Lupus]
+//= 1.6a [Lupus]
 //===== Notes: ===============================================
 //= For disabling Butterfly wings use noreturn
 //===== Current Version: =====================================
@@ -31,6 +31,7 @@ lou_in01	mapflag	noteleport
 lou_in02	mapflag	noteleport
 moc_castle	mapflag	noteleport
 morocc_in	mapflag	noteleport
+mosk_in	mapflag	noteleport
 new_zone01	mapflag	noteleport
 new_zone02	mapflag	noteleport
 new_zone03	mapflag	noteleport