updated mosk warps, mapflags

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10719 54d463be-8e91-2dee-dedb-b68131a5f0ec

13 files changed, 96 insertions, 32 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
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 74448f67a..6432c41c0 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,5 +1,7 @@
 Date		Added
 ======
+2007/06/08
+	* Added real Moscovia warps, thanks to $ephiroth [Lupus]
 2007/06/07
 	* Rev. 10717 Fixed Man Stuck in Ice only giving 1 Freezing Snow Powder. [L0ne_W0lf]
 	* Rev. 10716 Forgot the standard script header in the Rachel guide. [L0ne_W0lf]
diff --git a/npc/cities/moscovia_custom.txt b/npc/cities/moscovia_custom.txt
deleted file mode 100644
index d03013d78..000000000
--- a/npc/cities/moscovia_custom.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-//===== eAthena Script ==================================================

-//= Moscovia Dungeon / Field Warp Script.

-//===== By: =============================================================

-//= Azazel

-//===== Current Version: ================================================

-//= 1.0

-//===== Compatible With: ================================================

-//= Any Athena Version

-//===== Description: ====================================================

-//= 

-//===== Additional Comments: ============================================

-//= 1.0 100% Custom (just to walk and check)

-//=======================================================================

-

-//= Moscovia ================================================

-mosk_fild02.gat,190,257,0	warp	moscovia008	1,1,mosk_dun01.gat,189,45

-

-//= Deep Wood ================================================

-mosk_dun01.gat,189,42,0	warp	moscovia009	1,1,mosk_fild02.gat,190,254

-mosk_dun01.gat,200,273,0	warp	moscovia010	1,1,mosk_dun02.gat,164,31

-mosk_dun02.gat,167,28,0	warp	moscovia011	1,1,mosk_dun01.gat,200,270

-mosk_dun02.gat,267,117,0	warp	moscovia012	1,1,mosk_dun03.gat,32,135

-mosk_dun03.gat,29,132,0	warp	moscovia013	1,1,mosk_dun02.gat,264,117
\ No newline at end of file
diff --git a/npc/scripts_warps.conf b/npc/scripts_warps.conf
index c7a19f48a..0edf90c90 100644
--- a/npc/scripts_warps.conf
+++ b/npc/scripts_warps.conf
@@ -31,7 +31,7 @@ npc: npc/warps/cities/lighthalzen.txt
 npc: npc/warps/cities/louyang.txt
 npc: npc/warps/cities/lutie.txt
 npc: npc/warps/cities/morroc.txt
-//npc: npc/warps/cities/moscovia_custom.txt
+npc: npc/warps/cities/moscovia.txt
 npc: npc/warps/cities/nameless.txt
 npc: npc/warps/cities/niflheim.txt
 npc: npc/warps/cities/payon.txt
@@ -62,13 +62,13 @@ npc: npc/warps/dungeons/lhalzen_dun.txt
 npc: npc/warps/dungeons/louyang_dun.txt
 npc: npc/warps/dungeons/lutie_dun.txt
 npc: npc/warps/dungeons/morroc_duns.txt
+npc: npc/warps/dungeons/mosk_dun.txt
 npc: npc/warps/dungeons/odin.txt
 npc: npc/warps/dungeons/orc_dun.txt
 npc: npc/warps/dungeons/payon_dun.txt
 npc: npc/warps/dungeons/prt_dun.txt
 npc: npc/warps/dungeons/rachel_dun.txt
 npc: npc/warps/dungeons/thana_dun.txt
-//npc: npc/warps/dungeons/thana_custom.txt
 npc: npc/warps/dungeons/thor_dun.txt
 npc: npc/warps/dungeons/umbala_dun.txt
 npc: npc/warps/dungeons/yuno_dun.txt
diff --git a/npc/warps/cities/moscovia.txt b/npc/warps/cities/moscovia.txt
new file mode 100644
index 000000000..69fa63a97
--- /dev/null
+++ b/npc/warps/cities/moscovia.txt
@@ -0,0 +1,45 @@
+//===== Athena Script ========================================

+//= Moscovia City Warp Script

+//===== By: ==================================================

+//= $ephiroth

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= Any Athena Version

+//===== Description: =========================================

+//= Warp Points for Moscovia City

+//===== Additional Comments: =================================

+//= 1.0 Initial version [$ephiroth]

+//============================================================

+

+// Mansion

+moscovia.gat,224,235,0	warp	moskwarp1001	1,1,mosk_in.gat,96,91

+mosk_in.gat,93,91,0	warp	moskwarp1002	1,1,moscovia.gat,224,232

+mosk_in.gat,100,126,0	warp	moskwarp1003	1,1,mosk_in.gat,21,116

+mosk_in.gat,21,113,0	warp	moskwarp1004	1,1,mosk_in.gat,100,123

+// Weapon House

+moscovia.gat,185,189,0	warp	moskwarp1005	1,1,mosk_in.gat,16,179

+mosk_in.gat,13,179,0	warp	moskwarp1006	1,1,moscovia.gat,188,193

+moscovia.gat,203,171,0	warp	moskwarp1007	1,1,mosk_in.gat,85,179

+mosk_in.gat,88,179,0	warp	moskwarp1008	1,1,moscovia.gat,205,168

+// Instrument House

+moscovia.gat,223,174,0	warp	moskwarp1009	1,1,mosk_in.gat,14,245

+mosk_in.gat,11,245,0	warp	moskwarp1010	1,1,moscovia.gat,220,177

+// Inn

+moscovia.gat,229,207,0	warp	moskwarp1011	1,1,mosk_in.gat,141,178

+mosk_in.gat,141,175,0	warp	moskwarp1012	1,1,moscovia.gat,226,204

+mosk_in.gat,150,191,0	warp	moskwarp1013	1,1,mosk_in.gat,206,187

+mosk_in.gat,203,187,0	warp	moskwarp1014	1,1,mosk_in.gat,147,191

+// Mansion

+moscovia.gat,256,138,0	warp	moskwarp1015	1,1,mosk_in.gat,211,114

+mosk_in.gat,211,111,0	warp	moskwarp1016	1,1,moscovia.gat,254,141

+mosk_in.gat,221,128,0	warp	moskwarp1017	1,1,mosk_in.gat,287,120

+mosk_in.gat,287,117,0	warp	moskwarp1018	1,1,mosk_in.gat,221,125

+// Private House

+moscovia.gat,195,80,0	warp	moskwarp1019	1,1,mosk_in.gat,215,40

+mosk_in.gat,215,37,0	warp	moskwarp1020	1,1,moscovia.gat,194,78

+// Private House

+moscovia.gat,146,112,0	warp	moskwarp1021	1,1,mosk_in.gat,213,256

+mosk_in.gat,213,253,0	warp	moskwarp1022	1,1,moscovia.gat,146,109

+mosk_in.gat,219,272,0	warp	moskwarp1023	1,1,mosk_in.gat,151,276

+mosk_in.gat,151,273,0	warp	moskwarp1024	1,1,mosk_in.gat,219,269
\ No newline at end of file
diff --git a/npc/warps/dungeons/mosk_dun.txt b/npc/warps/dungeons/mosk_dun.txt
new file mode 100644
index 000000000..7a32097d0
--- /dev/null
+++ b/npc/warps/dungeons/mosk_dun.txt
@@ -0,0 +1,22 @@
+//===== Athena Script ========================================

+//= Moscovia Dungeon Warp Script

+//===== By: ==================================================

+//= $ephiroth

+//===== Current Version: =====================================

+//= 1.0

+//===== Compatible With: =====================================

+//= Any Athena Version

+//===== Description: =========================================

+//= Warp Points for Moscovia Dungeon

+//===== Additional Comments: =================================

+//= 1.0 Initial version [$ephiroth]

+//============================================================

+

+mosk_fild02.gat,190,256,0	warp	moskwarp4001	1,1,mosk_dun01.gat,190,46

+mosk_dun01.gat,190,43,0	warp	moskwarp4002	1,1,mosk_fild02.gat,190,253

+

+mosk_dun01.gat,200,272,0	warp	moskwarp4003	1,1,mosk_dun02.gat,163,31

+mosk_dun02.gat,165,28,0	warp	moskwarp4004	1,1,mosk_dun01.gat,200,269

+

+mosk_dun02.gat,266,117,0	warp	moskwarp4005	1,1,mosk_dun03.gat,33,136

+mosk_dun03.gat,30,133,0	warp	moskwarp4006	1,1,mosk_dun02.gat,263,118
\ No newline at end of file