Browse Source

Merge branch 'master' into HEAD

Battlecruiser 10 years ago
parent
commit
8c0e6e9ce9
100 changed files with 1437 additions and 2357 deletions
  1. 2 0
      .gitattributes
  2. 1 4
      L2J_DataPack/.classpath
  3. 3 0
      L2J_DataPack/.gitignore
  4. 1 1
      L2J_DataPack/.settings/org.eclipse.jdt.ui.prefs
  5. 9 0
      L2J_DataPack/build.gradle
  6. 8 25
      L2J_DataPack/build.xml
  7. 0 60
      L2J_DataPack/dist/community/data/staticfiles/html/castle.htm
  8. 0 33
      L2J_DataPack/dist/community/data/staticfiles/html/castlelist.htm
  9. 0 109
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome-leader.htm
  10. 0 55
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome-mail.htm
  11. 0 100
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome-management.htm
  12. 0 109
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome-member.htm
  13. 0 64
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome-notice.htm
  14. 0 108
      L2J_DataPack/dist/community/data/staticfiles/html/clanhome.htm
  15. 0 71
      L2J_DataPack/dist/community/data/staticfiles/html/clanlist.htm
  16. 0 102
      L2J_DataPack/dist/community/data/staticfiles/html/clanpost-show.htm
  17. 0 50
      L2J_DataPack/dist/community/data/staticfiles/html/clanpost-write.htm
  18. 0 75
      L2J_DataPack/dist/community/data/staticfiles/html/clanpost.htm
  19. 0 63
      L2J_DataPack/dist/community/data/staticfiles/html/friend.htm
  20. 0 78
      L2J_DataPack/dist/community/data/staticfiles/html/mail-show.htm
  21. 0 54
      L2J_DataPack/dist/community/data/staticfiles/html/mail-write.htm
  22. 0 53
      L2J_DataPack/dist/community/data/staticfiles/html/mail.htm
  23. 0 56
      L2J_DataPack/dist/community/data/staticfiles/html/memo-show.htm
  24. 0 42
      L2J_DataPack/dist/community/data/staticfiles/html/memo-write.htm
  25. 0 41
      L2J_DataPack/dist/community/data/staticfiles/html/memo.htm
  26. 0 43
      L2J_DataPack/dist/community/data/top/bartz/html/events.htm
  27. 0 90
      L2J_DataPack/dist/community/data/top/bartz/html/index.htm
  28. 0 50
      L2J_DataPack/dist/community/data/top/bartz/html/news.htm
  29. 0 29
      L2J_DataPack/dist/community/data/top/bartz/html/rules.htm
  30. 0 4
      L2J_DataPack/dist/community/data/top/servertopdir.xml
  31. 0 15
      L2J_DataPack/dist/community/data/xsd/servertopdir.xsd
  32. 1 1
      L2J_DataPack/dist/doc/L2J_DataPack_README.txt
  33. 3 15
      L2J_DataPack/dist/game/config/adminCommands.xml
  34. 0 1
      L2J_DataPack/dist/game/data/announcements.txt
  35. 9 1
      L2J_DataPack/dist/game/data/buylists/0009923.xml
  36. 0 1
      L2J_DataPack/dist/game/data/critannouncements.txt
  37. 80 80
      L2J_DataPack/dist/game/data/doors.xml
  38. 0 27
      L2J_DataPack/dist/game/data/html/CommunityBoard/1.htm
  39. 0 41
      L2J_DataPack/dist/game/data/html/CommunityBoard/10.htm
  40. 0 48
      L2J_DataPack/dist/game/data/html/CommunityBoard/2.htm
  41. 40 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/favorite.html
  42. 23 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/favorite_list.html
  43. 79 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/friends_block_list.html
  44. 90 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/friends_list.html
  45. 90 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/home.html
  46. 93 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/homepage.html
  47. 0 81
      L2J_DataPack/dist/game/data/html/CommunityBoard/index.htm
  48. 93 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/mail.html
  49. 93 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/memo.html
  50. 37 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/region.html
  51. 24 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/region_clanhall_list.html
  52. 24 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/region_list.html
  53. 37 0
      L2J_DataPack/dist/game/data/html/CommunityBoard/region_show.html
  54. 49 0
      L2J_DataPack/dist/game/data/html/admin/announces-add.htm
  55. 54 0
      L2J_DataPack/dist/game/data/html/admin/announces-edit.htm
  56. 48 0
      L2J_DataPack/dist/game/data/html/admin/announces-list.htm
  57. 54 0
      L2J_DataPack/dist/game/data/html/admin/announces-show.htm
  58. 7 7
      L2J_DataPack/dist/game/data/html/admin/charedit.htm
  59. 5 5
      L2J_DataPack/dist/game/data/html/admin/gm_menu.htm
  60. 1 1
      L2J_DataPack/dist/game/data/html/admin/manor.htm
  61. 1 1
      L2J_DataPack/dist/game/data/html/admin/server_menu.htm
  62. 0 1
      L2J_DataPack/dist/game/data/html/admin/setclass/dark_elf_fighter.htm
  63. 0 4
      L2J_DataPack/dist/game/data/html/admin/setclass/dark_elf_mage.htm
  64. 0 5
      L2J_DataPack/dist/game/data/html/admin/setclass/dwarf.htm
  65. 0 3
      L2J_DataPack/dist/game/data/html/admin/setclass/elf_fighter.htm
  66. 0 4
      L2J_DataPack/dist/game/data/html/admin/setclass/elf_mage.htm
  67. 0 4
      L2J_DataPack/dist/game/data/html/admin/setclass/human_fighter.htm
  68. 0 3
      L2J_DataPack/dist/game/data/html/admin/setclass/human_mage.htm
  69. 0 4
      L2J_DataPack/dist/game/data/html/admin/setclass/kamael.htm
  70. 0 5
      L2J_DataPack/dist/game/data/html/admin/setclass/orc_fighter.htm
  71. 0 2
      L2J_DataPack/dist/game/data/html/admin/setclass/orc_mage.htm
  72. 0 5
      L2J_DataPack/dist/game/data/html/default/31555.htm
  73. 0 5
      L2J_DataPack/dist/game/data/html/default/31556.htm
  74. 0 10
      L2J_DataPack/dist/game/data/html/default/32346.htm
  75. 3 3
      L2J_DataPack/dist/game/data/html/default/32537-1.htm
  76. 4 0
      L2J_DataPack/dist/game/data/html/default/32738.htm
  77. 2 2
      L2J_DataPack/dist/game/data/html/teleporter/half/30080.htm
  78. 5 0
      L2J_DataPack/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml
  79. 6 1
      L2J_DataPack/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml
  80. 3 0
      L2J_DataPack/dist/game/data/instances/CrystalCaverns.xml
  81. 4 0
      L2J_DataPack/dist/game/data/instances/DemonPrince.xml
  82. 1 0
      L2J_DataPack/dist/game/data/instances/DisciplesNecropolisPast.xml
  83. 4 0
      L2J_DataPack/dist/game/data/instances/FinalEmperialTomb.xml
  84. 1 0
      L2J_DataPack/dist/game/data/instances/HideoutOfTheDawn.xml
  85. 5 0
      L2J_DataPack/dist/game/data/instances/IceQueensCastleNormalBattle.xml
  86. 1 0
      L2J_DataPack/dist/game/data/instances/MonasteryOfSilence.xml
  87. 1 0
      L2J_DataPack/dist/game/data/instances/NornilsGarden.xml
  88. 4 0
      L2J_DataPack/dist/game/data/instances/Ranku.xml
  89. 40 40
      L2J_DataPack/dist/game/data/multisell/7897.xml
  90. 8 73
      L2J_DataPack/dist/game/data/scripts.cfg
  91. 1 1
      L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java
  92. 113 113
      L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java
  93. 1 1
      L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java
  94. 3 4
      L2J_DataPack/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java
  95. 42 45
      L2J_DataPack/dist/game/data/scripts/ai/group_template/BeastFarm.java
  96. 2 2
      L2J_DataPack/dist/game/data/scripts/ai/group_template/DenOfEvil.java
  97. 9 9
      L2J_DataPack/dist/game/data/scripts/ai/group_template/DragonValley.java
  98. 5 6
      L2J_DataPack/dist/game/data/scripts/ai/group_template/FairyTrees.java
  99. 107 96
      L2J_DataPack/dist/game/data/scripts/ai/group_template/FeedableBeasts.java
  100. 3 12
      L2J_DataPack/dist/game/data/scripts/ai/group_template/FleeMonsters.java

+ 2 - 0
.gitattributes

@@ -0,0 +1,2 @@
+# SH files must always use LF.
+*.sh eol=lf

+ 1 - 4
L2J_DataPack/.classpath

@@ -3,9 +3,6 @@
 	<classpathentry including="**/*.java" kind="src" path="dist/game/data/scripts" />
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8" />
 	<classpathentry combineaccessrules="false" kind="src" path="/L2J_Server" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/javolution-5.5.1.jar" />
 	<classpathentry kind="lib" path="/L2J_Server/dist/libs/mmocore.jar" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/netcon-1.7.jar" />
-	<classpathentry kind="lib" path="/L2J_Server/dist/libs/L2J_GeoAbstraction.jar" />
 	<classpathentry kind="output" path="bin" />
-</classpath>
+</classpath>

+ 3 - 0
L2J_DataPack/.gitignore

@@ -1,2 +1,5 @@
 /bin/
 /build/
+/.gradle/
+.DS_Store
+*.log

+ 1 - 1
L2J_DataPack/.settings/org.eclipse.jdt.ui.prefs

@@ -61,7 +61,7 @@ formatter_settings_version=12
 org.eclipse.jdt.ui.exception.name=e
 org.eclipse.jdt.ui.gettersetter.use.is=true
 org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;com;gui.trove;
+org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.javadoc=true
 org.eclipse.jdt.ui.keywordthis=false
 org.eclipse.jdt.ui.ondemandthreshold=99

+ 9 - 0
L2J_DataPack/build.gradle

@@ -0,0 +1,9 @@
+defaultTasks('zip')
+
+task zip(type: Zip) {
+	baseName = 'build/L2J_DataPack'
+	from('dist')
+}
+task wrapper(type: Wrapper) {
+	gradleVersion = '2.2.1'
+}

+ 8 - 25
L2J_DataPack/build.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="L2J_DataPack" default="build" basedir=".">
+<project name="L2J_DataPack" default="zip" basedir=".">
 	<description>
-		Copyright (C) 2004-2014 L2J DataPack
+		Copyright (C) 2004-2015 L2J DataPack
 		
 		This file is part of L2J DataPack.
 		
@@ -20,32 +20,15 @@
 	</description>
 
 	<property name="build" location="build" />
-	<property name="build.dist" location="${build}/dist" />
-	<property name="build.dist.doc" location="${build.dist}/doc" />
-	<property name="build.dist.game" location="${build.dist}/game" />
-	<property name="build.dist.login" location="${build.dist}/login" />
 
-	<target name="init" depends="checkRequirements" description="Create the output directories.">
+	<target name="init" description="Create the output directory.">
 		<mkdir dir="${build}" />
 	</target>
 
-	<target name="dist" depends="init" description="Export the files to the output directory.">
-		<sync todir="${build.dist}" includeemptydirs="true">
-			<fileset dir="dist" />
-		</sync>
-	</target>
-
-	<target name="build" depends="dist">
-		<zip destfile="${build}/L2J_DataPack_BETA.zip" basedir="${build.dist}" level="9" />
-	</target>
-
-	<target name="checkRequirements" description="Check Requirements.">
-		<fail message="Ant 1.8.2 is required. But your version is ${ant.version} and if you are using Eclipse probably is outdated.">
-			<condition>
-				<not>
-					<antversion atleast="1.8.2" />
-				</not>
-			</condition>
-		</fail>
+	<target name="zip" depends="init">
+		<tstamp>
+			<format property="build.date" pattern="yyyy-MM-dd"/>
+		</tstamp>
+		<zip destfile="${build}/L2J_DataPack_${build.date}.zip" basedir="dist" level="9" />
 	</target>
 </project>

+ 0 - 60
L2J_DataPack/dist/community/data/staticfiles/html/castle.htm

@@ -1,60 +0,0 @@
-<html>
-
-
-<body>
-
-<center><br><br> <br1><br1>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td FIXWIDTH=15>&nbsp;</td>
-<td width=750 height=30 align=left><a action="bypass _bbshome"> Local Community </a> &nbsp;
-&gt; <a action="bypass _bbsloc"> LOCAL INFO </a>  &gt; <a action="bypass _bbsloc;%castleId%"> &^%castleId%; </a></td>
-</tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0 bgcolor=222222>
-<tr><td height=10></td></tr>
-<tr>
-<td width=5></td>
-<td WIDTH=80 valign=top>Territory Name: </td>
-<td WIDTH=220 valign=top>&^%castleId%;</td>
-<td width=5></td>
-<td width=80 valign=top> Today's Tax Rate:  </td>
-<td WIDTH=220 valign=top>%tax%</td>
-</tr>
-<tr><td height=10></td></tr>
-
-<tr>
-<td></td>
-<td>Castle Lord:   </td>
-<td>%lord%</td>
-<td></td>
-<td>Tomorrow's Tax Rate:  </td>
-<td>%tax%</td>
-</tr>
-<tr><td height=10></td></tr>
-
-<tr>
-<td></td>
-<td>Clan Owned:  </td>
-<td><a action="bypass _bbsclan;clan;%clanid%">%clanName%</a></td>
-<td></td>
-<td>Castle Name: </td>
-<td>&^%castleId%;</td>
-</tr>
-<tr><td height=10></td></tr>
-
-<tr>
-<td></td>
-<td>Alliance   </td>
-<td>%allyName%</td>
-<td></td>
-<td>Next  Attack Date:  </td>
-<td>%siegeDate%</td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<br> <br> <br></center>
-</body>
-</html>

+ 0 - 33
L2J_DataPack/dist/community/data/staticfiles/html/castlelist.htm

@@ -1,33 +0,0 @@
-<html>
-
-
-<body>
-
-<center><br><br> <br1><br1>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td FIXWIDTH=15>&nbsp;</td>
-<td width=750 height=30 align=left><a action="bypass _bbstop"> LOCAL COMMUNITY </a>  &gt; <a action="bypass _bbsloc"> LOCAL INFO </a> </td>
-</tr></table>
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=5A5A5A width=750>
-<tr>
-
-<td FIXWIDTH=5></td>
-<td FIXWIDTH=150>Territory Name</td>
-<td FIXWIDTH=170>Clan Owned</td>
-<td FIXWIDTH=170>Alliance   </td>
-<td FIXWIDTH=125 align=center>Today's Tax Rate</td>
-<td FIXWIDTH=125 align=center>Tomorrow's Tax Rate</td>
-<td FIXWIDTH=5></td>
-
-</tr>
-</table>
-
-%castleList%
-
-<br> <br> <br>
-</center>
-</body>
-</html>

+ 0 - 109
L2J_DataPack/dist/community/data/staticfiles/html/clanhome-leader.htm

@@ -1,109 +0,0 @@
-<html><body><center><br>
-<br>
-
-
-<br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> 
-&nbsp;&gt; <a action="bypass _bbsclan;clan;%clanid%"> &$802; </a>
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 bgcolor=A7A19A>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixwidth=750>
-<a action="bypass _bbscpost;list;announce;%clanid%">[Clan Announcement]</a>&nbsp;&nbsp; 
-<a action="bypass _bbscpost;list;cbb;%clanid%">[Clan Bulletin Board]</a>&nbsp;&nbsp; 
-<a action="bypass _bbsclan;management;%clanid%">[Clan Management]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;mail;%clanid%">[Clan Mail]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;notice">[Clan Notice]</a>&nbsp;&nbsp;
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750>
-
-<tr><td height=10></td></tr>
-<tr><td fixWIDTH=5></td>
-
-<td fixwidth=290 valign=top>
-%clanIntro%
-</td>
-<td fixWIDTH=5></td>
-<td fixWIDTH=5 align=center valign=top><img src="l2ui.squaregray" width=2  height=128></td>
-<td fixWIDTH=5></td>
-<td fixwidth=350>
-<table border=0 cellspacing=0 cellpadding=0 width=350>
-<tr>
-<td fixWIDTH=100 align=left>Clan Name</td>
-<td fixWIDTH=250 align=left height=20>%clanName%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Level</td>
-<td fixWIDTH=250 align=left height=20>%clanLvL%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Members</td>
-<td fixWIDTH=250 align=left height=20>%clanMembers%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Leader</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Administrator</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Alliance</td>
-<td fixWIDTH=250 align=left height=20>%allyName%</td>
-</tr>
-
-</table>
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750  bgcolor=A7A19A>
-%advert%
-<tr><td height=10>&nbsp;</td></tr>
-</table>
-<br>
-
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=750>
-<tr>
-<td FIXWIDTH=80 align=center></td>
-<td FIXWIDTH=370 align=center>&$413;</td>
-<td FIXWIDTH=110 align=center>&$417;</td>
-<td FIXWIDTH=110 align=center>&$418;</td>
-<td FIXWIDTH=80 align=center>&$419;</td>
-</tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="2">
-%clanbbs%
- 
- 
-<br>
-
-
-</center>
-<br>
- 
-<br>
-
-</body>
-</html>

+ 0 - 55
L2J_DataPack/dist/community/data/staticfiles/html/clanhome-mail.htm

@@ -1,55 +0,0 @@
-<html>
-
-
-<body>
-<br><br> <br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=750 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> &nbsp;&gt;&nbsp; <a action="bypass _bbsclan;clan;%clanid%"> &amp;$802; </a>
-  &gt; Clan Mail
-</td></tr></table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=750><img src="L2UI.SquareGray" width="750" height="1"></td></tr>
-</table>
-
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td><img src="l2ui.mini_logo" width=5 height=20></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>TO:</td>
-<td FIXWIDTH=690 height=29>%clanName% Clan Member</td>
-<td width=5></td>
-</tr>
-<tr>
-<td ></td>
-<td align=center height=29>&$413;</td>
-<td ><edit var = "Title" width=690 height=13 length="128"></td>
-<td ></td>
-</tr>
-</table>
-
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29 valign=top>&$427;</td>
-<td FIXWIDTH=690><MultiEdit var ="Content" width=690 height=313></td>
-<td width=5></td>
-</tr>
-<tr><td width=5 height=10></td></tr>
-</table>
-
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=10></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>&nbsp;</td>
-<td align=center FIXWIDTH=70><button value="Submit" action="Write _bbsclan mail %clanid% Title Title Content" back="l2ui_ch3.smallbutton2_down" width=65 height=20 fore="l2ui_ch3.smallbutton2" ></td>
-<td align=center FIXWIDTH=70><button value = "&$141;" action="bypass _bbsclan;clan;%clanid%" back="l2ui_ch3.smallbutton2_down" width=65 height=20 fore="l2ui_ch3.smallbutton2"> </td>
-
-<td align=center FIXWIDTH=480>&nbsp;</td>
-<td width=5></td>
-</tr></table>
-
-
-</body>
-</html>

+ 0 - 100
L2J_DataPack/dist/community/data/staticfiles/html/clanhome-management.htm

@@ -1,100 +0,0 @@
-<html>
-<body><center><br><br>
-
-<br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=750 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> &nbsp;&gt;&nbsp; <a action="bypass _bbsclan;clan;%clanid%"> &amp;$802; </a>
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td height=5></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750 bgcolor=434343>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixwidth=740>
-<a action="bypass _bbscpost;list;announce;%clanid%">[Clan Announcement]</a>&nbsp;&nbsp;
-<a action="bypass _bbscpost;list;cbb;%clanid%">[Clan Bulletion Board]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;management;%clanid%">[Clan Management]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;mail;%clanid%">[Clan Mail]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;notice">[Clan Notice]</a>&nbsp;&nbsp;
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750>
-<tr><td height=5></td></tr>
-<tr><td height=10></td></tr>
-<tr><td fixwidth=750>%clanName%</td></tr>
-<tr><td height=10></td></tr>
-<tr><td fixwidth=750>Edit Clan Introduction</td></tr>
-<tr><td height=5></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750>
-<tr>
-<td>
-
-<MultiEdit var ="Content" width=750 height=100></td>
-
-</tr>
-</table>
-
-<br>
-
-<table width=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=5></td></tr>
-<tr>
-<td align=center FIXWIDTH=65><button value="&$140;" action="Write _bbsclan intro %clanid% Content Content Content" back="l2ui_ch3.smallbutton2_down" width=65 height=20 fore="l2ui_ch3.smallbutton2" ></td>
-<td align=center FIXWIDTH=45></td>
-<td align=center FIXWIDTH=640></td>
-</tr>
-</table>
-
-<img src="L2UI.squareblank" width=1 height=20>
-
-<table width=750 border=0 cellspacing=2 cellpadding=0 bgcolor=434343>
-<tr>
-<td width=130>Community Name</td>
-<td width=130>Non-Member</td>
-<td width=130>Permissions</td>
-<td width=50></td>
-<td width=130>Member</td>
-<td width=130>Permissions</td>
-<td WIDTH=50></td>
-</tr></table>
-
-<img src="L2UI.squareblank" width=1 height=5>
-
-<table width=750 border=0 cellspacing=2 cellpadding=0>
-<tr>
-<td width=130>Announcement</td>
-<td width=130>%curAnnoNonPer%</td>
-<td width=130><a action="bypass _bbsclan;permission;anno;non">%nextAnnoNonPer%</a></td>
-<td width=50></td>
-<td width=130>%curAnnoMemPer%</td>
-<td width=130><a action="bypass _bbsclan;permission;anno;mem">%nextAnnoMemPer%</a></td>
-<td width=50></td>
-</tr>
-<tr>
-<td width=130>Free Community</td>
-<td width=130>%curBullNonPer%</td>
-<td width=130><a action="bypass _bbsclan;permission;cbb;non">%nextBullNonPer%</a></td>
-<td width=50></td>
-<td width=130>%curBullMemPer%</td>
-<td width=130><a action="bypass _bbsclan;permission;cbb;mem">%nextBullMemPer%</a></td>
-<td width=50></td>
-</tr>
-</table>
-
-
-</center>
-<br> <br>
-
-</body>
-</html>

+ 0 - 109
L2J_DataPack/dist/community/data/staticfiles/html/clanhome-member.htm

@@ -1,109 +0,0 @@
-<html><body><center><br>
-<br>
-
-
-<br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> 
-&nbsp;&gt; <a action="bypass _bbsclan;clan;%clanid%"> &$802; </a>
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 bgcolor=A7A19A>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixwidth=750>
-<a action="bypass _bbscpost;list;announce;%clanid%">[Clan Announcement]</a>&nbsp;&nbsp; 
-<a action="bypass _bbscpost;list;cbb;%clanid%">[Clan Bulletin Board]</a>&nbsp;&nbsp; 
-<a action="bypass _bbsclan;management;%clanid%">[Clan Management]</a>&nbsp;&nbsp;
-
-
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750>
-
-<tr><td height=10></td></tr>
-<tr><td fixWIDTH=5></td>
-
-<td fixwidth=290 valign=top>
-%clanIntro%
-</td>
-<td fixWIDTH=5></td>
-<td fixWIDTH=5 align=center valign=top><img src="l2ui.squaregray" width=2  height=128></td>
-<td fixWIDTH=5></td>
-<td fixwidth=350>
-<table border=0 cellspacing=0 cellpadding=0 width=350>
-<tr>
-<td fixWIDTH=100 align=left>Clan Name</td>
-<td fixWIDTH=250 align=left height=20>%clanName%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Level</td>
-<td fixWIDTH=250 align=left height=20>%clanLvL%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Members</td>
-<td fixWIDTH=250 align=left height=20>%clanMembers%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Leader</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Administrator</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Alliance</td>
-<td fixWIDTH=250 align=left height=20>%allyName%</td>
-</tr>
-
-</table>
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750  bgcolor=A7A19A>
-%advert%
-<tr><td height=10>&nbsp;</td></tr>
-</table>
-<br>
-
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=750>
-<tr>
-<td FIXWIDTH=80 align=center></td>
-<td FIXWIDTH=370 align=center>&$413;</td>
-<td FIXWIDTH=110 align=center>&$417;</td>
-<td FIXWIDTH=110 align=center>&$418;</td>
-<td FIXWIDTH=80 align=center>&$419;</td>
-</tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="2">
-%clanbbs%
- 
- 
-<br>
-
-
-</center>
-<br>
- 
-<br>
-
-</body>
-</html>

+ 0 - 64
L2J_DataPack/dist/community/data/staticfiles/html/clanhome-notice.htm

@@ -1,64 +0,0 @@
-<html>
-<body><center><br><br>
-<br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=750 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> &nbsp;&gt;&nbsp; <a action="bypass _bbsclan;clan;%clanid%"> &amp;$802; </a>
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td height=5></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750 bgcolor=434343>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixwidth=740>
-<a action="bypass _bbscpost;list;announce;%clanid%">[Clan Announcement]</a>&nbsp;&nbsp;
-<a action="bypass _bbscpost;list;cbb;%clanid%">[Clan Bulletion Board]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;management;%clanid%">[Clan Management]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan_clanhome;%clanid%;cmail">[Clan Mail]</a>&nbsp;&nbsp;
-<a action="bypass _bbsclan;notice">[Clan Notice]</a>&nbsp;&nbsp;
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table width=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td fixwidth=750><font color="AAAAAA">The Clan Notice function allows the clan leader to send messages through a pop-up window to clan members at login.</font> </td></tr>
-<tr><td height=20></td></tr>
-<tr><td fixwidth=750> Clan Notice Function:   &nbsp; %enabled% &nbsp; <a action="bypass _bbsclan;notice;%flag%">%flag%</a>
-</td></tr>
-</table>
-
-<img src="L2UI.Squaregray" width="750" height="1">
-
-<br> <br>
-
-<table width=750 border=0 cellspacing=2 cellpadding=0>
-<tr><td>Edit Notice: </td></tr>
-<tr><td height=5></td></tr>
-<tr><td>
-<MultiEdit var ="Content" width=750 height=100>
-</td></tr>
-</table>
-<br>
-<table width=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=5></td></tr>
-<tr>
-<td align=center FIXWIDTH=65><button value="&$140;" action="Write _bbsclan notice 0 Content Content Content" back="l2ui_ch3.smallbutton2_down" width=65 height=20 fore="l2ui_ch3.smallbutton2" ></td>
-
-<td align=center FIXWIDTH=45></td>
-<td align=center FIXWIDTH=640></td>
-</tr>
-</table>
-
-
-</center>
-<br> <br>
-
-</body>
-</html>
-

+ 0 - 108
L2J_DataPack/dist/community/data/staticfiles/html/clanhome.htm

@@ -1,108 +0,0 @@
-<html><body><center><br>
-<br>
-
-
-<br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a> 
-&nbsp;&gt; <a action="bypass _bbsclan;clan;%clanid%"> &$802; </a>
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 bgcolor=A7A19A>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixwidth=750>
-<a action="bypass _bbscpost;list;announce;%clanid%">[Clan Announcement]</a>&nbsp;&nbsp; 
-<a action="bypass _bbscpost;list;cbb;%clanid%">[Clan Bulletin Board]</a>&nbsp;&nbsp; 
- 
-
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750>
-
-<tr><td height=10></td></tr>
-<tr><td fixWIDTH=5></td>
-
-<td fixwidth=290 valign=top>
-%clanIntro%
-</td>
-<td fixWIDTH=5></td>
-<td fixWIDTH=5 align=center valign=top><img src="l2ui.squaregray" width=2  height=128></td>
-<td fixWIDTH=5></td>
-<td fixwidth=350>
-<table border=0 cellspacing=0 cellpadding=0 width=350>
-<tr>
-<td fixWIDTH=100 align=left>Clan Name</td>
-<td fixWIDTH=250 align=left height=20>%clanName%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Level</td>
-<td fixWIDTH=250 align=left height=20>%clanLvL%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Members</td>
-<td fixWIDTH=250 align=left height=20>%clanMembers%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Clan Leader</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Administrator</td>
-<td fixWIDTH=250 align=left height=20>%clanLeader%</td>
-</tr>
-<tr><td height=7></td></tr>
-<tr>
-<td fixWIDTH=100 align=left >Alliance</td>
-<td fixWIDTH=250 align=left height=20>%allyName%</td>
-</tr>
-
-</table>
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=750  bgcolor=A7A19A>
-%advert%
-<tr><td height=10>&nbsp;</td></tr>
-</table>
-<br>
-
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=750>
-<tr>
-<td FIXWIDTH=80 align=center></td>
-<td FIXWIDTH=370 align=center>&$413;</td>
-<td FIXWIDTH=110 align=center>&$417;</td>
-<td FIXWIDTH=110 align=center>&$418;</td>
-<td FIXWIDTH=80 align=center>&$419;</td>
-</tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="2">
-%clanbbs%
- 
- 
-<br>
-
-
-</center>
-<br>
- 
-<br>
-
-</body>
-</html>

+ 0 - 71
L2J_DataPack/dist/community/data/staticfiles/html/clanlist.htm

@@ -1,71 +0,0 @@
-<html><body><br>
-<br>
-
-<center>
-
-
-<br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbsclan"> Clan Community </a>
-</td></tr></table>
-
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 height=30 bgcolor=A7A19A>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=5></td>
-<td fixWIDTH=750>
-<a action="bypass _bbsclan;clan;%clanid%">[Go to my clan]: %clanhomename%</a>&nbsp;&nbsp;
-
-</td>
-<td fixWIDTH=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=755>
-<tr>
-<td FIXWIDTH=5></td>
-<td FIXWIDTH=200 align=center>Clan Name</td>
-<td FIXWIDTH=200 align=center>Clan Lord</td>
-<td FIXWIDTH=100 align=center>Clan Level</td>
-<td FIXWIDTH=200 align=center>Number of Clan Members</td>
-<td FIXWIDTH=5></td>
-</tr>
-</table>
-
-<img src="L2UI.Squareblank" width="1" height="5">
-
-
-
-
-
-<img src="L2UI.SquareBlank" width="755" height="3">
-%clanlist%
-
-<img src="L2UI.SquareBlank" width="755" height="2">
-
-<table cellpadding=0 cellspacing=2 border=0><tr>
-%clanlistlength%
-</tr></table> 
-
-
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755 height=20></td></tr>
-</table>
-
-<table border=0><tr><td><combobox width=65 var=keyword list="Name;Ruler"></td><td><edit var = "Search" width=130 height=15 length="16"></td>
-<td><button value="&$420;" action="Write 5 -1 0 Search keyword keyword" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td> </tr></table>
-
-<br>
- <br>
-
-
-</center>
-</body>
-</html>

+ 0 - 102
L2J_DataPack/dist/community/data/staticfiles/html/clanpost-show.htm

@@ -1,102 +0,0 @@
-<html>
-<body><center><br><br>
-<table border=0 width=750><tr><td width=10></td><td width=740 align=left>
-<a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbsclan">Clan Community</a>&nbsp;>&nbsp;<a action="bypass _bbsclan;clan;%clanid%">Clan Home</a>&nbsp;>&nbsp;%link%
-</td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=0 bgcolor=333333>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=65 align=center valign=top>%postId%</td>
-<td fixWIDTH=480 valign=top>%postTitle%</td>
-<td fixwidth=5></td>
-<td fixwidth=60 valign=top> &$419; :</td>
-<td fixWIDTH=140 valign=top>%postReadCount%</td>
-</tr>
-<tr><td height=10></td></tr>
-<tr>
-<td align=center><font color="DDDDDD">&$417; :</font></td>
-<td><font color="DDDDDD">%postOwnerName%</font></td>
-<td></td>
-<td><font color="DDDDDD">&$418; :</font></td>
-<td><font color="DDDDDD">%postDate%</font></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-
-<br>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td fixwidth=5></td>
-<td FIXWIDTH=740 align=left>%mes%</td>
-<td fixwidth=5></td>
-</tr>
-</table>
-<br>
-
-<table>
-<tr><td><img src="L2UI.squaregray" width="750" height="1"></td></tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=0 width=610>
-<tr><td height=10></td></tr>
-<tr>
-<td WIDTH=70></td>
-<td align=center WIDTH=60>&$423;</td>
-<td WIDTH=5></td>
-<td><edit var = "comment" width=510 height=11></td>
-<td><button value="&$140;" action="Write _bbscpost com %clanid%;%topicId%;%postId% comment comment comment" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20> </td>
-<td WIDTH=70></td>
-</tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=3 width=750>
-%commentList%
-<tr><td><img src=\"L2UI.squaregray\" width=750 height=1></td></tr>
-<tr><td align=center><table WIDTH=300><tr>
-<td>%prevCom%</td>
-<td>%comCount%</td>
-<td>%nextCom%</td>
-</tr></table></td></tr>
-</table>
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=5A5A5A width=750>
-<tr>
-<td FIXWIDTH=60 align=center>&$416;</td>
-<td FIXWIDTH=415 align=center>&$413;</td>
-<td FIXWIDTH=130 align=center>&$417;</td>
-<td FIXWIDTH=80 align=center>&$418;</td>
-<td FIXWIDTH=65 align=center>&$419;</td>
-</tr>
-</table>
-
-%replyList%
-
-<img src="L2UI.squaregray" width=750 height=1><br1>
-<center><table WIDTH=300><tr>
-<td>%prevReply%</td>
-<td>%replyCount%</td>
-<td>%nextReply%</td>
-</tr></table></center>
-
-<img src="L2UI.squareblank" width="1" height="5">
-<img src="L2UI.squaregray" width="750" height="1">
-<img src="L2UI.squareblank" width="1" height="5">
-<table border=0 cellspacing=0 cellpadding=0 FIXWIDTH=750>
-<tr>
-<td width=50>
-<button value = "&$422;" action="bypass _bbscpost;list;%type%;%clanid%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF">
-</td>
-<td width=700 align=right>< table border=0 cellspacing=0><tr>
-<td><button value = "&$424;" action="bypass _bbscpost;edit;%type%;%clanid%;%postId%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF"></td>&nbsp;
-<td><button value = "&$425;" action="bypass _bbscpost;del;%type%;%clanid%;%postId%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF"></td>&nbsp;
-<td><button value = "&$426;" action="bypass _bbscpost;reply;%type%;%clanid%;%postParentId%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF"></td>&nbsp;
-<td><button value = "&$421;" action="bypass _bbscpost;new;%type%;%clanid%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF"></td>&nbsp;
-</tr></table>
-</td>
-</tr>
-</table> 
-
-</center>
-</body>
-</html>

+ 0 - 50
L2J_DataPack/dist/community/data/staticfiles/html/clanpost-write.htm

@@ -1,50 +0,0 @@
-<html><body><center><br>
-<br>
- <br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0><tr><td FIXWIDTH=15>&nbsp;</td><td width=745 height=30 align=left><a action="bypass _bbshome"> HOME </a>&nbsp;&gt; <a action="bypass _bbsclan"> &$809; </a>&nbsp;&gt; <a action="bypass  _bbsclan;clan;%clanid%"> &$802; </a>&nbsp;&gt; %link%</td></tr></table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="L2UI.SquareGray" width="755" height="1"></td></tr>
-<tr><td width=5 height=15></td></tr>
-</table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>&$413;</td>
-<td FIXWIDTH=120 height=29><combobox width=100 var=keyword list="%combobox%"></td>
-<td FIXWIDTH=430><edit var = "Title" width=430 height=13></td>
-<td width=5></td>
-</tr></table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td width=5 height=10></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29 valign=top>&$427;</td>
-<td FIXWIDTH=550><MultiEdit var ="Content" width=550 height=313 back="l2ui_ch3.boardinput"></td>
-<td width=5></td>
-</tr>
-<tr><td width=5 height=15></td></tr>
-</table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=10> </td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>&nbsp;</td>
-<td align=center FIXWIDTH=75><button value="&$140;" action="Write _bbscpost %job% %clanid%;%topicId%;%postId% Title Content keyword" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" ></td>
-<td align=center FIXWIDTH=75><button value = "&$141;" action="bypass _bbscpost;list;%type%;%clanid%" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" > </td>
-<td align=center FIXWIDTH=410>&nbsp;</td>
-<td width=5></td>
-</tr></table>
-
-</center>
-</body>
-</html>
-
-
-
-
-

+ 0 - 75
L2J_DataPack/dist/community/data/staticfiles/html/clanpost.htm

@@ -1,75 +0,0 @@
-<html><body><center><br>
-<br>
- <br1>
-<br1>
-<table border=0 cellspacing=0 cellpadding=0><tr><td FIXWIDTH=15>&nbsp;</td><td width=745 height=30 align=left><a action="bypass _bbshome"> HOME </a>&nbsp;&gt; <a action="bypass _bbsclan"> &$809; </a>&nbsp;&gt; <a action="bypass _bbsclan;clan;%clanid%"> &$802; </a>&nbsp;&gt; %link%</td></tr></table>
-
- 
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=756>
-<tr>
-
-<td FIXWIDTH=80 align=center>&$416;</td>
-<td FIXWIDTH=320 align=center>&$413;</td>
-<td FIXWIDTH=155 align=center>&$417;</td>
-<td FIXWIDTH=100 align=center>&$418;</td>
-<td FIXWIDTH=80 align=center>&$419;</td>
-
-</tr>
-</table>
-%postList%
-  <br>
-
-<table width=756 cellspace=0 cellpadding=0>
-  <tr>
-    <td width=70>
-      <button value="&$422;" action="bypass _bbscpost;list;%type%;%clanid%" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small">
-    </td>
-    <td width=615 align=center>
-      <table cellspacing=2 cellpadding=0 border=0 height=16>
-      <tr>
-      <td><table><tr><td></td></tr><tr><td>
-      <button action="" back="L2UI_CT1.Button_DF_Left_Down" fore="L2UI_CT1.Button_DF_Left" width=15 height=15 ></td></tr></table>
-      </td>
-        
-      <td >1</td>
-       
-      <td ><table><tr><td></td></tr><tr><td>
-      <button action="" back="L2UI_CT1.Button_DF_Right_Down" fore="L2UI_CT1.Button_DF_Right" width=15 height=15 ></td></tr></table>
-      </td>
-      </tr>
-      </table>
-    </td>
-    <td width=70>
-      <button value = "&$421;" action="bypass _bbscpost;crea;%type%;%clanid%" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" >
-    </td>
-  </tr>
-  <tr>
-    <td>
-    </td>
-    <td align=center>
-      <table border=0>
-      <tr>
-      <td>
-      <combobox width=65 var=keyword list="Title;Writer">
-      </td>
-      <td>
-      <edit var = "Search" width=130 height=15 length="16">
-      </td>
-      <td align=center>
-      <button value="&$420;" action="Write 5 40607_2 0 Search keyword keyword" back="l2ui_ct1.button.button_df_small_down" width=65 height=25 fore="l2ui_ct1.button.button_df_small">
-      </td>
-      </tr>
-      </table>
-    </td>
-    <td>
-    </td>
-  </tr>
-</table> 
-<br>
- <br>
- <br>
-
-</center>
-</body>
-</html>

+ 0 - 63
L2J_DataPack/dist/community/data/staticfiles/html/friend.htm

@@ -1,63 +0,0 @@
-<html>
-<body><br><br>
-<table border=0 width=755><tr><td width=10></td><td width=600 align=left>
-<a action="bypass _bbsfriend">Manage Friends</a>
-</td></tr>
-</table>
-<center>
-<img src="L2UI.squareblank" width="1" height="10">
-
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 bgcolor=A7A19A>
-<tr><td WIDTH=5></td><td height=10 WIDTH=750></td></tr>
-<tr><td></td>
-<td height=20>
-<a action="bypass _bbsfriend">[Friends List]</a>&nbsp;
-<a action="bypass _bbsblock">[Block List]</a>&nbsp;
-</td>
-</tr>
-<tr><td></td><td height=10></td></tr>
-</table>
-
-<br>
-Friends List
-
-
-<img src="L2UI.squaregray" width="755" height="1">
-<br>
-<table border=0 cellspacing=0 cellpadding=0 width=755>
-<tr><td>
-
-
-%friendslist%
-</td></tr></table>
-<br>
-<img src="L2UI.squaregray" width="755" height="2">
-<br><br>
-
-<font color="999999">Selection List</font>
-<img src="L2UI.squaregray" width="755" height="1">
-<br>
-<table border=0 cellspacing=0 cellpadding=0 width=755>
-<tr><td>
-%selectedFriendsList%
-</td></tr></table>
-<br>
-<img src="L2UI.squaregray" width="755" height="1">
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=10></td></tr>
-<tr>
-<td width=5></td>
-<td align=center WIDTH=540></td>
-<td align=center WIDTH=70><button value = "Delete" action="bypass _bbsfriend;del" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td>
-<td align=center WIDTH=70><button value = "Delete All" action="bypass _bbsfriend;delconfirm" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td>
-<td align=center WIDTH=70><button value = "New" action="bypass _bbsfriend;mail" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td>
-<td width=5></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-%deleteMSG%
-</center>
-</body>
-</html>

+ 0 - 78
L2J_DataPack/dist/community/data/staticfiles/html/mail-show.htm

@@ -1,78 +0,0 @@
-<html><body>
-<center><br><br> <br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbshome"> HOME </a>&nbsp;&gt;%maillink%
-</td></tr></table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=0 bgcolor=A7A19A>
-<tr><td height=10></td></tr>
-<tr>
-<td WIDTH=60 align=center valign=top>Sender:</td>
-<td WIDTH=445 valign=top>%writer%</td>
-<td width=10></td>
-<td width=90 valign=top> Send Time:</td>
-<td WIDTH=150 valign=top>%sentDate%</td>
-</tr>
-
-<tr><td height=10></td></tr>
-<tr>
-<td align=center>Recipient:</td>
-<td>%receiver%</td>
-<td></td>
-<td>Delete Intended Time:</td>
-<td>%delDate%</td>
-</tr>
-<tr><td height=10></td></tr>
-
-<tr>
-<td align=center valign=top>&nbsp; &$413; :</td>
-<td fixwidth=445 valign=top>%title%</td>
-<td></td>
-<td></td>
-<td></td>
-</tr>
-<tr><td height=10></td></tr>
-
-</table>
-
-<br>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td width=5></td>
-<td width=600 align=left>
-<!--CONTENT-->
-%mes%
-</td><td width=5></td>
-</tr>
-</table>
-<br>
-
-<img src="L2UI.squareblank" width="1" height="5"> <img src="L2UI.squaregray" width="755" height="1"> <img src="L2UI.squareblank" width="1" height="5">
-<table border=0 cellspacing=0 cellpadding=0 FIXWIDTH=755>
-<tr>
-<td width=70>
-<button value = "&$422;" action="bypass _bbsmail"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" > 
-</td>
-<td width=340></td>
-<td width=70 align=right><button value = "&$912;" action="bypass _bbsmail;reply;%topicId%;%postId%"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" >&nbsp; 
-</td>
-<td width=70 align=right><button value = "&$913;" action="bypass _bbsmail;forward;%topicId%;%postId%"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" >&nbsp; 
-</td>
-<td width=70 align=right><button value = "&$425;" action="bypass _bbsmail;del;%topicId%;%postId%"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> &nbsp; 
-</td>
- 
-<td width=70 align=right><button value = "&$914;" action="bypass _bbsmail;store;%topicId%;%postId%"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> &nbsp; 
-</td>
-
-<td width=70 align=right>
-<button value = "&$915;" action="bypass _bbsmail;crea"  back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" > 
-</td>
-
-</tr>
-</table> 
-<br> <br> <br></center>
-</body>
-</html>

+ 0 - 54
L2J_DataPack/dist/community/data/staticfiles/html/mail-write.htm

@@ -1,54 +0,0 @@
-<html><body>
-<br><br> <br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbshome"> HOME </a>&nbsp;&gt;%maillink%
-</td></tr></table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="L2UI.SquareGray" width="755" height="1"></td></tr>
-</table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td width=5 height=20></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>Recipient</td>
-<td FIXWIDTH=550><edit var = "ToList" width=700 height=13 length="128"></td>
-<td width=5></td>
-</tr>
-<tr>
-<td ></td>
-<td align=center height=29>&$413;</td>
-<td ><edit var = "Title" width=700 height=13 length="128"></td>
-<td ></td>
-</tr>
-</table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29 valign=top>&$427;</td>
-<td FIXWIDTH=550><MultiEdit var ="Content" width=700 height=313></td>
-<td width=5></td>
-</tr>
-<tr><td width=5 height=10></td></tr>
-</table>
-
-<table fixwidth=755 border=0 cellspacing=0 cellpadding=0>
-<tr><td height=10></td></tr>
-<tr>
-<td width=5></td>
-<td align=center FIXWIDTH=50 height=29>&nbsp;</td>
-<td align=center FIXwidth=70><button value="Send" action="Write _bbsmail new %postId% ToList Title Content" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" ></td>
-<td align=center FIXwidth=70><button value = "&$141;" action="bypass _bbsmail" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td>
-<td align=center FIXwidth=70><button value = "Save" action="Write _bbsmail store 0 ToList Title Content" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small" > 
- 
-</td>
-
-<td align=center FIXWIDTH=340>&nbsp;</td>
-<td width=5></td>
-</tr></table>
-
-
-</body>
-</html>

+ 0 - 53
L2J_DataPack/dist/community/data/staticfiles/html/mail.htm

@@ -1,53 +0,0 @@
-<html><body>
-<center><br><br> <br1><br1><table border=0 cellspacing=0 cellpadding=0>
-<tr><td FIXWIDTH=15>&nbsp;</td>
-<td width=755 height=30 align=left>
-<a action="bypass _bbshome"> HOME </a>&nbsp;&gt;%maillink%
-</td></tr></table>
-
-<table border=0 cellspacing=0 cellpadding=0 width=755 bgcolor=A7A19A>
-<tr><td WIDTH=5></td><td height=10 WIDTH=750></td></tr>
-<tr><td></td>
-<td height=20>
-<a action="bypass _bbsmail">[&$917;]</a>(%inbox%)&nbsp; <a action="bypass _bbsmail;sent">[&$918;]</a>(%outbox%)&nbsp; <a action="bypass _bbsmail;archive">[&$919;]</a>(%archive%)&nbsp; <a action="bypass _bbsmail;tarchive">[&$920;]</a>(%tarchive%)</td>
-</tr>
-<tr><td></td><td height=10></td></tr>
-</table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=755>
-<tr>
-
-<td FIXWIDTH=5 align=center></td>
-<td FIXWIDTH=150 align=center>%authrecive%</td>
-<td FIXWIDTH=440>&$413;</td>
-<td FIXWIDTH=150 align=center>&$910;</td>
-<td FIXWIDTH=5 align=center></td>
-
-</tr>
-</table>
-%maillist%
-
-<br>
-<table width=755 cellspace=0 cellpadding=0>
-<tr>
-<td width=50>
-
-</td>
-<td width=510 align=center>
-<table cellspacing=2 cellpadding=0 border=0><tr>
-%maillistlength%
-</tr></table> </td> 
-<td align=right><button value = "&$421;" action="bypass _bbsmail;crea" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"></td></tr>
-<tr><td width=5 height=10></td></tr>
-<tr> 
-<td></td> 
-<td align=center><table border=0><tr><td><combobox width=65 var=SearchTarget list="Writer;Title"></td><td><edit var = "Keyword" width=130 height=15 length="16"></td>
-<td><button value="&$420;" action="Write _mailsearch_0__ 0 0 SearchTarget SearchTarget Keyword" back="l2ui_ct1.button.button_df_small_down" width=70 height=25 fore="l2ui_ct1.button.button_df_small"> </td> </tr></table> </td>
-</tr>
-</table> 
-<br> <br> <br>
-</center>
-</body>
-</html>

+ 0 - 56
L2J_DataPack/dist/community/data/staticfiles/html/memo-show.htm

@@ -1,56 +0,0 @@
-<html><body><br><br>
-<table border=0 width=750><tr><td width=10></td><td width=740 align=left>
-<a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbsmemo">Memo Form</a>
-</td></tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="10">
-<center>
-<table border=0 cellspacing=0 cellpadding=0 bgcolor=333333>
-<tr><td height=10></td></tr>
-<tr>
-<td fixWIDTH=55 align=right valign=top>&$413; : &nbsp;</td>
-<td fixWIDTH=380 valign=top>%memoName%</td>
-<td fixwidth=5></td>
-<td fixwidth=50></td>
-<td fixWIDTH=120></td>
-</tr>
-<tr><td height=10></td></tr>
-<tr>
-<td align=right><font color="AAAAAA" >&$417; : &nbsp;</font></td>
-<td><font color="AAAAAA">%memoOwnerName%</font></td>
-<td></td>
-<td><font color="AAAAAA">&$418; :</font></td>
-<td><font color="AAAAAA">%postDate%</font></td>
-</tr>
-<tr><td height=10></td></tr>
-</table>
-<br>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr>
-<td fixwidth=5></td>
-<td FIXWIDTH=740 align=left>%mes%</td>
-<td fixqqwidth=5></td>
-</tr>
-</table>
-<br>
-<img src="L2UI.squareblank" width="1" height="5">
-<img src="L2UI.squaregray" width="750" height="1">
-<img src="L2UI.squareblank" width="1" height="5">
-<table border=0 cellspacing=0 cellpadding=0 FIXWIDTH=750>
-<tr>
-<td width=50>
-<button value="&$422;" action="bypass _bbsmemo" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF">
-</td>
-<td width=700 align=right><table border=0 cellspacing=0><tr>
-<td FIXWIDTH=300></td><td><button value = "&$424;" action="bypass _bbsmemo;edit;%postId%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF" ></td>&nbsp;
-<td><button value = "&$425;" action="bypass _bbsmemo;del;%postId%" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF" ></td>&nbsp;
-<td><button value = "&$421;" action="bypass _bbsmemo;crea" back="L2UI_CT1.Button_DF_Down" width=65 height=20 fore="L2UI_CT1.Button_DF" ></td>&nbsp;
-</tr></table>
-</td>
-</tr>
-</table>
-<br>
-<br>
-<br></center>
-</body>
-</html>

+ 0 - 42
L2J_DataPack/dist/community/data/staticfiles/html/memo-write.htm

@@ -1,42 +0,0 @@
-<html>
-<body><br><br>
-<table border=0 width=750><tr><td width=10></td><td width=740 align=left>
-<a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbsmemo">Memo Form</a>
-</td></tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="10">
-<center>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=610><img src="sek.cbui355" width="750" height="1"><br1><img src="sek.cbui355" width="750" height="1"></td></tr>
-</table>
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td><img src="l2ui.mini_logo" width=5 height=20></td></tr>
-<tr>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-<td align=center FIXWIDTH=74 height=29>&$413;</td>
-<td FIXWIDTH=666><edit var = "Title" width=666 height=13></td>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-</tr></table>
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td><img src="l2ui.mini_logo" width=5 height=10></td></tr>
-<tr>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-<td align=center FIXWIDTH=74 height=29 valign=top>&$427;</td>
-<td align=center FIXWIDTH=666><MultiEdit var ="Content" width=661 height=313></td>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-</tr>
-<tr><td><img src="l2ui.mini_logo" width=5 height=10></td></tr>
-</table>
-<table fixwidth=750 border=0 cellspacing=0 cellpadding=0>
-<tr><td><img src="l2ui.mini_logo" width=5 height=10></td></tr>
-<tr>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-<td align=center FIXWIDTH=74 height=29>&nbsp;</td>
-<td align=center FIXWIDTH=86><button value="&$140;" action="Write _bbsmemo %job% %postId% Title Content Title" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20></td>
-<td align=center FIXWIDTH=86><button value = "&$141;" action="bypass _bbsmemo" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20> </td>
-<td align=center FIXWIDTH=494>&nbsp;</td>
-<td><img src="l2ui.mini_logo" width=5 height=1></td>
-</tr></table>
-</center>
-</body>
-</html>

+ 0 - 41
L2J_DataPack/dist/community/data/staticfiles/html/memo.htm

@@ -1,41 +0,0 @@
-<html><body><br><br>
-<table border=0 width=750><tr><td width=10></td><td width=740 align=left>
-<a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbsmemo">Memo Form</a>
-</td></tr>
-</table>
-<img src="L2UI.squareblank" width="1" height="10">
-<center>
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=888888 width=750>
-<tr>
-<td FIXWIDTH=5></td>
-<td FIXWIDTH=511 align=center>&$413;</td>
-<td FIXWIDTH=148 align=center></td>");
-<td FIXWIDTH=86 align=center>&$418;</td>
-<td FIXWIDTH=5></td>
-</tr>
-</table>
-%memoList%
-<br>
-<table width=750 cellspace=0 cellpadding=0>
-<tr>
-<td width=50>
-<button value="&$422;" action="bypass _bbsmemo" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20>
-</td>
-<td width=510 align=center>
-<table border=0><tr>
-%memoListLength%
-</tr></table> </td> 
-<td align=right><button value = "&$421;" action="bypass _bbsmemo;crea" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20></td></tr>
-<tr><td><img src="l2ui.mini_logo" width=5 height=10></td></tr>
-<tr> 
-<td></td>
-<td align=center><table border=0><tr><td></td><td><edit var = "Search" width=130 height=11></td>
-<td><button value="&$420;" action="Write 5 -2 0 Search Search Search" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF" width=65 height=20> </td> </tr></table> </td>
-</tr>
-</table>
-<br>
-<br>
-<br>
-</center>
-</body>
-</html>

+ 0 - 43
L2J_DataPack/dist/community/data/top/bartz/html/events.htm

@@ -1,43 +0,0 @@
-<html>
-<body>
-<br>
-<table width=610>
-<tr>
-<td width=250 align=left><a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbshome;news.htm">Lineage II News</a>&nbsp;>&nbsp;<a action="bypass _bbshome;events.htm">Events</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=610 bgcolor="666666">
-<tr>
-<td width=50 height=18 align="center">&nbsp;</td>
-<td width=380 height=18 align="center">Title</td>
-<td width=90 height=18 align="center">Type of Event</td>
-<td width=90 height=18 align="left">&nbsp;&nbsp;Date</td>
-</tr>
-</table>
-<table width=610 height=46>
-<tr>
-<td width=46 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=94 align="left"><a action="bypass _bbshome;11">Wedding Event</a></td>
-<td width=290 align="left"><font color="FF9900">Marry to your love and Enjoy the benefits.</font></td>
-<td width=100 align="center">Custom Event</td>
-<td width=80 align="left">No Expiration</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-<table width=610 height=46>
-<tr>
-<td width=46 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=94 align="left"><a action="bypass _bbshome;12">Welcome Event</a></td>
-<td width=290 align="left"><font color="FF9900">The Biggest Event that a Lineage II Server has ever seen</font></td>
-<td width=100 align="center">Custom Event</td>
-<td width=80 align="left">May 21th</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-</center>
-</body>
-</html>

+ 0 - 90
L2J_DataPack/dist/community/data/top/bartz/html/index.htm

@@ -1,90 +0,0 @@
-<html><body><center><br>
-<br>
- <br1>
-<table border=0 cellspacing=0 cellpadding=0><tr><td width=50></td><td align=center width=695 height=30 align=left><img src="l2ui.bbs_lineage2" width=128 height=16 ></td></tr></table>
-<table border=0 cellspacing=0 cellpadding=2 bgcolor=A7A19A width=755>
-<tr>
-<td WIDTH=100 align=right>&$412;</td>
-<td WIDTH=410 align=center>&$413;</td>
-<td WIDTH=95 align=center>&$414;</td>
-<td WIDTH=150 align=center>&$415;</td>
-</tr>
-</table>
-
-
-
-
-
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr>
-<td FIXWIDTH=100 align=right valign=top><img src="l2ui.bbs_folder" width=32 height=32></td>
-<td FIXWIDTH=410 align=left valign=top><a action="bypass _bbsgetfav">Favorites</a><br1>
-
-<font color="AAAAAA">Bookmarks</font></td>
-<td FIXWIDTH=95 align=center valign=top>0</td>
-<td FIXWIDTH=150 align=center valign=top>admin</td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="l2ui.squaregray" width="750" height="1"></td></tr>
-</table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr>
-<td FIXWIDTH=100 align=right valign=top><img src="l2ui.bbs_folder" width=32 height=32></td>
-<td FIXWIDTH=410 align=left valign=top><a action="bypass _bbshome;rules.htm">Server Rules</a><br1>
-
-<font color="AAAAAA">Read them Carefully</font></td>
-<td FIXWIDTH=95 align=center valign=top>0</td>
-<td FIXWIDTH=150 align=center valign=top>admin</td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="l2ui.squaregray" width="750" height="1"></td></tr>
-</table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr>
-<td FIXWIDTH=100 align=right valign=top><img src="l2ui.bbs_folder" width=32 height=32></td>
-<td FIXWIDTH=410 align=left valign=top><a action="bypass _bbshome;news.htm">Lineage II News</a><br1>
-
-<font color="AAAAAA">New Information</font></td>
-<td FIXWIDTH=95 align=center valign=top>0</td>
-<td FIXWIDTH=150 align=center valign=top>admin</td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="l2ui.squaregray" width="750" height="1"></td></tr>
-</table>
-
-<br>
-
-<table border=0 cellspacing=0 cellpadding=2>
-<tr>
-<td FIXWIDTH=100 align=right valign=top><img src="l2ui.bbs_folder" width=32 height=32></td>
-<td FIXWIDTH=410 align=left valign=top><a action="bypass _bbsclan">Clan Community</a><br1>
-
-<font color="AAAAAA">Clan Community</font></td>
-<td FIXWIDTH=95 align=center valign=top>0</td>
-<td FIXWIDTH=150 align=center valign=top>admin</td>
-</tr>
-</table>
-<table border=0 cellspacing=0 cellpadding=0>
-<tr><td width=755><img src="l2ui.squaregray" width="750" height="1"></td></tr>
-</table>
- <br>
-<br>
-
-<font color="LEVEL">L2J Community Board.</font>
-<br>
-Thank you very much for using our server
-</center>
-</body>
-</html>

+ 0 - 50
L2J_DataPack/dist/community/data/top/bartz/html/news.htm

@@ -1,50 +0,0 @@
-<html>
-<body>
-<br>
-<table width=750>
-<tr>
-<td width=2100 align=left><a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbshome;news.htm">Lineage II News</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=750 bgcolor="666666">
-<tr>
-<td width=100 height=18 align="right">Type</td>
-<td width=450 height=18 align="center">Title</td>
-<td width=100 height=18 align="center">Registered</td>
-<td width=100 height=18 align="center">Administrator</td>
-</tr>
-</table>
-<table width=750 height=46>
-<tr>
-<td width=100 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=450 align="left"><table width=450><tr><td align="left">&nbsp;<a action="bypass _bbshome;events.htm">Events (0)</a></td></tr><tr><td width=450 align="left">&nbsp;Scheduled Events</td></tr></table></td>
-<td width=100 align="center">0</td>
-<td width=100 align="center">admin</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="750" height="1">
-<table width=750 height=46>
-<tr>
-<td width=100 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=450 align="left"><table width=450><tr><td align="left">&nbsp;<a action="bypass _bbshome;announce.htm">Official Announcements (0)</a></td></tr><tr><td width=450 align="left">&nbsp;General Information</td></tr></table></td>
-<td width=100 align="center">0</td>
-<td width=100 align="center">admin</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="750" height="1">
-<table width=750 height=46>
-<tr>
-<td width=100 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=450 align="left"><table width=450><tr><td align="left">&nbsp;<a action="bypass _bbshome;update.htm">Update Information (0)</a></td></tr><tr><td width=450 align="left">&nbsp;Patch Notes</td></tr></table></td>
-<td width=100 align="center">0</td>
-<td width=100 align="center">admin</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="750" height="1">
-</center>
-</body>
-</html>

+ 0 - 29
L2J_DataPack/dist/community/data/top/bartz/html/rules.htm

@@ -1,29 +0,0 @@
-<html>
-<body>
-<br>
-<table width=610>
-<tr>
-<td width=250 align=left><a action="bypass _bbshome">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbshome;rules.htm">Lineage II Rules</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=610 border="0" bgcolor="666666">
-<tr>
-<td width=50 height=18 align="center">&nbsp;</td>
-<td width=470 height=18 align="center">Title</td>
-<td width=90 height=18 align="left">&nbsp;&nbsp;Administrator</td>
-</tr>
-</table>
-<table width=610 height=46>
-<tr>
-<td width=50 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=470 align="left">&nbsp;Here goes the server rules;</td>
-<td width=90 align="center">0</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-</body>
-</html>

+ 0 - 4
L2J_DataPack/dist/community/data/top/servertopdir.xml

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<servers_list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/servertopdir.xsd">
-	<server dir="bartz" sqlDPId="200" />
-</servers_list>

+ 0 - 15
L2J_DataPack/dist/community/data/xsd/servertopdir.xsd

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<xs:element name="servers_list">
-		<xs:complexType>
-			<xs:sequence minOccurs="1" maxOccurs="1">
-				<xs:element name="server" minOccurs="1" maxOccurs="127">
-					<xs:complexType>
-						<xs:attribute name="dir" type="xs:normalizedString" use="required" />
-						<xs:attribute name="sqlDPId" type="xs:positiveInteger" use="required" />
-					</xs:complexType>
-				</xs:element>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>

+ 1 - 1
L2J_DataPack/dist/doc/L2J_DataPack_README.txt

@@ -1,4 +1,4 @@
-Copyright 2004-2014 L2J-DataPack team
+Copyright 2004-2015 L2J-DataPack team
 
 This file is part of the L2J-DataPack.
 

+ 3 - 15
L2J_DataPack/dist/game/config/adminCommands.xml

@@ -29,22 +29,10 @@
 	<admin command="admin_gmon" accessLevel="7" />
 
 	<!-- ADMIN ANNOUNCEMENTS -->
-	<admin command="admin_list_announcements" accessLevel="7" />
-	<admin command="admin_list_critannouncements" accessLevel="7" />
-	<admin command="admin_reload_announcements" accessLevel="7" />
-	<admin command="admin_announce_announcements" accessLevel="7" />
-	<admin command="admin_add_announcement" accessLevel="7" />
-	<admin command="admin_del_announcement" accessLevel="7" />
-	<admin command="admin_add_critannouncement" accessLevel="7" />
-	<admin command="admin_del_critannouncement" accessLevel="7" />
 	<admin command="admin_announce" accessLevel="7" />
-	<admin command="admin_critannounce" accessLevel="7" />
-	<admin command="admin_announce_menu" accessLevel="7" />
-	<admin command="admin_critannounce_menu" accessLevel="7" />
-	<admin command="admin_list_autoann" accessLevel="7" />
-	<admin command="admin_reload_autoann" accessLevel="7" />
-	<admin command="admin_add_autoann" accessLevel="7" />
-	<admin command="admin_del_autoann" accessLevel="7" />
+	<admin command="admin_announce_crit" accessLevel="7" />
+	<admin command="admin_announce_screen" accessLevel="7" />
+	<admin command="admin_announces" accessLevel="7" />
 
 	<!-- ADMIN BAN -->
 	<admin command="admin_punishment" accessLevel="7" />

+ 0 - 1
L2J_DataPack/dist/game/data/announcements.txt

@@ -1 +0,0 @@
-Thanks for using L2J.

+ 9 - 1
L2J_DataPack/dist/game/data/buylists/0009923.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/buylist.xsd">
+	<item id="9376" price="0" /> <!-- Dynasty Rapier -->
 	<item id="9377" price="0" /> <!-- Dynasty Rapier - Focus -->
 	<item id="9378" price="0" /> <!-- Dynasty Rapier - Health -->
 	<item id="9379" price="0" /> <!-- Dynasty Rapier - Light -->
@@ -48,7 +49,14 @@
 	<item id="9878" price="0" /> <!-- Dynasty Bagh-Nakh - Rsk. Evasion -->
 	<item id="9879" price="0" /> <!-- Dynasty Bagh-Nakh - Focus -->
 	<item id="9880" price="0" /> <!-- Dynasty Bagh-Nakh - Haste -->
-	<item id="9376" price="0" /> <!-- Dynasty Rapier -->
 	<item id="10004" price="0" /> <!-- Dynasty Dual Sword -->
+	<item id="10252" price="0" /> <!-- Dynasty Staff -->
+	<item id="10527" price="0" /> <!-- Dynasty Staff - Mana Up -->
+	<item id="10528" price="0" /> <!-- Dynasty Staff - Conversion -->
+	<item id="10529" price="0" /> <!-- Dynasty Staff - Acumen -->
+	<item id="10253" price="0" /> <!-- Dynasty Crusher -->
+	<item id="10530" price="0" /> <!-- Dynasty Crusher - Anger -->
+	<item id="10531" price="0" /> <!-- Dynasty Crusher - Health -->
+	<item id="10532" price="0" /> <!-- Dynasty Crusher - Rsk. Focus -->
 	<item id="13882" price="0" /> <!-- Dynasty Dual Daggers -->
 </list>

+ 0 - 1
L2J_DataPack/dist/game/data/critannouncements.txt

@@ -1 +0,0 @@
-http://www.l2jserver.com

+ 80 - 80
L2J_DataPack/dist/game/data/doors.xml

@@ -599,8 +599,8 @@
 	<door id="18150302" name="cratae_1815_102" open_method="0" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="-53361;-82960;-8352" node1="-53375,-83029" node2="-53348,-83029" node3="-53349,-82888" node4="-53373,-82888" nodeZ="-8352" default_status="close" targetable="false" />
 	<door id="18150303" name="cratae_1815_103" open_method="0" height="150" baseHpMax="3258432" hp_showable="false" basePDef="100000" pos="-53852;-82369;-8352" node1="-53911,-82378" node2="-53792,-82378" node3="-53792,-82360" node4="-53911,-82361" nodeZ="-8352" default_status="close" targetable="false" />
 	<door id="18200001" name="fortress_1820_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-54247;89585;-2870" node1="-54366,89535" node2="-54140,89542" node3="-54140,89638" node4="-54367,89640" nodeZ="-2870" default_status="close" />
-	<door id="18200002" name="fortress_1820_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53311;90621;-2849" node1="-53226,90612" node2="-53311,90615" node3="-53311,90628" node4="-53226,90627" nodeZ="-2849" default_status="close" />
-	<door id="18200003" name="fortress_1820_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53155;90621;-2849" node1="-53240,90612" node2="-53145,90612" node3="-53144,90630" node4="-53241,90626" nodeZ="-2849" default_status="close" />
+	<door id="18200002" name="fortress_1820_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53311;91822;-2849" node1="-53226,91813" node2="-53311,91816" node3="-53311,91829" node4="-53226,91828" nodeZ="-2849" default_status="close" />
+	<door id="18200003" name="fortress_1820_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53155;91822;-2849" node1="-53240,91813" node2="-53145,91813" node3="-53144,91831" node4="-53241,91827" nodeZ="-2849" default_status="close" />
 	<door id="18200004" name="fortress_1820_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-51513;90260;-2851" node1="-51520,90253" node2="-51505,90253" node3="-51505,90348" node4="-51521,90348" nodeZ="-2851" default_status="close" />
 	<door id="18200005" name="fortress_1820_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-51512;90416;-2851" node1="-51520,90327" node2="-51519,90427" node3="-51503,90426" node4="-51503,90327" nodeZ="-2851" default_status="close" />
 	<door id="18200006" name="fortress_1820_006" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-55123;91777;-2819" node1="-55119,91767" node2="-55115,91865" node3="-55131,91864" node4="-55130,91766" nodeZ="-2819" default_status="close" />
@@ -608,13 +608,13 @@
 	<door id="18200008" name="fortress_1820_008" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-51147;91961;-2811" node1="-51220,92018" node2="-51144,91946" node3="-51131,91961" node4="-51208,92034" nodeZ="-2811" default_status="close" />
 	<door id="18200009" name="fortress_1820_009" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-51257;92071;-2811" node1="-51272,92074" node2="-51258,92088" node3="-51186,92013" node4="-51198,91997" nodeZ="-2811" default_status="close" />
 	<door id="18200010" name="fortress_1820_010" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-52256;92985;-2869" node1="-52375,92935" node2="-52149,92942" node3="-52149,93038" node4="-52376,93040" nodeZ="-2869" default_status="close" />
-	<door id="18200011" name="fortress_1820_011" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53311;91822;-2849" node1="-53226,91813" node2="-53311,91816" node3="-53311,91829" node4="-53226,91828" nodeZ="-2849" default_status="close" />
-	<door id="18200012" name="fortress_1820_012" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53155;91822;-2849" node1="-53240,91813" node2="-53145,91813" node3="-53144,91831" node4="-53241,91827" nodeZ="-2849" default_status="close" />
+	<door id="18200011" name="fortress_1820_011" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53311;90621;-2849" node1="-53226,90612" node2="-53311,90615" node3="-53311,90628" node4="-53226,90627" nodeZ="-2849" default_status="close" />
+	<door id="18200012" name="fortress_1820_012" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53155;90621;-2849" node1="-53240,90612" node2="-53145,90612" node3="-53144,90630" node4="-53241,90626" nodeZ="-2849" default_status="close" />
 	<door id="18220001" name="fortress_1822_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-50796;155912;-2102" node1="-50799,155822" node2="-50749,155982" node3="-50793,155996" node4="-50843,155835" nodeZ="-2102" default_status="close" />
-	<door id="18220002" name="fortress_1822_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-52208;156244;-2081" node1="-52176,156322" node2="-52202,156239" node3="-52219,156244" node4="-52194,156327" nodeZ="-2081" default_status="close" />
-	<door id="18220003" name="fortress_1822_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-52163;156393;-2081" node1="-52178,156311" node2="-52149,156391" node3="-52174,156400" node4="-52196,156316" nodeZ="-2081" default_status="close" />
-	<door id="18220004" name="fortress_1822_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53358;156592;-2081" node1="-53328,156670" node2="-53353,156587" node3="-53366,156592" node4="-53342,156673" nodeZ="-2081" default_status="close" />
-	<door id="18220005" name="fortress_1822_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53312;156742;-2081" node1="-53329,156661" node2="-53302,156741" node3="-53317,156746" node4="-53344,156665" nodeZ="-2081" default_status="close" />
+	<door id="18220002" name="fortress_1822_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53358;156592;-2081" node1="-53328,156670" node2="-53353,156587" node3="-53366,156592" node4="-53342,156673" nodeZ="-2081" default_status="close" />
+	<door id="18220003" name="fortress_1822_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-53312;156742;-2081" node1="-53329,156661" node2="-53302,156741" node3="-53317,156746" node4="-53344,156665" nodeZ="-2081" default_status="close" />
+	<door id="18220004" name="fortress_1822_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-52208;156244;-2081" node1="-52176,156322" node2="-52202,156239" node3="-52219,156244" node4="-52194,156327" nodeZ="-2081" default_status="close" />
+	<door id="18220005" name="fortress_1822_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-52163;156393;-2081" node1="-52178,156311" node2="-52149,156391" node3="-52174,156400" node4="-52196,156316" nodeZ="-2081" default_status="close" />
 	<door id="18220006" name="fortress_1822_006" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-52816;157873;-2053" node1="-52782,157952" node2="-52810,157868" node3="-52826,157873" node4="-52803,157957" nodeZ="-2053" default_status="close" />
 	<door id="18220007" name="fortress_1822_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-52771;158023;-2053" node1="-52785,157941" node2="-52762,158022" node3="-52778,158027" node4="-52806,157946" nodeZ="-2053" default_status="close" />
 	<door id="18220008" name="fortress_1822_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-54737;157111;-2102" node1="-54729,157015" node2="-54798,157036" node3="-54743,157206" node4="-54675,157185" nodeZ="-2102" default_status="close" />
@@ -685,10 +685,10 @@
 	<door id="19240003" name="fortress_1924_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23550;218784;-3263" node1="-23546,218774" node2="-23542,218872" node3="-23558,218871" node4="-23557,218773" nodeZ="-3263" default_status="close" />
 	<door id="19240004" name="fortress_1924_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23550;218940;-3263" node1="-23557,218852" node2="-23555,218949" node3="-23542,218951" node4="-23542,218853" nodeZ="-3263" default_status="close" />
 	<door id="19240005" name="fortress_1924_005" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-25125;219880;-3291" node1="-25135,219960" node2="-25135,219801" node3="-25115,219801" node4="-25115,219960" nodeZ="-3292" default_status="close" />
-	<door id="19240006" name="fortress_1924_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23306;219723;-3264" node1="-23314,219802" node2="-23314,219723" node3="-23298,219723" node4="-23298,219801" nodeZ="-3264" default_status="close" />
-	<door id="19240007" name="fortress_1924_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23305;219879;-3264" node1="-23313,219801" node2="-23311,219879" node3="-23297,219879" node4="-23297,219800" nodeZ="-3264" default_status="close" />
-	<door id="19240008" name="fortress_1924_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-22105;219723;-3264" node1="-22113,219801" node2="-22114,219723" node3="-22097,219723" node4="-22097,219801" nodeZ="-3264" default_status="close" />
-	<door id="19240009" name="fortress_1924_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-22104;219879;-3264" node1="-22113,219800" node2="-22113,219879" node3="-22096,219879" node4="-22097,219800" nodeZ="-3264" default_status="close" />
+	<door id="19240006" name="fortress_1924_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-22105;219723;-3264" node1="-22113,219801" node2="-22114,219723" node3="-22097,219723" node4="-22097,219801" nodeZ="-3264" default_status="close" />
+	<door id="19240007" name="fortress_1924_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-22104;219879;-3264" node1="-22113,219800" node2="-22113,219879" node3="-22096,219879" node4="-22097,219800" nodeZ="-3264" default_status="close" />
+	<door id="19240008" name="fortress_1924_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23306;219723;-3264" node1="-23314,219802" node2="-23314,219723" node3="-23298,219723" node4="-23298,219801" nodeZ="-3264" default_status="close" />
+	<door id="19240009" name="fortress_1924_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="-23305;219879;-3264" node1="-23313,219801" node2="-23311,219879" node3="-23297,219879" node4="-23297,219800" nodeZ="-3264" default_status="close" />
 	<door id="19240010" name="fortress_1924_010" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-20240;219888;-3288" node1="-20249,219967" node2="-20250,219809" node3="-20231,219809" node4="-20229,219967" nodeZ="-3289" default_status="close" />
 	<door id="19240011" name="fortress_1924_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-23211;221583;-3227" node1="-23220,221661" node2="-23220,221583" node3="-23201,221583" node4="-23202,221661" nodeZ="-3227" default_status="close" />
 	<door id="19240012" name="fortress_1924_012" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="-23210;221738;-3227" node1="-23219,221660" node2="-23219,221738" node3="-23202,221738" node4="-23201,221659" nodeZ="-3227" default_status="close" />
@@ -733,12 +733,12 @@
 	<door id="20160008" name="rune_castle_wall_002" is_wall="true" open_method="0" height="480" baseHpMax="1357680" basePDef="837" baseMDef="674" pos="17256;-46748;-878" node1="17307,-47005" node2="17520,-46817" node3="17170,-46507" node4="16982,-46707" nodeZ="-1120" />
 	<door id="20160009" name="rune_castle_wall_003" is_wall="true" open_method="0" height="768" baseHpMax="1357680" basePDef="837" baseMDef="674" pos="13840;-51703;-764" node1="13672,-52034" node2="14215,-51821" node3="13982,-51354" node4="13526,-51526" nodeZ="-1142" />
 	<door id="20200001" name="fortress_2020_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="12503;93513;-3475" node1="12384,93463" node2="12610,93470" node3="12610,93566" node4="12383,93568" nodeZ="-3475" default_status="close" />
-	<door id="20200002" name="fortress_2020_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11459;94386;-3454" node1="11544,94377" node2="11459,94380" node3="11459,94393" node4="11544,94392" nodeZ="-3454" default_status="close" />
-	<door id="20200003" name="fortress_2020_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11615;94386;-3454" node1="11530,94377" node2="11625,94377" node3="11626,94395" node4="11529,94391" nodeZ="-3454" default_status="close" />
+	<door id="20200002" name="fortress_2020_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11459;95587;-3454" node1="11544,95578" node2="11459,95581" node3="11459,95594" node4="11544,95593" nodeZ="-3454" default_status="close" />
+	<door id="20200003" name="fortress_2020_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11615;95587;-3454" node1="11530,95578" node2="11625,95578" node3="11626,95596" node4="11529,95592" nodeZ="-3454" default_status="close" />
 	<door id="20200004" name="fortress_2020_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="10128;94935;-3426" node1="10132,94925" node2="10136,95023" node3="10120,95022" node4="10121,94924" nodeZ="-3426" default_status="close" />
 	<door id="20200005" name="fortress_2020_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="10128;95093;-3426" node1="10121,95005" node2="10123,95102" node3="10136,95104" node4="10136,95006" nodeZ="-3426" default_status="close" />
-	<door id="20200006" name="fortress_2020_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11459;95587;-3454" node1="11544,95578" node2="11459,95581" node3="11459,95594" node4="11544,95593" nodeZ="-3454" default_status="close" />
-	<door id="20200007" name="fortress_2020_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11615;95587;-3454" node1="11530,95578" node2="11625,95578" node3="11626,95596" node4="11529,95592" nodeZ="-3454" default_status="close" />
+	<door id="20200006" name="fortress_2020_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11459;94386;-3454" node1="11544,94377" node2="11459,94380" node3="11459,94393" node4="11544,94392" nodeZ="-3454" default_status="close" />
+	<door id="20200007" name="fortress_2020_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="11615;94386;-3454" node1="11530,94377" node2="11625,94377" node3="11626,94395" node4="11529,94391" nodeZ="-3454" default_status="close" />
 	<door id="20200008" name="fortress_2020_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="10493;96565;-3475" node1="10374,96515" node2="10600,96522" node3="10600,96618" node4="10373,96620" nodeZ="-3475" default_status="close" />
 	<door id="20210001" name="kuruma002" open_method="8" level="3" close_time="300" height="338" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="17624;112427;-6456" node1="17506,112406" node2="17741,112402" node3="17741,112452" node4="17506,112449" nodeZ="-6625" group="kuruma_parent" />
 	<door id="20210002" name="kuruma001" open_method="8" level="3" close_time="300" height="338" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="17820;112427;-6456" node1="17705,112402" node2="17938,112406" node3="17938,112448" node4="17705,112452" nodeZ="-6627" group="kuruma_parent" />
@@ -763,10 +763,10 @@
 	<door id="20220019" name="fortress_2022_003" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="6380;148168;-2889" node1="6388,148246" node2="6388,148168" node3="6372,148168" node4="6373,148247" nodeZ="-2889" default_status="close" />
 	<door id="20220020" name="fortress_2022_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="6380;148325;-2889" node1="6387,148246" node2="6390,148325" node3="6373,148325" node4="6373,148246" nodeZ="-2889" default_status="close" />
 	<door id="20220021" name="fortress_2022_005" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="4015;148732;-2938" node1="4029,148654" node2="4028,148811" node3="4002,148810" node4="4001,148654" nodeZ="-2938" default_status="close" />
-	<door id="20220022" name="fortress_2022_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="5012;149673;-2917" node1="5018,149752" node2="5019,149673" node3="5005,149673" node4="5005,149752" nodeZ="-2917" default_status="close" />
-	<door id="20220023" name="fortress_2022_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="5011;149830;-2917" node1="5017,149752" node2="5017,149830" node3="5005,149830" node4="5005,149752" nodeZ="-2917" default_status="close" />
-	<door id="20220024" name="fortress_2022_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="6213;149673;-2917" node1="6221,149752" node2="6221,149673" node3="6207,149673" node4="6207,149752" nodeZ="-2917" default_status="close" />
-	<door id="20220025" name="fortress_2022_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="6213;149830;-2917" node1="6220,149751" node2="6221,149830" node3="6206,149830" node4="6207,149752" nodeZ="-2917" default_status="close" />
+	<door id="20220022" name="fortress_2022_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="6213;149673;-2917" node1="6221,149752" node2="6221,149673" node3="6207,149673" node4="6207,149752" nodeZ="-2917" default_status="close" />
+	<door id="20220023" name="fortress_2022_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="6213;149830;-2917" node1="6220,149751" node2="6221,149830" node3="6206,149830" node4="6207,149752" nodeZ="-2917" default_status="close" />
+	<door id="20220024" name="fortress_2022_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="5012;149673;-2917" node1="5018,149752" node2="5019,149673" node3="5005,149673" node4="5005,149752" nodeZ="-2917" default_status="close" />
+	<door id="20220025" name="fortress_2022_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="5011;149830;-2917" node1="5017,149752" node2="5017,149830" node3="5005,149830" node4="5005,149752" nodeZ="-2917" default_status="close" />
 	<door id="20220026" name="fortress_2022_010" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="7439;150734;-2938" node1="7454,150656" node2="7454,150813" node3="7424,150813" node4="7422,150656" nodeZ="-2938" default_status="close" />
 	<door id="20220027" name="fortress_2022_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="5136;151876;-2879" node1="5215,151868" node2="5137,151868" node3="5136,151885" node4="5216,151884" nodeZ="-2879" default_status="close" />
 	<door id="20220028" name="fortress_2022_012" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="5292;151876;-2879" node1="5214,151884" node2="5213,151868" node3="5292,151869" node4="5292,151884" nodeZ="-2879" default_status="close" />
@@ -853,12 +853,12 @@
 	<door id="21210001" name="partisan001" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="43643;108908;-1970" node1="43643,108840" node2="43650,108840" node3="43651,108915" node4="43643,108915" nodeZ="-2015" clanhall_id="21" />
 	<door id="21210002" name="partisan002" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="43643;108783;-1970" node1="43643,108778" node2="43651,108778" node3="43651,108853" node4="43643,108853" nodeZ="-2015" clanhall_id="21" />
 	<door id="21220001" name="fortress_2122_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="58984;138134;-1803" node1="58888,138108" node2="59060,138073" node3="59081,138158" node4="58907,138198" nodeZ="-1803" default_status="close" />
-	<door id="21220002" name="fortress_2122_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60086;138860;-1782" node1="60171,138851" node2="60086,138854" node3="60086,138867" node4="60171,138866" nodeZ="-1782" default_status="close" />
-	<door id="21220003" name="fortress_2122_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60239;138830;-1782" node1="60154,138821" node2="60249,138821" node3="60250,138839" node4="60153,138835" nodeZ="-1782" default_status="close" />
+	<door id="21220002" name="fortress_2122_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60320;140038;-1782" node1="60398,140008" node2="60315,140025" node3="60320,140051" node4="60405,140035" nodeZ="-1782" default_status="close" />
+	<door id="21220003" name="fortress_2122_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60473;140008;-1782" node1="60390,140010" node2="60472,139997" node3="60478,140020" node4="60395,140037" nodeZ="-1782" default_status="close" />
 	<door id="21220004" name="fortress_2122_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="61654;138595;-1754" node1="61732,138566" node2="61649,138582" node3="61654,138607" node4="61737,138591" nodeZ="-1754" default_status="close" />
 	<door id="21220005" name="fortress_2122_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="61808;138565;-1754" node1="61724,138568" node2="61808,138550" node3="61814,138578" node4="61730,138593" nodeZ="-1754" default_status="close" />
-	<door id="21220006" name="fortress_2122_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60320;140038;-1782" node1="60398,140008" node2="60315,140025" node3="60320,140051" node4="60405,140035" nodeZ="-1782" default_status="close" />
-	<door id="21220007" name="fortress_2122_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60473;140008;-1782" node1="60390,140010" node2="60472,139997" node3="60478,140020" node4="60395,140037" nodeZ="-1782" default_status="close" />
+	<door id="21220006" name="fortress_2122_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60086;138860;-1782" node1="60171,138851" node2="60086,138854" node3="60086,138867" node4="60171,138866" nodeZ="-1782" default_status="close" />
+	<door id="21220007" name="fortress_2122_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="60239;138830;-1782" node1="60154,138821" node2="60249,138821" node3="60250,138839" node4="60153,138835" nodeZ="-1782" default_status="close" />
 	<door id="21220008" name="fortress_2122_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="61543;140748;-1803" node1="61448,140715" node2="61617,140680" node3="61643,140779" node4="61469,140813" nodeZ="-1803" default_status="close" />
 	<door id="21240001" name="Devil_001" open_method="2" close_time="120" open_time="120" random_time="30" height="245" baseHpMax="150000" hp_showable="false" basePDef="100000" baseMDef="10000" pos="42000;208377;-3666" node1="41864,208294" node2="41868,208287" node3="42006,208377" node4="42002,208383" nodeZ="-3785" default_status="close" />
 	<door id="21240002" name="Devil_002" open_method="2" close_time="120" open_time="120" random_time="30" height="245" baseHpMax="150000" hp_showable="false" basePDef="100000" baseMDef="10000" pos="43745;212594;-3623" node1="43741,212433" node2="43749,212433" node3="43749,212600" node4="43741,212600" nodeZ="-3742" default_status="close" />
@@ -896,22 +896,22 @@
 	<door id="22130023" name="schutt_castle_agit_004_002" open_method="1" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="88621;-143156;-1352" node1="88632,-143203" node2="88626,-143153" node3="88615,-143154" node4="88621,-143204" nodeZ="-1362" clanhall_id="61" />
 	<door id="22130024" name="schutt_castle_agit_004_001" open_method="1" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="88632;-143245;-1352" node1="88620,-143198" node2="88627,-143248" node3="88637,-143247" node4="88632,-143197" nodeZ="-1366" clanhall_id="61" />
 	<door id="22150001" name="fortress_2215_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="72490;-96493;-1478" node1="72376,-96499" node2="72567,-96583" node3="72608,-96485" node4="72415,-96407" nodeZ="-1478" default_status="close" />
-	<door id="22150002" name="fortress_2215_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="71865;-95291;-1456" node1="71940,-95330" node2="71861,-95298" node3="71866,-95283" node4="71946,-95317" nodeZ="-1456" default_status="close" />
-	<door id="22150003" name="fortress_2215_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72010;-95351;-1456" node1="71929,-95327" node2="72011,-95360" node3="72017,-95345" node4="71934,-95313" nodeZ="-1456" default_status="close" />
+	<door id="22150002" name="fortress_2215_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72325;-94181;-1456" node1="72399,-94221" node2="72320,-94187" node3="72325,-94174" node4="72405,-94206" nodeZ="-1456" default_status="close" />
+	<door id="22150003" name="fortress_2215_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72469;-94241;-1456" node1="72388,-94216" node2="72469,-94249" node3="72475,-94236" node4="72393,-94202" nodeZ="-1456" default_status="close" />
 	<door id="22150004" name="fortress_2215_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="70847;-94272;-1428" node1="70854,-94279" node2="70888,-94199" node3="70870,-94190" node4="70838,-94272" nodeZ="-1428" default_status="close" />
 	<door id="22150005" name="fortress_2215_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="70907;-94127;-1428" node1="70866,-94200" node2="70900,-94120" node3="70917,-94128" node4="70885,-94208" nodeZ="-1428" default_status="close" />
-	<door id="22150006" name="fortress_2215_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72325;-94181;-1456" node1="72399,-94221" node2="72320,-94187" node3="72325,-94174" node4="72405,-94206" nodeZ="-1456" default_status="close" />
-	<door id="22150007" name="fortress_2215_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72469;-94241;-1456" node1="72388,-94216" node2="72469,-94249" node3="72475,-94236" node4="72393,-94202" nodeZ="-1456" default_status="close" />
+	<door id="22150006" name="fortress_2215_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="71865;-95291;-1456" node1="71940,-95330" node2="71861,-95298" node3="71866,-95283" node4="71946,-95317" nodeZ="-1456" default_status="close" />
+	<door id="22150007" name="fortress_2215_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72010;-95351;-1456" node1="71929,-95327" node2="72011,-95360" node3="72017,-95345" node4="71934,-95313" nodeZ="-1456" default_status="close" />
 	<door id="22150008" name="fortress_2215_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71794;-92905;-1477" node1="71680,-92911" node2="71871,-92995" node3="71912,-92897" node4="71719,-92819" nodeZ="-1477" default_status="close" />
 	<door id="22160001" name="fortress_2216_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="68833;-63635;-2834" node1="68719,-63641" node2="68910,-63725" node3="68951,-63627" node4="68758,-63549" nodeZ="-2834" default_status="close" />
 	<door id="22160002" name="fortress_2216_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="68643;-62606;-2814" node1="68648,-62614" node2="68683,-62531" node3="68667,-62525" node4="68634,-62606" nodeZ="-2814" default_status="close" />
 	<door id="22160003" name="fortress_2216_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="68703;-62461;-2814" node1="68663,-62535" node2="68696,-62454" node3="68712,-62461" node4="68679,-62542" nodeZ="-2814" default_status="close" />
-	<door id="22160004" name="fortress_2216_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69531;-61953;-2814" node1="69607,-61994" node2="69529,-61960" node3="69534,-61945" node4="69613,-61978" nodeZ="-2814" default_status="close" />
-	<door id="22160005" name="fortress_2216_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69676;-62013;-2814" node1="69595,-61990" node2="69674,-62024" node3="69680,-62004" node4="69602,-61973" nodeZ="-2814" default_status="close" />
+	<door id="22160004" name="fortress_2216_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69991;-60843;-2814" node1="70066,-60882" node2="69986,-60850" node3="69993,-60835" node4="70071,-60867" nodeZ="-2814" default_status="close" />
+	<door id="22160005" name="fortress_2216_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="70135;-60903;-2814" node1="70054,-60878" node2="70132,-60911" node3="70139,-60894" node4="70060,-60864" nodeZ="-2814" default_status="close" />
 	<door id="22160006" name="fortress_2216_006" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="67849;-61153;-2776" node1="67924,-61192" node2="67847,-61161" node3="67852,-61146" node4="67929,-61179" nodeZ="-2776" default_status="close" />
 	<door id="22160007" name="fortress_2216_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="67994;-61213;-2776" node1="67913,-61188" node2="67992,-61220" node3="67996,-61207" node4="67919,-61175" nodeZ="-2776" default_status="close" />
-	<door id="22160008" name="fortress_2216_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69991;-60843;-2814" node1="70066,-60882" node2="69986,-60850" node3="69993,-60835" node4="70071,-60867" nodeZ="-2814" default_status="close" />
-	<door id="22160009" name="fortress_2216_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="70135;-60903;-2814" node1="70054,-60878" node2="70132,-60911" node3="70139,-60894" node4="70060,-60864" nodeZ="-2814" default_status="close" />
+	<door id="22160008" name="fortress_2216_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69531;-61953;-2814" node1="69607,-61994" node2="69529,-61960" node3="69534,-61945" node4="69613,-61978" nodeZ="-2814" default_status="close" />
+	<door id="22160009" name="fortress_2216_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="69676;-62013;-2814" node1="69595,-61990" node2="69674,-62024" node3="69680,-62004" node4="69602,-61973" nodeZ="-2814" default_status="close" />
 	<door id="22160010" name="fortress_2216_010" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71439;-61682;-2786" node1="71515,-61722" node2="71436,-61689" node3="71441,-61676" node4="71520,-61708" nodeZ="-2786" default_status="close" />
 	<door id="22160011" name="fortress_2216_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71583;-61742;-2786" node1="71502,-61717" node2="71581,-61749" node3="71586,-61733" node4="71509,-61704" nodeZ="-2786" default_status="close" />
 	<door id="22160012" name="fortress_2216_012" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="70697;-59119;-2834" node1="70583,-59125" node2="70774,-59209" node3="70815,-59111" node4="70622,-59033" nodeZ="-2834" default_status="close" />
@@ -920,10 +920,10 @@
 	<door id="22170003" name="Bandit_003" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="80818;-15357;-1762" node1="80815,-15445" node2="80821,-15445" node3="80821,-15349" node4="80816,-15349" nodeZ="-1829" clanhall_id="35" />
 	<door id="22170004" name="Bandit_004" open_method="0" height="450" baseHpMax="316500" hp_showable="false" basePDef="644" baseMDef="518" pos="80818;-15518;-1762" node1="80815,-15525" node2="80820,-15525" node3="80820,-15431" node4="80815,-15431" nodeZ="-1829" clanhall_id="35" />
 	<door id="22180001" name="fortress_2218_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="74198;2788;-3093" node1="74150,2727" node2="74271,2826" node3="74253,2849" node4="74131,2749" nodeZ="-3093" default_status="close" />
-	<door id="22180002" name="fortress_2218_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73180;3761;-3073" node1="73245,3805" node2="73184,3757" node3="73177,3766" node4="73236,3816" nodeZ="-3073" default_status="close" />
-	<door id="22180003" name="fortress_2218_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73301;3860;-3073" node1="73245,3805" node2="73306,3854" node3="73296,3865" node4="73236,3816" nodeZ="-3073" default_status="close" />
-	<door id="22180004" name="fortress_2218_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72419;4690;-3073" node1="72485,4734" node2="72423,4685" node3="72415,4696" node4="72475,4745" nodeZ="-3073" default_status="close" />
-	<door id="22180005" name="fortress_2218_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72539;4789;-3073" node1="72484,4734" node2="72544,4783" node3="72534,4795" node4="72474,4745" nodeZ="-3073" default_status="close" />
+	<door id="22180002" name="fortress_2218_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72419;4690;-3073" node1="72485,4734" node2="72423,4685" node3="72415,4696" node4="72475,4745" nodeZ="-3073" default_status="close" />
+	<door id="22180003" name="fortress_2218_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72539;4789;-3073" node1="72484,4734" node2="72544,4783" node3="72534,4795" node4="72474,4745" nodeZ="-3073" default_status="close" />
+	<door id="22180004" name="fortress_2218_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73180;3761;-3073" node1="73245,3805" node2="73184,3757" node3="73177,3766" node4="73236,3816" nodeZ="-3073" default_status="close" />
+	<door id="22180005" name="fortress_2218_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73301;3860;-3073" node1="73245,3805" node2="73306,3854" node3="73296,3865" node4="73236,3816" nodeZ="-3073" default_status="close" />
 	<door id="22180006" name="fortress_2218_006" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="74141;4890;-3044" node1="74207,4933" node2="74146,4885" node3="74137,4895" node4="74197,4946" nodeZ="-3044" default_status="close" />
 	<door id="22180007" name="fortress_2218_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="74262;4989;-3044" node1="74207,4933" node2="74267,4981" node3="74257,4996" node4="74197,4946" nodeZ="-3044" default_status="close" />
 	<door id="22180008" name="fortress_2218_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71595;5960;-3093" node1="71547,5899" node2="71668,5998" node3="71650,6021" node4="71528,5921" nodeZ="-3093" default_status="close" />
@@ -939,10 +939,10 @@
 	<door id="22200001" name="fortress_2220_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="78090;89321;-2934" node1="78027,89377" node2="78104,89241" node3="78152,89266" node4="78078,89405" nodeZ="-2934" default_status="close" />
 	<door id="22200002" name="fortress_2220_002" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="80522;89326;-2877" node1="80599,89352" node2="80528,89314" node3="80517,89337" node4="80587,89372" nodeZ="-2877" default_status="close" />
 	<door id="22200003" name="fortress_2220_003" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="80660;89400;-2877" node1="80584,89372" node2="80655,89413" node3="80668,89387" node4="80595,89351" nodeZ="-2877" default_status="close" />
-	<door id="22200004" name="fortress_2220_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="78672;90834;-2912" node1="78703,90762" node2="78666,90832" node3="78677,90837" node4="78714,90768" nodeZ="-2912" default_status="close" />
-	<door id="22200005" name="fortress_2220_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="78745;90696;-2912" node1="78703,90763" node2="78738,90693" node3="78752,90700" node4="78713,90768" nodeZ="-2912" default_status="close" />
-	<door id="22200006" name="fortress_2220_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="79731;91400;-2912" node1="79759,91326" node2="79723,91397" node3="79739,91404" node4="79777,91334" nodeZ="-2912" default_status="close" />
-	<door id="22200007" name="fortress_2220_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="79804;91263;-2912" node1="79758,91328" node2="79794,91259" node3="79814,91267" node4="79777,91336" nodeZ="-2912" default_status="close" />
+	<door id="22200004" name="fortress_2220_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="79731;91400;-2912" node1="79759,91326" node2="79723,91397" node3="79739,91404" node4="79777,91334" nodeZ="-2912" default_status="close" />
+	<door id="22200005" name="fortress_2220_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="79804;91263;-2912" node1="79758,91328" node2="79794,91259" node3="79814,91267" node4="79777,91336" nodeZ="-2912" default_status="close" />
+	<door id="22200006" name="fortress_2220_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="78672;90834;-2912" node1="78703,90762" node2="78666,90832" node3="78677,90837" node4="78714,90768" nodeZ="-2912" default_status="close" />
+	<door id="22200007" name="fortress_2220_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="78745;90696;-2912" node1="78703,90763" node2="78738,90693" node3="78752,90700" node4="78713,90768" nodeZ="-2912" default_status="close" />
 	<door id="22200008" name="fortress_2220_008" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="77814;92082;-2887" node1="77839,92005" node2="77801,92078" node3="77826,92089" node4="77864,92018" nodeZ="-2887" default_status="close" />
 	<door id="22200009" name="fortress_2220_009" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="77888;91945;-2887" node1="77837,92009" node2="77875,91939" node3="77899,91950" node4="77863,92021" nodeZ="-2887" default_status="close" />
 	<door id="22200010" name="fortress_2220_010" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="79034;92956;-2916" node1="79040,92946" node2="79109,92984" node3="79098,93005" node4="79029,92967" nodeZ="-2916" default_status="close" />
@@ -961,10 +961,10 @@
 	<door id="22230001" name="fortress_2223_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="73057;184177;-2630" node1="73011,184084" node2="73166,184188" node3="73109,184271" node4="72951,184169" nodeZ="-2630" default_status="close" />
 	<door id="22230002" name="fortress_2223_002" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71908;185170;-2581" node1="71945,185091" node2="71896,185169" node3="71916,185181" node4="71964,185106" nodeZ="-2581" default_status="close" />
 	<door id="22230003" name="fortress_2223_003" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="71994;185040;-2581" node1="72005,185044" node2="71957,185114" node3="71938,185099" node4="71988,185032" nodeZ="-2581" default_status="close" />
-	<door id="22230004" name="fortress_2223_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73382;185442;-2609" node1="73460,185476" node2="73389,185427" node3="73371,185452" node4="73442,185501" nodeZ="-2609" default_status="close" />
-	<door id="22230005" name="fortress_2223_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73511;185529;-2609" node1="73453,185472" node2="73521,185519" node3="73505,185542" node4="73433,185497" nodeZ="-2609" default_status="close" />
-	<door id="22230006" name="fortress_2223_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72714;186441;-2609" node1="72788,186476" node2="72721,186432" node3="72708,186449" node4="72776,186496" nodeZ="-2609" default_status="close" />
-	<door id="22230007" name="fortress_2223_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72844;186528;-2609" node1="72784,186474" node2="72851,186521" node3="72839,186537" node4="72771,186493" nodeZ="-2609" default_status="close" />
+	<door id="22230004" name="fortress_2223_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72714;186441;-2609" node1="72788,186476" node2="72721,186432" node3="72708,186449" node4="72776,186496" nodeZ="-2609" default_status="close" />
+	<door id="22230005" name="fortress_2223_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="72844;186528;-2609" node1="72784,186474" node2="72851,186521" node3="72839,186537" node4="72771,186493" nodeZ="-2609" default_status="close" />
+	<door id="22230006" name="fortress_2223_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73382;185442;-2609" node1="73460,185476" node2="73389,185427" node3="73371,185452" node4="73442,185501" nodeZ="-2609" default_status="close" />
+	<door id="22230007" name="fortress_2223_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="73511;185529;-2609" node1="73453,185472" node2="73521,185519" node3="73505,185542" node4="73433,185497" nodeZ="-2609" default_status="close" />
 	<door id="22230008" name="fortress_2223_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="73037;187834;-2630" node1="72997,187750" node2="73130,187839" node3="73080,187923" node4="72945,187829" nodeZ="-2630" default_status="close" />
 	<door id="22250001" name="Eva_001" open_method="10" level="2" close_time="20" open_time="300" random_time="120" height="512" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="86225;247062;-8584" node1="86087,246961" node2="86364,247159" node3="86362,247162" node4="86085,246964" nodeZ="-8845" default_status="close" />
 	<door id="22250002" name="Eva_002" open_method="10" level="2" close_time="20" open_time="300" random_time="120" height="512" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="88490;253870;-8584" node1="88546,253708" node2="88440,254031" node3="88436,254030" node4="88539,253707" nodeZ="-8845" default_status="close" />
@@ -996,10 +996,10 @@
 	<door id="22250028" name="Eva_028" open_method="8" level="2" close_time="120" height="512" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="82012;248506;-10734" node1="81713,248521" node2="82312,248520" node3="82312,248490" node4="81713,248491" nodeZ="-10888" />
 	<door id="22250029" name="Eva_029" open_method="8" level="2" close_time="120" height="512" baseHpMax="187500" hp_showable="false" basePDef="476" baseMDef="383" pos="82560;254715;-10880" node1="82260,254730" node2="82860,254730" node3="82860,254700" node4="82260,254700" nodeZ="-10880" default_status="close" targetable="false" />
 	<door id="23130001" name="fortress_2313_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="107495;-140524;-3009" node1="107513,-140616" node2="107565,-140465" node3="107477,-140436" node4="107428,-140591" nodeZ="-3009" default_status="close" />
-	<door id="23130002" name="fortress_2313_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="108887;-141124;-2984" node1="108918,-141051" node2="108894,-141126" node3="108879,-141122" node4="108901,-141046" nodeZ="-2984" default_status="close" />
-	<door id="23130003" name="fortress_2313_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="108932;-140974;-2984" node1="108917,-141054" node2="108941,-140977" node3="108922,-140971" node4="108900,-141049" nodeZ="-2984" default_status="close" />
-	<door id="23130004" name="fortress_2313_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="110037;-141473;-2984" node1="110069,-141399" node2="110045,-141477" node3="110028,-141471" node4="110052,-141394" nodeZ="-2984" default_status="close" />
-	<door id="23130005" name="fortress_2313_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="110082;-141323;-2984" node1="110069,-141402" node2="110093,-141326" node3="110073,-141319" node4="110051,-141398" nodeZ="-2984" default_status="close" />
+	<door id="23130002" name="fortress_2313_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="110037;-141473;-2984" node1="110069,-141399" node2="110045,-141477" node3="110028,-141471" node4="110052,-141394" nodeZ="-2984" default_status="close" />
+	<door id="23130003" name="fortress_2313_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="110082;-141323;-2984" node1="110069,-141402" node2="110093,-141326" node3="110073,-141319" node4="110051,-141398" nodeZ="-2984" default_status="close" />
+	<door id="23130004" name="fortress_2313_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="108887;-141124;-2984" node1="108918,-141051" node2="108894,-141126" node3="108879,-141122" node4="108901,-141046" nodeZ="-2984" default_status="close" />
+	<door id="23130005" name="fortress_2313_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="108932;-140974;-2984" node1="108917,-141054" node2="108941,-140977" node3="108922,-140971" node4="108900,-141049" nodeZ="-2984" default_status="close" />
 	<door id="23130006" name="fortress_2313_006" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="111423;-141714;-3009" node1="111441,-141806" node2="111493,-141655" node3="111405,-141626" node4="111356,-141781" nodeZ="-3009" default_status="close" />
 	<door id="23130007" name="fortress_2313_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="110210;-140000;-2959" node1="110242,-139926" node2="110218,-140004" node3="110201,-139998" node4="110225,-139921" nodeZ="-2959" default_status="close" />
 	<door id="23130008" name="fortress_2313_008" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="110255;-139850;-2959" node1="110242,-139929" node2="110266,-139853" node3="110246,-139846" node4="110224,-139925" nodeZ="-2959" default_status="close" />
@@ -1013,20 +1013,20 @@
 	<door id="23160001" name="fortress_2316_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="99133;-56362;-693" node1="99089,-56267" node2="99088,-56467" node3="99172,-56468" node4="99179,-56268" nodeZ="-693" default_status="close" />
 	<door id="23160002" name="fortress_2316_002" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="100608;-56727;-645" node1="100697,-56736" node2="100608,-56736" node3="100608,-56717" node4="100697,-56718" nodeZ="-645" default_status="close" />
 	<door id="23160003" name="fortress_2316_003" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="100764;-56727;-645" node1="100763,-56719" node2="100677,-56718" node3="100678,-56736" node4="100764,-56736" nodeZ="-645" default_status="close" />
-	<door id="23160004" name="fortress_2316_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="100116;-55396;-673" node1="100127,-55308" node2="100123,-55402" node3="100109,-55402" node4="100108,-55308" nodeZ="-673" default_status="close" />
-	<door id="23160005" name="fortress_2316_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="100116;-55240;-673" node1="100127,-55328" node2="100126,-55234" node3="100107,-55234" node4="100108,-55328" nodeZ="-673" default_status="close" />
-	<door id="23160006" name="fortress_2316_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="101317;-55397;-673" node1="101327,-55308" node2="101323,-55399" node3="101312,-55399" node4="101307,-55308" nodeZ="-673" default_status="close" />
-	<door id="23160007" name="fortress_2316_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="101317;-55241;-673" node1="101328,-55328" node2="101328,-55236" node3="101306,-55236" node4="101307,-55328" nodeZ="-673" default_status="close" />
+	<door id="23160004" name="fortress_2316_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="101317;-55397;-673" node1="101327,-55308" node2="101323,-55399" node3="101312,-55399" node4="101307,-55308" nodeZ="-673" default_status="close" />
+	<door id="23160005" name="fortress_2316_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="101317;-55241;-673" node1="101328,-55328" node2="101328,-55236" node3="101306,-55236" node4="101307,-55328" nodeZ="-673" default_status="close" />
+	<door id="23160006" name="fortress_2316_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="100116;-55396;-673" node1="100127,-55308" node2="100123,-55402" node3="100109,-55402" node4="100108,-55308" nodeZ="-673" default_status="close" />
+	<door id="23160007" name="fortress_2316_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="100116;-55240;-673" node1="100127,-55328" node2="100126,-55234" node3="100107,-55234" node4="100108,-55328" nodeZ="-673" default_status="close" />
 	<door id="23160008" name="fortress_2316_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="102190;-54352;-695" node1="102146,-54257" node2="102145,-54457" node3="102229,-54458" node4="102236,-54258" nodeZ="-695" default_status="close" />
 	<door id="23170001" name="fortress_2317_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="112349;-16973;-1045" node1="112233,-17023" node2="112460,-17016" node3="112460,-16920" node4="112233,-16918" nodeZ="-1045" default_status="close" />
 	<door id="23170002" name="fortress_2317_002" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="109793;-15889;-995" node1="109884,-15900" node2="109788,-15900" node3="109786,-15878" node4="109884,-15876" nodeZ="-995" default_status="close" />
 	<door id="23170003" name="fortress_2317_003" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="109949;-15889;-995" node1="109852,-15900" node2="109958,-15900" node3="109958,-15875" node4="109852,-15876" nodeZ="-995" default_status="close" />
-	<door id="23170004" name="fortress_2317_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111290;-15750;-1023" node1="111375,-15759" node2="111290,-15756" node3="111290,-15743" node4="111375,-15744" nodeZ="-1023" default_status="close" />
-	<door id="23170005" name="fortress_2317_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111446;-15750;-1023" node1="111361,-15759" node2="111456,-15759" node3="111457,-15741" node4="111360,-15745" nodeZ="-1023" default_status="close" />
+	<door id="23170004" name="fortress_2317_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111290;-14549;-1023" node1="111375,-14558" node2="111290,-14555" node3="111290,-14542" node4="111375,-14543" nodeZ="-1023" default_status="close" />
+	<door id="23170005" name="fortress_2317_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111446;-14549;-1023" node1="111361,-14558" node2="111456,-14558" node3="111457,-14540" node4="111360,-14544" nodeZ="-1023" default_status="close" />
 	<door id="23170006" name="fortress_2317_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="109582;-14431;-1024" node1="109586,-14441" node2="109590,-14343" node3="109574,-14344" node4="109575,-14442" nodeZ="-1024" default_status="close" />
 	<door id="23170007" name="fortress_2317_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="109582;-14275;-1024" node1="109575,-14363" node2="109577,-14266" node3="109590,-14264" node4="109590,-14362" nodeZ="-1024" default_status="close" />
-	<door id="23170008" name="fortress_2317_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111290;-14549;-1023" node1="111375,-14558" node2="111290,-14555" node3="111290,-14542" node4="111375,-14543" nodeZ="-1023" default_status="close" />
-	<door id="23170009" name="fortress_2317_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111446;-14549;-1023" node1="111361,-14558" node2="111456,-14558" node3="111457,-14540" node4="111360,-14544" nodeZ="-1023" default_status="close" />
+	<door id="23170008" name="fortress_2317_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111290;-15750;-1023" node1="111375,-15759" node2="111290,-15756" node3="111290,-15743" node4="111375,-15744" nodeZ="-1023" default_status="close" />
+	<door id="23170009" name="fortress_2317_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="111446;-15750;-1023" node1="111361,-15759" node2="111456,-15759" node3="111457,-15741" node4="111360,-15745" nodeZ="-1023" default_status="close" />
 	<door id="23170010" name="fortress_2317_010" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="113491;-14829;-987" node1="113484,-14841" node2="113483,-14736" node3="113499,-14734" node4="113499,-14841" nodeZ="-987" default_status="close" />
 	<door id="23170011" name="fortress_2317_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="113492;-14673;-987" node1="113484,-14760" node2="113485,-14659" node3="113501,-14659" node4="113502,-14760" nodeZ="-987" default_status="close" />
 	<door id="23170012" name="fortress_2317_012" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="110348;-13548;-1047" node1="110232,-13598" node2="110459,-13591" node3="110459,-13495" node4="110232,-13493" nodeZ="-1047" default_status="close" />
@@ -1037,14 +1037,14 @@
 	<door id="23180005" name="hubris_11F_002" open_method="2" close_time="120" open_time="120" random_time="120" height="355" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="113263;15764;7145" node1="113219,15703" node2="113325,15808" node3="113307,15826" node4="113201,15720" nodeZ="6968" default_status="close" master_open_event="act_open" master_close_event="act_close" />
 	<door id="23180006" name="hubris_11F_001" open_method="2" close_time="120" open_time="120" random_time="120" height="355" baseHpMax="150000" hp_showable="false" basePDef="476" baseMDef="383" pos="113367;15868;7145" node1="113323,15806" node2="113429,15912" node3="113411,15930" node4="113305,15824" nodeZ="6968" default_status="close" child_id_event="23180005" />
 	<door id="23200001" name="fortress_2320_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="124213;93493;-2191" node1="124094,93443" node2="124320,93450" node3="124320,93546" node4="124093,93548" nodeZ="-2191" default_status="close" />
-	<door id="23200002" name="fortress_2320_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125168;94533;-2168" node1="125253,94524" node2="125168,94527" node3="125168,94540" node4="125253,94539" nodeZ="-2168" default_status="close" />
-	<door id="23200003" name="fortress_2320_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125324;94533;-2168" node1="125239,94524" node2="125334,94524" node3="125335,94542" node4="125238,94538" nodeZ="-2168" default_status="close" />
+	<door id="23200002" name="fortress_2320_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125168;95734;-2168" node1="125253,95725" node2="125168,95728" node3="125168,95741" node4="125253,95740" nodeZ="-2168" default_status="close" />
+	<door id="23200003" name="fortress_2320_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125324;95734;-2168" node1="125239,95725" node2="125334,95725" node3="125335,95743" node4="125238,95739" nodeZ="-2168" default_status="close" />
 	<door id="23200004" name="fortress_2320_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126966;94172;-2170" node1="126959,94165" node2="126958,94260" node3="126974,94260" node4="126974,94165" nodeZ="-2170" default_status="close" />
 	<door id="23200005" name="fortress_2320_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126966;94328;-2170" node1="126958,94239" node2="126959,94339" node3="126975,94338" node4="126975,94239" nodeZ="-2170" default_status="close" />
 	<door id="23200006" name="fortress_2320_006" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="123356;95689;-2138" node1="123360,95679" node2="123364,95777" node3="123348,95776" node4="123349,95678" nodeZ="-2138" default_status="close" />
 	<door id="23200007" name="fortress_2320_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="123356;95845;-2138" node1="123349,95757" node2="123351,95854" node3="123364,95856" node4="123364,95758" nodeZ="-2138" default_status="close" />
-	<door id="23200008" name="fortress_2320_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125168;95734;-2168" node1="125253,95725" node2="125168,95728" node3="125168,95741" node4="125253,95740" nodeZ="-2168" default_status="close" />
-	<door id="23200009" name="fortress_2320_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125324;95734;-2168" node1="125239,95725" node2="125334,95725" node3="125335,95743" node4="125238,95739" nodeZ="-2168" default_status="close" />
+	<door id="23200008" name="fortress_2320_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125168;94533;-2168" node1="125253,94524" node2="125168,94527" node3="125168,94540" node4="125253,94539" nodeZ="-2168" default_status="close" />
+	<door id="23200009" name="fortress_2320_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="125324;94533;-2168" node1="125239,94524" node2="125334,94524" node3="125335,94542" node4="125238,94538" nodeZ="-2168" default_status="close" />
 	<door id="23200010" name="fortress_2320_010" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="127221;95983;-2130" node1="127292,95925" node2="127280,95909" node3="127206,95986" node4="127220,96000" nodeZ="-2130" default_status="close" />
 	<door id="23200011" name="fortress_2320_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="127331;95873;-2130" node1="127258,95930" node2="127334,95858" node3="127347,95873" node4="127270,95946" nodeZ="-2130" default_status="close" />
 	<door id="23200012" name="fortress_2320_012" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="126193;96897;-2190" node1="126074,96847" node2="126300,96854" node3="126300,96950" node4="126073,96952" nodeZ="-2190" default_status="close" />
@@ -1053,12 +1053,12 @@
 	<door id="23210003" name="fortress_2321_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126760;121883;-2613" node1="126752,121794" node2="126753,121894" node3="126769,121893" node4="126769,121794" nodeZ="-2613" default_status="close" />
 	<door id="23210004" name="fortress_2321_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="124224;122888;-2583" node1="124309,122879" node2="124224,122882" node3="124224,122895" node4="124309,122894" nodeZ="-2583" default_status="close" />
 	<door id="23210005" name="fortress_2321_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="124381;122888;-2583" node1="124296,122879" node2="124391,122879" node3="124392,122897" node4="124295,122893" nodeZ="-2583" default_status="close" />
-	<door id="23210006" name="fortress_2321_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126001;122743;-2613" node1="126086,122734" node2="126001,122737" node3="126001,122750" node4="126086,122749" nodeZ="-2613" default_status="close" />
-	<door id="23210007" name="fortress_2321_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126157;122743;-2613" node1="126072,122734" node2="126167,122734" node3="126168,122752" node4="126071,122748" nodeZ="-2613" default_status="close" />
+	<door id="23210006" name="fortress_2321_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126001;123944;-2613" node1="126086,123935" node2="126001,123938" node3="126001,123951" node4="126086,123950" nodeZ="-2613" default_status="close" />
+	<door id="23210007" name="fortress_2321_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126157;123944;-2613" node1="126072,123935" node2="126167,123935" node3="126168,123953" node4="126071,123949" nodeZ="-2613" default_status="close" />
 	<door id="23210008" name="fortress_2321_008" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="127569;123334;-2571" node1="127577,123422" node2="127561,123422" node3="127562,123327" node4="127577,123327" nodeZ="-2571" default_status="close" />
 	<door id="23210009" name="fortress_2321_009" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="127569;123491;-2571" node1="127561,123402" node2="127562,123502" node3="127578,123501" node4="127578,123402" nodeZ="-2571" default_status="close" />
-	<door id="23210010" name="fortress_2321_010" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126001;123944;-2613" node1="126086,123935" node2="126001,123938" node3="126001,123951" node4="126086,123950" nodeZ="-2613" default_status="close" />
-	<door id="23210011" name="fortress_2321_011" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126157;123944;-2613" node1="126072,123935" node2="126167,123935" node3="126168,123953" node4="126071,123949" nodeZ="-2613" default_status="close" />
+	<door id="23210010" name="fortress_2321_010" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126001;122743;-2613" node1="126086,122734" node2="126001,122737" node3="126001,122750" node4="126086,122749" nodeZ="-2613" default_status="close" />
+	<door id="23210011" name="fortress_2321_011" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="126157;122743;-2613" node1="126072,122734" node2="126167,122734" node3="126168,122752" node4="126071,122748" nodeZ="-2613" default_status="close" />
 	<door id="23210012" name="fortress_2321_012" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="126066;125563;-2634" node1="125947,125513" node2="126173,125520" node3="126173,125616" node4="125946,125618" nodeZ="-2634" default_status="close" />
 	<door id="23220001" name="giran_castle_outter_001" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="112857;144729;-2540" node1="112851,144720" node2="112850,144867" node3="112863,144867" node4="112863,144720" nodeZ="-2864" />
 	<door id="23220002" name="giran_castle_outter_002" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="112857;144990;-2540" node1="112851,144997" node2="112851,144852" node3="112863,144852" node4="112863,144997" nodeZ="-2864" />
@@ -1070,12 +1070,12 @@
 	<door id="23220008" name="giran_castle_station" open_method="0" height="250" baseHpMax="316500" basePDef="644" baseMDef="518" pos="117720;144242;-1877" node1="117715,144236" node2="117865,144236" node3="117865,144248" node4="117715,144248" nodeZ="-2129" />
 	<door id="23220009" name="giran_castle_small_002" open_method="0" height="128" baseHpMax="316500" basePDef="644" baseMDef="518" pos="118811;145270;-2356" node1="118916,145270" node2="118916,145270" node3="118805,145270" node4="118805,145270" nodeZ="-2475" />
 	<door id="23240001" name="fortress_2324_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="116614;203940;-3382" node1="116565,204003" node2="116637,203865" node3="116663,203876" node4="116587,204016" nodeZ="-3382" default_status="close" />
-	<door id="23240002" name="fortress_2324_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="117846;204705;-3361" node1="117851,204708" node2="117889,204639" node3="117876,204632" node4="117841,204702" nodeZ="-3361" default_status="close" />
-	<door id="23240003" name="fortress_2324_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="117919;204567;-3361" node1="117925,204570" node2="117889,204639" node3="117875,204632" node4="117913,204564" nodeZ="-3361" default_status="close" />
+	<door id="23240002" name="fortress_2324_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="118905;205271;-3361" node1="118912,205275" node2="118950,205205" node3="118934,205198" node4="118899,205268" nodeZ="-3361" default_status="close" />
+	<door id="23240003" name="fortress_2324_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="118978;205134;-3361" node1="118985,205137" node2="118949,205207" node3="118934,205200" node4="118971,205131" nodeZ="-3361" default_status="close" />
 	<door id="23240004" name="fortress_2324_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="119429;203983;-3333" node1="119458,203909" node2="119422,203978" node3="119437,203987" node4="119475,203918" nodeZ="-3333" default_status="close" />
 	<door id="23240005" name="fortress_2324_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="119503;203845;-3333" node1="119459,203910" node2="119495,203841" node3="119513,203849" node4="119476,203919" nodeZ="-3333" default_status="close" />
-	<door id="23240006" name="fortress_2324_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="118905;205271;-3361" node1="118912,205275" node2="118950,205205" node3="118934,205198" node4="118899,205268" nodeZ="-3361" default_status="close" />
-	<door id="23240007" name="fortress_2324_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="118978;205134;-3361" node1="118985,205137" node2="118949,205207" node3="118934,205200" node4="118971,205131" nodeZ="-3361" default_status="close" />
+	<door id="23240006" name="fortress_2324_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="117846;204705;-3361" node1="117851,204708" node2="117889,204639" node3="117876,204632" node4="117841,204702" nodeZ="-3361" default_status="close" />
+	<door id="23240007" name="fortress_2324_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="117919;204567;-3361" node1="117925,204570" node2="117889,204639" node3="117875,204632" node4="117913,204564" nodeZ="-3361" default_status="close" />
 	<door id="23240008" name="fortress_2324_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="120247;205878;-3382" node1="120195,205938" node2="120272,205801" node3="120297,205815" node4="120225,205954" nodeZ="-3382" default_status="close" />
 	<door id="23250001" name="innadrile_castle_outter_002" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="116392;245462;-766" node1="116399,245469" node2="116254,245468" node3="116254,245456" node4="116399,245456" nodeZ="-1090" />
 	<door id="23250002" name="innadrile_castle_outter_001" open_method="0" height="320" baseHpMax="633000" basePDef="644" baseMDef="518" pos="116130;245462;-766" node1="116123,245456" node2="116268,245456" node3="116268,245468" node4="116123,245468" nodeZ="-1090" />
@@ -1097,10 +1097,10 @@
 	<door id="24150001" name="fortress_2415_001" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="158497;-72103;-2865" node1="158554,-72041" node2="158506,-72115" node3="158484,-72100" node4="158531,-72026" nodeZ="-2865" default_status="close" />
 	<door id="24150002" name="fortress_2415_002" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="158584;-71973;-2865" node1="158549,-72051" node2="158599,-71978" node3="158571,-71960" node4="158525,-72035" nodeZ="-2865" default_status="close" />
 	<door id="24150003" name="fortress_2415_003" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="157297;-69092;-2916" node1="157280,-69193" node2="157389,-69038" node3="157307,-68988" node4="157204,-69143" nodeZ="-2916" default_status="close" />
-	<door id="24150004" name="fortress_2415_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="158606;-70039;-2892" node1="158661,-69976" node2="158614,-70047" node3="158596,-70035" node4="158643,-69965" nodeZ="-2892" default_status="close" />
-	<door id="24150005" name="fortress_2415_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="158693;-69909;-2892" node1="158657,-69984" node2="158705,-69913" node3="158685,-69900" node4="158639,-69971" nodeZ="-2892" default_status="close" />
-	<door id="24150006" name="fortress_2415_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="159605;-70706;-2892" node1="159661,-70645" node2="159613,-70714" node3="159593,-70702" node4="159637,-70628" nodeZ="-2892" default_status="close" />
-	<door id="24150007" name="fortress_2415_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="159692;-70577;-2892" node1="159658,-70654" node2="159705,-70583" node3="159684,-70568" node4="159633,-70638" nodeZ="-2892" default_status="close" />
+	<door id="24150004" name="fortress_2415_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="159605;-70706;-2892" node1="159661,-70645" node2="159613,-70714" node3="159593,-70702" node4="159637,-70628" nodeZ="-2892" default_status="close" />
+	<door id="24150005" name="fortress_2415_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="159692;-70577;-2892" node1="159658,-70654" node2="159705,-70583" node3="159684,-70568" node4="159633,-70638" nodeZ="-2892" default_status="close" />
+	<door id="24150006" name="fortress_2415_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="158606;-70039;-2892" node1="158661,-69976" node2="158614,-70047" node3="158596,-70035" node4="158643,-69965" nodeZ="-2892" default_status="close" />
+	<door id="24150007" name="fortress_2415_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="158693;-69909;-2892" node1="158657,-69984" node2="158705,-69913" node3="158685,-69900" node4="158639,-69971" nodeZ="-2892" default_status="close" />
 	<door id="24150008" name="fortress_2415_008" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="161354;-71813;-2916" node1="161350,-71923" node2="161461,-71768" node3="161356,-71701" node4="161250,-71858" nodeZ="-2916" default_status="close" />
 	<door id="24150009" name="fortress_2415_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="160742;-70553;-2899" node1="160804,-70612" node2="160731,-70561" node3="160745,-70539" node4="160819,-70591" nodeZ="-2899" default_status="close" />
 	<door id="24150010" name="fortress_2415_010" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="160872;-70639;-2899" node1="160808,-70584" node2="160880,-70629" node3="160867,-70650" node4="160795,-70605" nodeZ="-2899" default_status="close" />
@@ -1167,10 +1167,10 @@
 	<door id="24190003" name="aden_colosseum_002_001" open_method="0" height="256" baseHpMax="550000" hp_showable="false" basePDef="644" baseMDef="518" pos="150950;46721;-3288" node1="150939,46641" node2="150961,46640" node3="150961,46797" node4="150941,46797" nodeZ="-3435" default_status="open" />
 	<door id="24190004" name="aden_colosseum_002_002" open_method="0" height="256" baseHpMax="550000" hp_showable="false" basePDef="644" baseMDef="518" pos="151910;46721;-3288" node1="151903,46644" node2="151917,46644" node3="151918,46798" node4="151904,46798" nodeZ="-3435" default_status="open" />
 	<door id="24190005" name="fortress_2419_001" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="153327;56710;-3303" node1="153288,56636" node2="153389,56759" node3="153363,56780" node4="153262,56657" nodeZ="-3303" default_status="close" />
-	<door id="24190006" name="fortress_2419_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="154384;55624;-3282" node1="154442,55680" node2="154390,55620" node3="154378,55629" node4="154427,55691" nodeZ="-3282" default_status="close" />
-	<door id="24190007" name="fortress_2419_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="154483;55744;-3282" node1="154441,55678" node2="154491,55739" node3="154476,55749" node4="154426,55689" nodeZ="-3282" default_status="close" />
-	<door id="24190008" name="fortress_2419_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="155313;54862;-3282" node1="155369,54919" node2="155318,54858" node3="155308,54866" node4="155357,54928" nodeZ="-3282" default_status="close" />
-	<door id="24190009" name="fortress_2419_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="155412;54983;-3282" node1="155369,54918" node2="155418,54979" node3="155406,54987" node4="155356,54928" nodeZ="-3282" default_status="close" />
+	<door id="24190006" name="fortress_2419_002" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="155313;54862;-3282" node1="155369,54919" node2="155318,54858" node3="155308,54866" node4="155357,54928" nodeZ="-3282" default_status="close" />
+	<door id="24190007" name="fortress_2419_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="155412;54983;-3282" node1="155369,54918" node2="155418,54979" node3="155406,54987" node4="155356,54928" nodeZ="-3282" default_status="close" />
+	<door id="24190008" name="fortress_2419_004" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="154384;55624;-3282" node1="154442,55680" node2="154390,55620" node3="154378,55629" node4="154427,55691" nodeZ="-3282" default_status="close" />
+	<door id="24190009" name="fortress_2419_005" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="154483;55744;-3282" node1="154441,55678" node2="154491,55739" node3="154476,55749" node4="154426,55689" nodeZ="-3282" default_status="close" />
 	<door id="24190010" name="fortress_2419_006" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="156500;54106;-3303" node1="156462,54033" node2="156562,54156" node3="156536,54178" node4="156436,54053" nodeZ="-3304" default_status="close" />
 	<door id="24190011" name="fortress_2419_007" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="156034;56156;-3253" node1="156093,56211" node2="156041,56151" node3="156029,56162" node4="156078,56222" nodeZ="-3253" default_status="close" />
 	<door id="24190012" name="fortress_2419_008" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="156134;56277;-3253" node1="156093,56211" node2="156140,56271" node3="156127,56282" node4="156078,56221" nodeZ="-3253" default_status="close" />
@@ -1296,10 +1296,10 @@
 	<door id="25190003" name="fortress_2519_003" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="190612;38279;-3443" node1="190604,38190" node2="190605,38290" node3="190621,38289" node4="190621,38190" nodeZ="-3443" default_status="close" />
 	<door id="25190004" name="fortress_2519_004" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="188076;39284;-3409" node1="188161,39275" node2="188076,39278" node3="188076,39291" node4="188161,39290" nodeZ="-3409" default_status="close" />
 	<door id="25190005" name="fortress_2519_005" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="188233;39284;-3409" node1="188148,39275" node2="188243,39275" node3="188244,39293" node4="188147,39289" nodeZ="-3409" default_status="close" />
-	<door id="25190006" name="fortress_2519_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="189853;39139;-3438" node1="189938,39130" node2="189853,39133" node3="189853,39146" node4="189938,39145" nodeZ="-3438" default_status="close" />
-	<door id="25190007" name="fortress_2519_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="190009;39139;-3438" node1="189924,39130" node2="190019,39130" node3="190020,39148" node4="189923,39144" nodeZ="-3438" default_status="close" />
-	<door id="25190008" name="fortress_2519_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="189853;40340;-3438" node1="189938,40331" node2="189853,40334" node3="189853,40347" node4="189938,40346" nodeZ="-3438" default_status="close" />
-	<door id="25190009" name="fortress_2519_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="190009;40340;-3438" node1="189924,40331" node2="190019,40331" node3="190020,40349" node4="189923,40345" nodeZ="-3438" default_status="close" />
+	<door id="25190006" name="fortress_2519_006" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="189853;40340;-3438" node1="189938,40331" node2="189853,40334" node3="189853,40347" node4="189938,40346" nodeZ="-3438" default_status="close" />
+	<door id="25190007" name="fortress_2519_007" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="190009;40340;-3438" node1="189924,40331" node2="190019,40331" node3="190020,40349" node4="189923,40345" nodeZ="-3438" default_status="close" />
+	<door id="25190008" name="fortress_2519_008" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="189853;39139;-3438" node1="189938,39130" node2="189853,39133" node3="189853,39146" node4="189938,39145" nodeZ="-3438" default_status="close" />
+	<door id="25190009" name="fortress_2519_009" open_method="0" height="150" baseHpMax="169710" hp_showable="false" basePDef="644" baseMDef="518" pos="190009;39139;-3438" node1="189924,39130" node2="190019,39130" node3="190020,39148" node4="189923,39144" nodeZ="-3438" default_status="close" />
 	<door id="25190010" name="fortress_2519_010" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="191421;39731;-3397" node1="191413,39819" node2="191414,39724" node3="191429,39724" node4="191429,39819" nodeZ="-3397" default_status="close" />
 	<door id="25190011" name="fortress_2519_011" open_method="1" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="191421;39887;-3397" node1="191413,39798" node2="191414,39898" node3="191430,39897" node4="191430,39798" nodeZ="-3397" default_status="close" />
 	<door id="25190012" name="fortress_2519_012" open_method="0" height="150" baseHpMax="169710" basePDef="644" baseMDef="518" pos="189913;41955;-3460" node1="189794,41905" node2="190020,41912" node3="190020,42008" node4="189793,42010" nodeZ="-3411" default_status="close" />

+ 0 - 27
L2J_DataPack/dist/game/data/html/CommunityBoard/1.htm

@@ -1,27 +0,0 @@
-<html><body>
-<br>
-<table width=610>
-<tr>
-<td width=250 align=left><a action="bypass _bbstop">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbstop;1">Lineage II Rules</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=610 border="0" bgcolor="666666">
-<tr>
-<td width=50 height=18 align="center">&nbsp;</td>
-<td width=470 height=18 align="center">Title</td>
-<td width=90 height=18 align="left">&nbsp;&nbsp;Administrator</td>
-</tr>
-</table>
-<table width=610 height=46>
-<tr>
-<td width=50 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=470 align="left">&nbsp;Here goes the server rules;</td>
-<td width=90 align="center">0</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-</body></html>

+ 0 - 41
L2J_DataPack/dist/game/data/html/CommunityBoard/10.htm

@@ -1,41 +0,0 @@
-<html><body>
-<br>
-<table width=610>
-<tr>
-<td width=250 align=left><a action="bypass _bbstop">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbstop;2">Lineage II News</a>&nbsp;>&nbsp;<a action="bypass _bbstop;10">Events</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=610 bgcolor="666666">
-<tr>
-<td width=50 height=18 align="center">&nbsp;</td>
-<td width=380 height=18 align="center">Title</td>
-<td width=90 height=18 align="center">Type of Event</td>
-<td width=90 height=18 align="left">&nbsp;&nbsp;Date</td>
-</tr>
-</table>
-<table width=610 height=46>
-<tr>
-<td width=46 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=94 align="left"><a action="bypass _bbstop;11">Wedding Event</a></td>
-<td width=290 align="left"><font color="FF9900">Marry to your love and Enjoy the benefits.</font></td>
-<td width=100 align="center">Custom Event</td>
-<td width=80 align="left">No Expiration</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-<table width=610 height=46>
-<tr>
-<td width=46 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=94 align="left"><a action="bypass _bbstop;12">Welcome Event</a></td>
-<td width=290 align="left"><font color="FF9900">The Biggest Event that a Lineage II Server has ever seen</font></td>
-<td width=100 align="center">Custom Event</td>
-<td width=80 align="left">May 21th</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-</center>
-</body></html>

+ 0 - 48
L2J_DataPack/dist/game/data/html/CommunityBoard/2.htm

@@ -1,48 +0,0 @@
-<html><body>
-<br>
-<table width=610>
-<tr>
-<td width=250 align=left><a action="bypass _bbstop">HOME</a>&nbsp;>&nbsp;<a action="bypass _bbstop;2">Lineage II News</a></td>
-</tr>
-<tr>
-<td height=9></td>
-</tr>
-</table>
-<center>
-<table width=610 bgcolor="666666">
-<tr>
-<td width=50 height=18 align="center">Type</td>
-<td width=380 height=18 align="center">Title</td>
-<td width=90 height=18 align="center">Registered</td>
-<td width=90 height=18 align="left">Administrator</td>
-</tr>
-</table>
-<table width=610 height=46>
-<tr>
-<td width=50 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=380 align="left"><table width=380><tr><td align="left">&nbsp;<a action="bypass _bbstop;10">Events (0)</a></td></tr><tr><td width=380 align="left">&nbsp;Scheduled Events</td></tr></table></td>
-<td width=90 align="center">0</td>
-<td width=90 align="center">0</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-<table width=610 height=46>
-<tr>
-<td width=50 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=380 align="left"><table width=380><tr><td align="left">&nbsp;<a action="bypass _bbstop;20">Official Announcements (0)</a></td></tr><tr><td width=380 align="left">&nbsp;General Information</td></tr></table></td>
-<td width=90 align="center">0</td>
-<td width=90 align="center">0</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-<table width=610 height=46>
-<tr>
-<td width=50 align="right"><img src="l2ui.bbs_board" width=32 height=32></td>
-<td width=380 align="left"><table width=380><tr><td align="left">&nbsp;<a action="bypass _bbstop;30">Update Information (0)</a></td></tr><tr><td width=380 align="left">&nbsp;Patch Notes</td></tr></table></td>
-<td width=90 align="center">0</td>
-<td width=90 align="center">0</td>
-</tr>
-</table>
-<img src="l2ui.squaregray" width="610" height="1">
-</center>
-</body></html>

+ 40 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/favorite.html

@@ -0,0 +1,40 @@
+<html>
+	<body>
+		<br>
+		<br>
+		<table border="0" width="755">
+			<tr>
+				<td width="10">
+				</td>
+				<td width="600" align="left">
+					<a action="bypass _bbsgetfav">&$379;</a>&nbsp;>&nbsp;Bookmark list
+				</td>
+			</tr>
+		</table>
+		<center>
+			<img src="L2UI.squareblank" width="1" height="10">
+			<table border="0" cellspacing="0" cellpadding="0" width="755" bgcolor="A7A19A">
+				<tr>
+					<td fixwidth="30">
+						&nbsp;
+					</td>
+					<td fixwidth="515" align="center">
+						&$413;
+					</td>
+					<td fixwidth="150" align="center">
+						&$418;
+					</td>
+					<td fixwidth="60" align="center">
+					</td>
+				</tr>
+			</table>
+			<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td width="755">
+				</td>
+			</tr>
+			</table>
+			%fav_list%
+		 </center>
+	</body>
+</html>

+ 23 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/favorite_list.html

@@ -0,0 +1,23 @@
+<br>
+<table border="0" cellspacing="0" cellpadding="2" width="755">
+<tr>
+	<td fixwidth="30">
+		&nbsp;
+	</td>
+	<td fixwidth="515" align="left">
+		<a action="bypass %fav_bypass%">%fav_title%</a>
+	</td>
+	<td fixwidth="150" align="center">
+		%fav_add_date%
+	</td>
+	<td fixwidth="60" align="center">
+		<button action="bypass _bbsdelfav_%fav_id%" width="15" height="15" back="L2UI_CT1.Button_DF_Delete_Down" fore="L2UI_CT1.Button_DF_Delete">
+	</td>
+</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="0">
+<tr>
+	<td width="755">
+	</td>
+</tr>
+</table>

+ 79 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/friends_block_list.html

@@ -0,0 +1,79 @@
+<html>
+	<body>
+		<br>
+		<br>
+		<table border="0" width="755">
+			<tr>
+				<td width="10">
+				</td>
+				<td width="600" align="left">
+					<a action="bypass_friendlist">&$904;</a>&nbsp;>&nbsp;Ignore list
+				</td>
+			</tr>
+		</table>
+		<center>
+			<img src="L2UI.squareblank" width="1" height="10">
+			<table border="0" cellspacing="0" cellpadding="0" width="755" bgcolor="A7A19A">
+				<tr>
+					<td width="5">
+					</td>
+					<td height="10" width="750">
+					</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td height="20">
+						<a action="bypass_friendlist">[Friends list]</a>&nbsp;[Ignore list]
+					</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td height="10">
+					</td>
+				</tr>
+			</table>
+			<br>
+			Ignore list <img src="L2UI.squaregray" width="755" height="1">
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td>
+						%block_list%
+					</td>
+				</tr>
+			</table>
+			<br>
+			<img src="L2UI.squaregray" width="755" height="2">
+			<br>
+			<table width="755" height="45" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td align="center">
+						<table border="0">
+						<tr>
+							<td fixwidth="90" align="right">
+								Character name
+							</td>
+							<td fixwidth="130">
+								<edit var="block" width=130 height="15" length="64" />
+							</td>
+							<td>
+								<button value="Block" action="Write_friendblockadd_" back="l2ui_ct1.button.button_df_small_down" width="70" height="25" fore="l2ui_ct1.button.button_df_small">
+							</td>
+						</tr>
+						</table>
+					</td>
+				</tr>
+				<tr>
+					<td width="755" align="right">
+						<img src="L2UI.squaregray" width="755" height="1">
+						<img src="L2UI.squareblank" width="755" height="4">
+						<button value="Delete All" action="bypass_friendblockdeleteallconfirm_" back="l2ui_ct1.button.button_df_small_down" width="70" height="25" fore="l2ui_ct1.button.button_df_small">
+					</td>
+				</tr>
+			</table>
+			%delete_all_msg%
+		</center>
+	</body>
+</html>

+ 90 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/friends_list.html

@@ -0,0 +1,90 @@
+<html>
+	<body>
+		<br>
+		<br>
+		<table border="0" width="755">
+		<tr>
+			<td width="10">
+			</td>
+			<td width="600" align="left">
+				<a action="bypass_friendlist">&$904;</a>&nbsp;>&nbsp;Friends List
+			</td>
+		</tr>
+		</table>
+		<center>
+			<img src="L2UI.squareblank" width="1" height="10">
+			<table border="0" cellspacing="0" cellpadding="0" width="755" bgcolor="A7A19A">
+				<tr>
+					<td width="5">
+					</td>
+					<td height="10" width="750">
+					</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td height="20">
+						[Friends list]&nbsp;<a action="bypass_friendblocklist">[Ignore list]</a>
+					</td>
+				</tr>
+				<tr>
+					<td>
+					</td>
+					<td height="10">
+					</td>
+				</tr>
+			</table>
+			<br>
+			Friends list <img src="L2UI.squaregray" width="755" height="1">
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td>
+						%friend_list%
+					</td>
+				</tr>
+			</table>
+			<br>
+			<img src="L2UI.squaregray" width="755" height="2">
+			<br>
+			<br>
+			<font color="999999">Selection list</font>
+			<img src="L2UI.squaregray" width="755" height="1">
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td>
+						 %selected_friend_list%
+					</td>
+				</tr>
+			</table>
+			<br>
+			<img src="L2UI.squaregray" width="755" height="1">
+			<table fixwidth="755" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td height="10">
+					</td>
+				</tr>
+				<tr>
+					<td width="5">
+					</td>
+					<td align="center" width="540">
+					</td>
+					<td align="center" width="70">
+						<button value "Delete" action="bypass_frienddelete_" back="l2ui_ct1.button.button_df_small_down" width="70" height="25" fore="l2ui_ct1.button.button_df_small">
+					</td>
+					<td align="center" width="70">
+						<button value "Delete All" action="bypass_frienddeleteallconfirm_" back="l2ui_ct1.button.button_df_small_down" width="70" height="25" fore="l2ui_ct1.button.button_df_small">
+					</td>
+					<td width="5">
+					</td>
+				</tr>
+				<tr>
+					<td height="10">
+					</td>
+				</tr>
+			</table>
+			%delete_all_msg%
+		</center>
+	</body>
+</html>

+ 90 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/home.html

@@ -0,0 +1,90 @@
+<html>
+	<body>
+		<center>
+			<br>
+			<br>
+			<br1>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="50"></td>
+					<td align="center" width="695" height="30" align="left">
+						<img src="l2ui.bbs_lineage2" width="128" height="16" >
+					</td>
+				</tr>
+			</table>
+			<table border="0" cellspacing="0" cellpadding="2" bgcolor="A7A19A" width="755">
+				<tr>
+					<td WIDTH="100" align="right">&$412;</td>
+					<td WIDTH="540" align="center">&$413;</td>
+					<td WIDTH="115" align="center">&$414;</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.bbs_folder" width="32" height="32">
+					</td>
+					<td fixwidth="560" align="left" valign="top">
+						<a action="bypass _bbsgetfav">Favorites</a><br1>
+						<font color="AAAAAA">Favorites community</font>
+					</td>
+					<td fixwidth="95" align="center" valign="top">
+						%fav_count%
+					</td>
+				</tr>
+			</table>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.bbs_folder" width="32" height="32">
+					</td>
+					<td fixwidth="560" align="left" valign="top">
+						<a action="bypass _bbsloc">Regions</a><br1>
+						<font color="AAAAAA">Private store: Sell, Buy, Manufacture.</font>
+					</td>
+					<td fixwidth="95" align="center" valign="top">%region_count%</td>
+				</tr>
+			</table>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.bbs_folder" width="32" height="32">
+					</td>
+					<td fixwidth="560" align="left" valign="top">
+						<a action="bypass _bbsclan">Clan community</a><br1>
+						<font color="AAAAAA">Clan informations.</font>
+					</td>
+					<td fixwidth="95" align="center" valign="top">
+						%clan_count%
+					</td>
+				</tr>
+			</table>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<br>
+		</center>
+	</body>
+</html>

+ 93 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/homepage.html

@@ -0,0 +1,93 @@
+<html>
+	<body>
+		<center>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td width="755" align="center" valign="top">
+						<font name="hs12">&$2306;</font>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" bgcolor="A7A19A" width="755">
+				<tr>
+					<td width="100" align=right>&amp;$412;</td>
+					<td width="480" align=center>&amp;$413;</td>                 
+					<td width="160" align=center>&amp;$2258;</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2259;</font><br1>
+						<font color="AAAAAA">&amp;$2260;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2265" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2261;</font><br1>
+						<font color="AAAAAA">&amp;$2262;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2266" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2263;</font><br1>
+						<font color="AAAAAA">&amp;$2264;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2267" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>       
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 0 - 81
L2J_DataPack/dist/game/data/html/CommunityBoard/index.htm

@@ -1,81 +0,0 @@
-<html><body>
-<center>
-<br>
-<table width=610>
-	<tr>
-		<td width=50 height=18 align="center">Type</td>
-		<td width=380 height=18 align="center">Title</td>
-		<td width=90 height=18 align="center">Registered</td>
-		<td width=90 height=18 align="left">Administrator</td>
-	</tr>
-</table>
-<table width=610 height=46>
-	<tr>
-		<td width=380 align="left">
-			<table width=380>
-				<tr>
-					<td align="left">&nbsp;<a action="bypass _bbstop;1">Server Rules</a></td>
-				</tr>
-				<tr>
-					<td width=380 align="left">&nbsp;Read them Carefully</td>
-				</tr>
-			</table>
-		</td>
-		<td width=90 align="center">0</td>
-		<td width=90 align="center">0</td>
-	</tr>
-</table>
-<table width=610 height=46>
-	<tr>
-		<td width=380 align="left">
-			<table width=380>
-				<tr>
-					<td align="left">&nbsp;<a action="bypass _bbstop;2">Lineage II News</a></td>
-				</tr>
-				<tr>
-					<td width=380 align="left">&nbsp;New Information</td>
-				</tr>
-			</table>
-		</td>
-		<td width=90 align="center">0</td>
-		<td width=90 align="center">0</td>
-	</tr>
-</table>
-<table width=610 height=46 border="0">
-	<tr>
-		<td width=380 align="left">
-			<table width=380>
-				<tr>
-					<td align="left">&nbsp;<a action="bypass _bbsclan">Clan Community</a></td>
-				</tr>
-				<tr>
-					<td width=380 align="left">&nbsp;Clan Information</td>
-				</tr>
-			</table>
-		</td>
-		<td width=90 align="center">0</td>
-		<td width=90 align="center">0</td>
-	</tr>
-</table>
-<table width=610 height=46>
-	<tr>
-		<td width=380 align="left">
-			<table width=380>
-				<tr>
-					<td align="left">&nbsp;<a action="bypass _bbsmemo">Personal Notes</a></td>
-				</tr>
-				<tr>
-					<td width=380 align="left">&nbsp;Check your Notes</td>
-				</tr>
-			</table>
-		</td>
-		<td width=90 align="center">0</td>
-		<td width=90 align="center">0</td>
-	</tr>
-</table>
-<font color="LEVEL">L2J Community Board.</font>
-<br>
-<!-- Special thanks to the "Varacolaci Dev TeaM" -->
-Thank you very much for using our server
-</center>
-</body></html>

+ 93 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/mail.html

@@ -0,0 +1,93 @@
+<html>
+	<body>
+		<center>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td width="755" align="center" valign="top">
+						<font name="hs12">&$2306;</font>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" bgcolor="A7A19A" width="755">
+				<tr>
+					<td width="100" align=right>&amp;$412;</td>
+					<td width="480" align=center>&amp;$413;</td>                 
+					<td width="160" align=center>&amp;$2258;</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2259;</font><br1>
+						<font color="AAAAAA">&amp;$2260;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2265" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2261;</font><br1>
+						<font color="AAAAAA">&amp;$2262;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2266" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2263;</font><br1>
+						<font color="AAAAAA">&amp;$2264;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2267" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>       
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 93 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/memo.html

@@ -0,0 +1,93 @@
+<html>
+	<body>
+		<center>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0" width="755">
+				<tr>
+					<td width="755" align="center" valign="top">
+						<font name="hs12">&$2306;</font>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" bgcolor="A7A19A" width="755">
+				<tr>
+					<td width="100" align=right>&amp;$412;</td>
+					<td width="480" align=center>&amp;$413;</td>                 
+					<td width="160" align=center>&amp;$2258;</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2259;</font><br1>
+						<font color="AAAAAA">&amp;$2260;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2265" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2261;</font><br1>
+						<font color="AAAAAA">&amp;$2262;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2266" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+			<br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755">
+				<tr>
+					<td fixwidth="100" align="right" valign="top">
+						<img src="l2ui.ActionWnd.bbs_Webfolder" width="32" height="32">
+					</td>
+					<td fixwidth="480" align="left" valign="top">
+						<font color="AAAAAA">&amp;$2263;</font><br1>
+						<font color="AAAAAA">&amp;$2264;</font>
+					</td>
+					<td fixwidth="160" align="center" valign="top">
+						<button value="&$2258;" action="url !2267" back="l2ui_ct1.button.button_df_small_down" fore="l2ui_ct1.button.button_df_small" width="74" height="25"/>
+					</td>
+				</tr>
+			</table>
+			<br>       
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td width="755">
+						<img src="l2ui.squaregray" width="750" height="1">
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 37 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/region.html

@@ -0,0 +1,37 @@
+<html>
+	<body>
+		<br>
+		<br>
+		<table border="0" width="755">
+			<tr>
+				<td width="10">
+				</td>
+				<td width="600" align="left">
+					<a action="bypass _bbsloc">&$381;</a>&nbsp;>&nbsp;<a action="bypass _bbshome">Local Community</a>&nbsp;>&nbsp;<a action="bypass _bbshome">Local Information</a>
+				</td>
+			</tr>
+		</table>
+		<center>
+			<img src="L2UI.squareblank" width="1" height="10"><br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755" bgcolor="A7A19A">
+				<tr>
+					<td width="100" align="right">
+						&$1790;
+					</td>
+					<td width="300" align="center">
+						&$382;
+					</td>
+					<td width="240" align="center">
+						&$590;
+					</td>
+					<td width="115" align="center">
+						&$1608;
+					</td>
+				</tr>
+			</table>
+			<br>
+			%region_list%
+			<br>
+		</center>
+	</body>
+</html>

+ 24 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/region_clanhall_list.html

@@ -0,0 +1,24 @@
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr>
+		<td fixwidth="100" align="right" valign="top">
+			<a action="bypass _bbsloc;%region_id%">&$%region_name%;</a>
+		</td>
+		<td fixwidth="300" align="left" valign="top">
+			%region_owning_clan%
+		</td>
+		<td fixwidth="240" align="center" valign="top">
+			%region_owning_clan_alliance%
+		</td>
+		<td fixwidth="115" align="center" valign="top">
+			%region_tax_rate%
+		</td>
+	</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td width="755">
+			<img src="l2ui.squaregray" width="750" height="1">
+		</td>
+	</tr>
+</table>
+<br>

+ 24 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/region_list.html

@@ -0,0 +1,24 @@
+<table border="0" cellspacing="0" cellpadding="2">
+	<tr>
+		<td fixwidth="100" align="right" valign="top">
+			<a action="bypass _bbsloc;%region_id%">&$%region_name%;</a>
+		</td>
+		<td fixwidth="300" align="center" valign="top">
+			%region_owning_clan%
+		</td>
+		<td fixwidth="240" align="center" valign="top">
+			%region_owning_clan_alliance%
+		</td>
+		<td fixwidth="115" align="center" valign="top">
+			%region_tax_rate%
+		</td>
+	</tr>
+</table>
+<table border="0" cellspacing="0" cellpadding="0">
+	<tr>
+		<td width="755">
+			<img src="l2ui.squaregray" width="750" height="1">
+		</td>
+	</tr>
+</table>
+<br>

+ 37 - 0
L2J_DataPack/dist/game/data/html/CommunityBoard/region_show.html

@@ -0,0 +1,37 @@
+<html>
+	<body>
+		<br>
+		<br>
+		<table border="0" width="755">
+			<tr>
+				<td width="10">
+				</td>
+				<td width="600" align="left">
+					<a action="bypass _bbsloc">&$381;</a>&nbsp;>&nbsp;<a action="bypass _bbshome">Local Community</a>&nbsp;>&nbsp;<a action="bypass _bbshome">Local Information</a>
+				</td>
+			</tr>
+		</table>
+		<center>
+			<img src="L2UI.squareblank" width="1" height="10"><br>
+			<table border="0" cellspacing="0" cellpadding="2" width="755" bgcolor="A7A19A">
+				<tr>
+					<td fixwidth="30">
+						&nbsp;
+					</td>
+					<td fixwidth="241" align="center">
+						&$1617;
+					</td>
+					<td fixwidth="243" align="center">
+						&$382;
+					</td>
+					<td fixwidth="241" align="center">
+						&$382;&nbsp;&$342;&nbsp;&$393;
+					</td>
+				</tr>
+			</table>
+			<br>
+			%region_list%
+			<br>
+		</center>
+	</body>
+</html>

+ 49 - 0
L2J_DataPack/dist/game/data/html/admin/announces-add.htm

@@ -0,0 +1,49 @@
+<html noscrollbar>
+	<body>
+		<center>
+			<br>
+			<table border="0" cellpadding="0" cellspacing="0" width="97%" height="480" background="L2UI_CH3.refinewnd_back_Pattern">
+				<tr>
+					<td valign="top" align="center">
+						<table border="0" cellpadding="0" cellspacing="0">
+							<tr>
+								<td width="256" height="185" background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td>
+							</tr>
+						</table>
+						Add announcement:<br1>
+						<table width=600 height=210 cellspacing=5 background="L2UI_CT1.Windows.Windows_DF_TooltipBG">
+							<tr>
+								<td width="200">Type</td>
+								<td width="420"><combobox width=200 height=17 var="typeBox" list="NORMAL;CRITICAL;AUTO_NORMAL;AUTO_CRITICAL"></td>
+							</tr>
+							<tr>
+								<td width="200">Initial Delay in sec</td>
+								<td width="420"><edit var="autoann_initdelay" width=200 height=12 type=number></td>
+							</tr>
+							<tr>
+								<td width="200">Delay in sec</td>
+								<td width="420"><edit var="autoann_delay" width=200 height=12 type=number></td>
+							</tr>
+							<tr>
+								<td width="200">Repeat (0 for infinite):</td>
+								<td width="420"><edit var="autoann_repeat" width=200 height=12 type=number></td>
+							</tr>
+							<tr>
+								<td width="200">Text:</td>
+								<td width="420"><multiedit var="autoann_memo" width=200 height=100></td>
+							</tr>
+						</table>
+						<center>
+							<table>
+								<tr>
+									<td><button value="Add" action="bypass -h admin_announces add $typeBox $autoann_initdelay $autoann_delay $autoann_repeat $autoann_memo" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+									<td><button value="Back" action="bypass -h admin_announces list" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+								</tr>
+							</table>
+						</center>
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 54 - 0
L2J_DataPack/dist/game/data/html/admin/announces-edit.htm

@@ -0,0 +1,54 @@
+<html noscrollbar>
+	<body>
+		<center>
+			<br>
+			<table border="0" cellpadding="0" cellspacing="0" width="97%" height="480" background="L2UI_CH3.refinewnd_back_Pattern">
+				<tr>
+					<td valign="top" align="center">
+						<table border="0" cellpadding="0" cellspacing="0">
+							<tr>
+								<td width="256" height="185" background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td>
+							</tr>
+						</table>
+						Edit announcements: %id%<br1>
+						<table width=600 height=210 cellspacing=5 background="L2UI_CT1.Windows.Windows_DF_TooltipBG">
+							<tr>
+								<td width="200">Type</td>
+								<td width="200"><combobox width=200 height=17 var="typeBox" list="NORMAL;CRITICAL;AUTO_NORMAL;AUTO_CRITICAL" sel="%type%"></td>
+								<td width="200">%type%</td>
+							</tr>
+							<tr>
+								<td width="200">Initial Delay in sec</td>
+								<td width="200"><edit var="autoann_initdelay" width=200 height=12 type=number></td>
+								<td width="200">%initial%</td>
+							</tr>
+							<tr>
+								<td width="200">Delay in sec</td>
+								<td width="200"><edit var="autoann_delay" width=200 height=12 type=number></td>
+								<td width="200">%delay%</td>
+							</tr>
+							<tr>
+								<td width="200">Repeat (0 for infinite):</td>
+								<td width="200"><edit var="autoann_repeat" width=200 height=12 type=number></td>
+								<td width="200">%repeat%</td>
+							</tr>
+							<tr>
+								<td width="200">Text:</td>
+								<td width="200"><multiedit var="autoann_memo" width=200 height=100></td>
+								<td width="200">%content%</td>
+							</tr>
+						</table>
+						<center>
+							<table>
+								<tr>
+									<td><button value="Edit" action="bypass -h admin_announces edit %id% $typeBox $autoann_initdelay $autoann_delay $autoann_repeat $autoann_memo" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+									<td><button value="Back" action="bypass -h admin_announces list" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+								</tr>
+							</table>
+						</center>
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 48 - 0
L2J_DataPack/dist/game/data/html/admin/announces-list.htm

@@ -0,0 +1,48 @@
+<html noscrollbar>
+	<body>
+		<center>
+			<br>
+			<table border="0" cellpadding="0" cellspacing="0" width="97%" height="480" background="L2UI_CH3.refinewnd_back_Pattern">
+				<tr>
+					<td valign="top" align="center">
+						<table border="0" cellpadding="0" cellspacing="0">
+							<tr>
+								<td width="256" height="185" background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td>
+							</tr>
+						</table>
+						Announcements:<br1>
+						<table width="690" height="20" cellspacing="5" background="L2UI_CT1.Button_DF_Calculator">
+							<tr>
+								<td width="5"></td>
+								<td width="80">Id</td>
+								<td width="100">Type</td>
+								<td width="100">Author</td>
+								<td width="60">Restart</td>
+								<td width="60">Show</td>
+								<td width="60">Edit</td>
+								<td width="60">Remove</td>
+								<td width="5"></td>
+							</tr>
+						</table>
+						<table width="690" height="20" cellspacing="2" background="L2UI_CT1.Windows.Windows_DF_TooltipBG">
+							%announcements%
+						</table>
+						<center>
+							<table width=280 cellspacing=0>
+								<tr>
+									%pages%
+								</tr>
+							</table>
+							<table>
+								<tr>
+									<td><button value="Add" action="bypass -h admin_announces add" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+									<td><button value="Restart" action="bypass -h admin_announces restart" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+								</tr>
+							</table>
+						</center>
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 54 - 0
L2J_DataPack/dist/game/data/html/admin/announces-show.htm

@@ -0,0 +1,54 @@
+<html noscrollbar>
+	<body>
+		<center>
+			<br>
+			<table border="0" cellpadding="0" cellspacing="0" width="97%" height="480" background="L2UI_CH3.refinewnd_back_Pattern">
+				<tr>
+					<td valign="top" align="center">
+						<table border="0" cellpadding="0" cellspacing="0">
+							<tr>
+								<td width="256" height="185" background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td>
+							</tr>
+						</table>
+						Announcement: %id%<br1>
+						<table width=600 height=185 cellspacing=5 background="L2UI_CT1.Windows.Windows_DF_TooltipBG">
+							<tr>
+								<td>Type</td>
+								<td>%type%</td>
+							</tr>
+							<tr>
+								<td>Initial Delay</td>
+								<td>%initial%</td>
+							</tr>
+							<tr>
+								<td>Delay</td>
+								<td>%delay%</td>
+							</tr>
+							<tr>
+								<td>Repeat:</td>
+								<td>%repeat%</td>
+							</tr>
+							<tr>
+								<td>Author:</td>
+								<td>%author%</td>
+							</tr>
+							<tr>
+								<td>Text:</td>
+								<td>%content%</td>
+							</tr>
+						</table>
+						<center>
+							<table>
+								<tr>
+									<td><button value="Remove" action="bypass -h admin_announces remove %id%" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+									<td><button value="Restart" action="bypass -h admin_announces restart %id" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+									<td><button value="Back" action="bypass -h admin_announces list" width="70" height="21" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+								</tr>
+							</table>
+						</center>
+					</td>
+				</tr>
+			</table>
+		</center>
+	</body>
+</html>

+ 7 - 7
L2J_DataPack/dist/game/data/html/admin/charedit.htm

@@ -31,13 +31,13 @@
 				<edit var="hp" width="50">
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_set_hp $hp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_set_hp $hp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
-			<td width=50>
+			<td width="50">
 				PvP Flag:
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_set_pvp_flag" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_set_pvp_flag" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
 		</tr>
 		<tr>
@@ -46,14 +46,14 @@
 				<edit var="mp" width="50">
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_set_mp $mp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_set_mp $mp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
 			<td width="10">PvPs:</td>
 			<td>
 				<edit var="pvpkills" width="50">
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_setpvp $pvpkills" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_setpvp $pvpkills" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
 		</tr>
 		<tr>
@@ -62,14 +62,14 @@
 				<edit var="cp" width="50">
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_set_cp $cp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_set_cp $cp" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
 			<td width="10">PKs:</td>
 			<td>
 				<edit var="pkkills" width="50">
 			</td>
 			<td>
-				<button value="" action="bypass -h admin_setpk $pkkills" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
+				<button value="" action="bypass admin_setpk $pkkills" width="16" height="16" back="L2UI_CH3.shortcut_rotate_down" fore="L2UI_CH3.shortcut_rotate">
 			</td>
 		</tr>
 	</table>

+ 5 - 5
L2J_DataPack/dist/game/data/html/admin/gm_menu.htm

@@ -26,8 +26,7 @@
 <td><button value="TradeOff" action="bypass -h admin_tradeoff" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Invul" action="bypass -h admin_invul" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr><tr>
-<td><button value="Announc" action="bypass -h admin_list_announcements" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="AutoAnn" action="bypass -h admin_list_autoann $qbox" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Announces" action="bypass -h admin_announces list" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="Enhance" action="bypass -h admin_enchant" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 <td><button value="GM Shop" action="bypass -h admin_gmshop" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr><tr>
@@ -47,9 +46,10 @@
 </tr></table><br>
 <center><multiedit var="new_announcement" width=250 height=50></center>
 <table width="160"><tr>
-<td><button value="Announce" action="bypass -h admin_announce_menu $new_announcement" width=95 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="Crit. Announce" action="bypass -h admin_critannounce_menu $new_announcement" width=95 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
-<td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=95 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Announce" action="bypass -h admin_announce $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="Critical" action="bypass -h admin_announce_crit $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="On-Screen" action="bypass -h admin_announce_screen $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
+<td><button value="GM Chat" action="bypass -h admin_gmchat_menu $new_announcement" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr></table><br>
 <table width=270><tr>
 <td><button value="Fenrir" action="bypass -h admin_ride_wolf" width=65 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>

+ 1 - 1
L2J_DataPack/dist/game/data/html/admin/manor.htm

@@ -9,7 +9,7 @@
 <center>
 <table bgcolor="404040" width=270>
 <tr><td width=130>Current mode:</td><td width=140><font color=FF9900>%status%</font></td></tr>
-<tr><td>Next mode change:</td><td><font color=FF9900>%change%</font</td></tr>
+<tr><td>Next mode change:</td><td><font color=FF9900>%change%</font></td></tr>
 </table><br><br>
 <font color=LEVEL>--- [ Castle Info ] ---</font><br1>
 <table bgcolor="404040" width=270>

+ 1 - 1
L2J_DataPack/dist/game/data/html/admin/server_menu.htm

@@ -56,7 +56,7 @@ Maintenance:<br1>
 </table>
 </center>
 <br>
-<button value="Announcements" action="bypass -h admin_announce_announcements" width=130 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
+<button value="Announcements" action="bypass -h admin_announces" width=130 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 <br><br>
 Geodata:<br1>
 <table width=270><tr>

+ 0 - 1
L2J_DataPack/dist/game/data/html/admin/setclass/dark_elf_fighter.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Fighter" action="bypass -h admin_setclass 31" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>

+ 0 - 4
L2J_DataPack/dist/game/data/html/admin/setclass/dark_elf_mage.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Mystic" action="bypass -h admin_setclass 38" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Wizard" action="bypass -h admin_setclass 39" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -49,7 +47,6 @@
 <tr>
 <td><center><button value="Shillien Oracle" action="bypass -h admin_setclass 42" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -58,6 +55,5 @@
 <tr>
 <td><button value="Shillien Saint" action="bypass -h admin_setclass 112" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 </body></html>

+ 0 - 5
L2J_DataPack/dist/game/data/html/admin/setclass/dwarf.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Fighter" action="bypass -h admin_setclass 53" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Scavenger" action="bypass -h admin_setclass 54" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -42,13 +40,11 @@
 <tr>
 <td><button value="Fortune Seeker" action="bypass -h admin_setclass 117" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="666666">
 <tr>
 <td><center><button value="Artisan" action="bypass -h admin_setclass 56" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -57,6 +53,5 @@
 <tr>
 <td><button value="Maestro" action="bypass -h admin_setclass 118" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 </body></html>

+ 0 - 3
L2J_DataPack/dist/game/data/html/admin/setclass/elf_fighter.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Fighter" action="bypass -h admin_setclass 18" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Knight" action="bypass -h admin_setclass 19" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -49,7 +47,6 @@
 <tr>
 <td><center><button value="Scout" action="bypass -h admin_setclass 22" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>

+ 0 - 4
L2J_DataPack/dist/game/data/html/admin/setclass/elf_mage.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Mystic" action="bypass -h admin_setclass 25" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Wizard" action="bypass -h admin_setclass 26" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="296" border="0" bgcolor="0066FF">
 <tr>
@@ -49,7 +47,6 @@
 <tr>
 <td><center><button value="Oracle" action="bypass -h admin_setclass 29" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -58,6 +55,5 @@
 <tr>
 <td><button value="Evas Saint" action="bypass -h admin_setclass 105" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 </body></html>

+ 0 - 4
L2J_DataPack/dist/game/data/html/admin/setclass/human_fighter.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Fighter" action="bypass -h admin_setclass 0" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Warrior" action="bypass -h admin_setclass 1" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -49,7 +47,6 @@
 <tr>
 <td><center><button value="Knight" action="bypass -h admin_setclass 4" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -65,7 +62,6 @@
 <tr>
 <td><center><button value="Rogue" action="bypass -h admin_setclass 7" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>

+ 0 - 3
L2J_DataPack/dist/game/data/html/admin/setclass/human_mage.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Mystic" action="bypass -h admin_setclass 10" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Wizard" action="bypass -h admin_setclass 11" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -57,7 +55,6 @@
 <tr>
 <td><center><button value="Cleric" action="bypass -h admin_setclass 15" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>

+ 0 - 4
L2J_DataPack/dist/game/data/html/admin/setclass/kamael.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Male Soldier" action="bypass -h admin_setclass 123" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Trooper" action="bypass -h admin_setclass 125" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -49,13 +47,11 @@
 <tr>
 <td><center><button value="Female Soldier" action="bypass -h admin_setclass 124" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="666666">
 <tr>
 <td><center><button value="Warder" action="bypass -h admin_setclass 126" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>

+ 0 - 5
L2J_DataPack/dist/game/data/html/admin/setclass/orc_fighter.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Fighter" action="bypass -h admin_setclass 44" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Raider" action="bypass -h admin_setclass 45" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -42,13 +40,11 @@
 <tr>
 <td><button value="Titan" action="bypass -h admin_setclass 113" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="666666">
 <tr>
 <td><center><button value="Monk" action="bypass -h admin_setclass 47" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>
@@ -57,6 +53,5 @@
 <tr>
 <td><button value="Grand Khavatari" action="bypass -h admin_setclass 114" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></td>
 </tr>
-<td></td>
 </table>
 </body></html>

+ 0 - 2
L2J_DataPack/dist/game/data/html/admin/setclass/orc_mage.htm

@@ -23,7 +23,6 @@
 <td></td>
 </tr>
 </table>
-<center>
 <table width="302" border="0" bgcolor="999999">
 <tr>
 <td><center><button value="Mystic" action="bypass -h admin_setclass 49" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
@@ -33,7 +32,6 @@
 <tr>
 <td><center><button value="Shaman" action="bypass -h admin_setclass 50" width="130" height="20" back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"></center></td>
 </tr>
-<td></td>
 </table>
 <table width="302" border="0" bgcolor="0066FF">
 <tr>

+ 0 - 5
L2J_DataPack/dist/game/data/html/default/31555.htm

@@ -1,5 +0,0 @@
-<html><body>Mercenary Supplier Abercrombie:<br>
-Jeesh! Why are you turning into such a pain?! Can't you see I'm busy? It's more than enough for me to deal with the mercenaries! I don't have the time to deal with an outsider like you!
-If you want to serve in our Golden Ram Mercenary force, why don't you go see Kadoon. What a life! What kind of fortune can I make here? Sigh! What a life!<br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>

+ 0 - 5
L2J_DataPack/dist/game/data/html/default/31556.htm

@@ -1,5 +0,0 @@
-<html><body>Mercenary Medic Selina:<br>
-Hey, you're not my boyfriend! You don't even belong to the Golden Ram Mercenary force! Get away from me!<br>
-If you want to join our force go talk to that rough-looking Orc over there.<br>
-<a action="bypass -h npc_%objectId%_Quest">Quest</a>
-</body></html>

+ 0 - 10
L2J_DataPack/dist/game/data/html/default/32346.htm

@@ -1,10 +0,0 @@
-<html><body>Kanaf:<br>
-Shh! Please be still. Over there is the <font color="LEVEL">old town</font>, which is the only entrance to the Steel Citadel. 
-It is used as a prison camp for Native captives.<br>
-Some time ago, when the Steel Citadel's defenses were temporarily weakened, we attacked the town in an attempt to rescue the captives. 
-However, the enemy was still too strong, and many of us were killed or wounded.<br>
-And our comrades in the town still thirst for their freedom!<br>
-<a action="bypass -h npc_%objectId%_Quest UrbanArea">Infiltrate the town.</a><br>
-<a action="bypass -h Quest Kanaf info">Ask him for new information about the town.</a><br>
-<a action="bypass -h npc_%objectId%_Quest">Quest.</a>
-</body></html>

+ 3 - 3
L2J_DataPack/dist/game/data/html/default/32537-1.htm

@@ -1,6 +1,6 @@
 <html><body>Mouth of Ekimus:<br>
 The echoes of the screams of the dying spread to the other side of the gap.<br>
 The name Hall of Suffering seems to suit this place where new souls are made.<br>
-(The Hall of Erosion is an instant zone exclusively for party use.)<br>
-<a action="bypass -h npc_%objectId%_Quest SeedOfInfinity">Enter the Hall of Erosion.</a>
-</body></html>
+(The Hall of Suffering is an instant zone exclusively for party use.)<br>
+<a action="bypass -h npc_%objectId%_Quest HallOfSuffering">Enter the Hall of Erosion.</a>
+</body></html>

+ 4 - 0
L2J_DataPack/dist/game/data/html/default/32738.htm

@@ -0,0 +1,4 @@
+<html><body>Injured Soldier:<br>
+Where is this anyway? What was I doing here?<br>
+<a action="bypass -h npc_%objectId%_Quest">Quest</a>
+</body></html>

+ 2 - 2
L2J_DataPack/dist/game/data/html/teleporter/half/30080.htm

@@ -6,9 +6,9 @@
 <a action="bypass -h npc_%objectId%_goto 1057" msg="811;Rune Township">Rune Township - 29500 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 1058" msg="811;Town of Schuttgart">Town of Schuttgart - 43500 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 1055" msg="811;The Town of Gludio">The Town of Gludio - 14500 Adena</a><br1>
-<a action="bypass -h npc_%objectId%_goto 1059" msg="811;Town of Aden">Town of Aden - 7500 Adena</a><br1>
+<a action="bypass -h npc_%objectId%_goto 1059" msg="811;Town of Aden">Town of Aden - 6500 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 136" msg="811;Giran Harbor">Giran Harbor - 2600 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 28" msg="811;Hardins Private Academy">Hardin's Private Academy - 2200 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 1061" msg="811;Devil's Isle">Devil's Isle - 2850 Adena</a><br1>
 <a action="bypass -h npc_%objectId%_goto 1062" msg="811;Breka's Stronghold">Breka's Stronghold - 500 Adena</a>
-</body></html>
+</body></html>

+ 5 - 0
L2J_DataPack/dist/game/data/instances/CavernOfThePirateCaptainWorldDay60.xml

@@ -4,4 +4,9 @@
 	<allowSummon val="false"/>
 	<showTimer val="true" increase="true" text="Elapsed Time :" />
 	<spawnPoint spawnX="52212" spawnY="218998" spawnZ="-3208" />
+	<reenter additionStyle="ON_INSTANCE_FINISH" >
+		<reset day="Monday" hour="6" minute="30" />
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Friday" hour="6" minute="30" />
+	</reenter>
 </instance>

+ 6 - 1
L2J_DataPack/dist/game/data/instances/CavernOfThePirateCaptainWorldDay83.xml

@@ -4,4 +4,9 @@
 	<allowSummon val="false"/>
 	<showTimer val="true" increase="true" text="Elapsed Time :" />
 	<spawnPoint spawnX="52212" spawnY="218998" spawnZ="-3208" />
-</instance>
+	<reenter additionStyle="ON_INSTANCE_FINISH" >
+		<reset day="Monday" hour="6" minute="30" />
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Friday" hour="6" minute="30" />
+	</reenter>
+</instance>

+ 3 - 0
L2J_DataPack/dist/game/data/instances/CrystalCaverns.xml

@@ -4,6 +4,9 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="1200" />
 	<spawnPoint spawnX="149442" spawnY="173520" spawnZ="-5024" />
+	<reenter additionStyle="ON_INSTANCE_ENTER" >
+		<reset time="86400000" />
+	</reenter>
 	<doorlist>
 		<door doorId="24220001" />
 		<door doorId="24220002" />

+ 4 - 0
L2J_DataPack/dist/game/data/instances/DemonPrince.xml

@@ -4,6 +4,10 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="600" />
 	<spawnPoint spawnX="-22213" spawnY="277138" spawnZ="-9930" />
+	<reenter additionStyle="ON_INSTANCE_FINISH" >
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Saturday" hour="6" minute="30" />
+	</reenter>
 	<spawnlist>
 		<group name="general">
 			<spawn npcId="25540" x="-22199" y="278407" z="-8264" heading="0" respawn="0" />

+ 1 - 0
L2J_DataPack/dist/game/data/instances/DisciplesNecropolisPast.xml

@@ -4,6 +4,7 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="900" />
 	<spawnPoint spawnX="171895" spawnY="-17501" spawnZ="-4903" />
+	<removeBuffs type="ALL" />
 	<doorlist>
 		<door doorId="17240101" />
 		<door doorId="17240102" />

+ 4 - 0
L2J_DataPack/dist/game/data/instances/FinalEmperialTomb.xml

@@ -4,6 +4,10 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="1800" />
 	<spawnPoint spawnX="181381" spawnY="-80883" spawnZ="-2730" />
+	<reenter additionStyle="NONE" >
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Saturday" hour="6" minute="30" />
+	</reenter>
 	<doorlist>
 		<door doorId="17130045" />
 		<door doorId="17130051" />

+ 1 - 0
L2J_DataPack/dist/game/data/instances/HideoutOfTheDawn.xml

@@ -4,6 +4,7 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="30" />
 	<spawnPoint spawnX="147072" spawnY="23743" spawnZ="-1984" />
+	<removeBuffs type="ALL" />
 	<spawnlist>
 		<group name="general">
 			<!-- Franz -->

+ 5 - 0
L2J_DataPack/dist/game/data/instances/IceQueensCastleNormalBattle.xml

@@ -4,6 +4,11 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="600" />
 	<spawnPoint spawnX="115717" spawnY="-125734" spawnZ="-3392" />
+	<reenter additionStyle="ON_INSTANCE_FINISH" >
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Saturday" hour="6" minute="30" />
+	</reenter>
+	<removeBuffs type="ALL" />
 	<doorlist>
 		<door doorId="23140101" />
 	</doorlist>

+ 1 - 0
L2J_DataPack/dist/game/data/instances/MonasteryOfSilence.xml

@@ -4,6 +4,7 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="1" />
 	<spawnPoint spawnX="115983" spawnY="-87351" spawnZ="-3397" />
+	<removeBuffs type="ALL" />
 	<spawnlist>
 		<group name="general">
 			<!-- Eris's Evil Thoughts -->

+ 1 - 0
L2J_DataPack/dist/game/data/instances/NornilsGarden.xml

@@ -4,6 +4,7 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="3000" />
 	<spawnPoint spawnX="-84757" spawnY="60009" spawnZ="-2581" />
+	<removeBuffs type="ALL" />
 	<doorlist>
 		<door doorId="16200001" />
 		<door doorId="16200002" />

+ 4 - 0
L2J_DataPack/dist/game/data/instances/Ranku.xml

@@ -4,6 +4,10 @@
 	<allowSummon val="false" />
 	<emptyDestroyTime val="600" />
 	<spawnPoint spawnX="-19006" spawnY="277065" spawnZ="-13383" />
+	<reenter additionStyle="ON_INSTANCE_FINISH" >
+		<reset day="Wednesday" hour="6" minute="30" />
+		<reset day="Saturday" hour="6" minute="30" />
+	</reenter>
 	<spawnlist>
 		<group name="general">
 			<spawn npcId="25542" x="-19056" y="278732" z="-15000" heading="0" respawn="0" />

+ 40 - 40
L2J_DataPack/dist/game/data/multisell/7897.xml

@@ -4,93 +4,93 @@
 		<npc>30897</npc> <!-- Roman (Head Blacksmith) -->
 	</npcs>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="1" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="1" id="4407" />
 		<!-- Adena -->
 		<production count="700" id="57" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="3" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="3" id="4407" />
 		<!-- Animal Skin -->
 		<production count="20" id="1867" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="3" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="3" id="4407" />
 		<!-- Animal Bone -->
 		<production count="20" id="1872" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="2" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="2" id="4407" />
 		<!-- Coal -->
 		<production count="10" id="1870" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="2" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="2" id="4407" />
 		<!-- Charcoal -->
 		<production count="10" id="1871" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="9" id="4310" />
-		<!-- Leather -->
-		<production count="10" id="1882" />
-	</item>
-	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="5" id="4310" />
-		<!-- Cokes -->
-		<production count="6" id="1879" />
-	</item>
-	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="5" id="4310" />
-		<!-- Metal Hardener -->
-		<production count="1" id="5220" />
-	</item>
-	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="3" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="3" id="4407" />
 		<!-- Coarse Bone Powder -->
 		<production count="2" id="1881" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="3" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="3" id="4407" />
 		<!-- Oriharukon Ore -->
 		<production count="1" id="1874" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="3" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="3" id="4407" />
 		<!-- Stone of Purity -->
 		<production count="1" id="1875" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="6" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="5" id="4407" />
+		<!-- Metal Hardener -->
+		<production count="1" id="5220" />
+	</item>
+	<item>
+		<!-- Bill of Iason Heine -->
+		<ingredient count="5" id="4407" />
+		<!-- Cokes -->
+		<production count="6" id="1879" />
+	</item>
+	<item>
+		<!-- Bill of Iason Heine -->
+		<ingredient count="6" id="4407" />
 		<!-- Crafted Leather -->
 		<production count="1" id="1894" />
 		<!-- Adena -->
 		<production count="210" id="57" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="7" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="7" id="4407" />
 		<!-- Synthetic Cokes -->
 		<production count="1" id="1888" />
 		<!-- Adena -->
 		<production count="280" id="57" />
 	</item>
 	<item>
-		<!-- Iason Heine's Bill -->
-		<ingredient count="9" id="4310" />
+		<!-- Bill of Iason Heine -->
+		<ingredient count="9" id="4407" />
 		<!-- Varnish of Purity -->
 		<production count="1" id="1887" />
 		<!-- Adena -->
 		<production count="630" id="57" />
 	</item>
+	<item>
+		<!-- Bill of Iason Heine -->
+		<ingredient count="9" id="4407" />
+		<!-- Leather -->
+		<production count="10" id="1882" />
+	</item>
 </list>

+ 8 - 73
L2J_DataPack/dist/game/data/scripts.cfg

@@ -11,6 +11,8 @@ handlers/MasterHandler.java
 # AI Section
 
 # Npc
+ai/npc/Abercrombie/Abercrombie.java
+ai/npc/Alarm/Alarm.java
 ai/npc/Alexandria/Alexandria.java
 ai/npc/ArenaManager/ArenaManager.java
 ai/npc/AvantGarde/AvantGarde.java
@@ -35,6 +37,7 @@ ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
 ai/npc/FortressSiegeManager/FortressSiegeManager.java
 ai/npc/FreyasSteward/FreyasSteward.java
 ai/npc/Jinia/Jinia.java
+ai/npc/Katenar/Katenar.java
 ai/npc/KetraOrcSupport/KetraOrcSupport.java
 ai/npc/ManorManager/ManorManager.java
 ai/npc/MercenaryCaptain/MercenaryCaptain.java
@@ -45,9 +48,11 @@ ai/npc/NpcBuffers/impl/CabaleBuffer.java
 ai/npc/PriestOfBlessing/PriestOfBlessing.java
 ai/npc/Rignos/Rignos.java
 ai/npc/Rafforty/Rafforty.java
+ai/npc/Selina/Selina.java
 ai/npc/Sirra/Sirra.java
 ai/npc/SubclassCertification/SubclassCertification.java
 ai/npc/Summons/MerchantGolem/GolemTrader.java
+ai/npc/Summons/Servitors/Servitors.java
 ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
 ai/npc/SymbolMaker/SymbolMaker.java
 ai/npc/Teleports/CrumaTower/CrumaTower.java
@@ -131,7 +136,6 @@ ai/individual/Venom/Venom.java
 ai/individual/Anais.java
 ai/individual/Ballista.java
 ai/individual/Beleth.java
-ai/individual/CatsEyeBandit.java
 ai/individual/CrimsonHatuOtis.java
 ai/individual/Core.java
 ai/individual/DarkWaterDragon.java
@@ -167,35 +171,9 @@ village_master/KamaelChange1/KamaelChange1.java
 village_master/KamaelChange2/KamaelChange2.java
 village_master/orc_occupation_change_1/__init__.py
 village_master/orc_occupation_change_2/__init__.py
-
-# Instance Dungeons Section
-instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java
-instances/ChambersOfDelusion/ChamberOfDelusionEast.java
-instances/ChambersOfDelusion/ChamberOfDelusionNorth.java
-instances/ChambersOfDelusion/ChamberOfDelusionSouth.java
-instances/ChambersOfDelusion/ChamberOfDelusionWest.java
-instances/ChambersOfDelusion/ChamberOfDelusionSquare.java
-instances/ChambersOfDelusion/ChamberOfDelusionTower.java
-instances/CrystalCaverns/CrystalCaverns.java
-instances/DarkCloudMansion/DarkCloudMansion.java
-instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java
-instances/ElcadiasTent/ElcadiasTent.java
-instances/FinalEmperialTomb/FinalEmperialTomb.java
-instances/HideoutOfTheDawn/HideoutOfTheDawn.java
-instances/IceQueensCastle/IceQueensCastle.java
-instances/IceQueensCastleNormalBattle/IceQueensCastleNormalBattle.java
-instances/JiniaGuildHideout1/JiniaGuildHideout1.java
-instances/JiniaGuildHideout2/JiniaGuildHideout2.java
-instances/JiniaGuildHideout3/JiniaGuildHideout3.java
-instances/JiniaGuildHideout4/JiniaGuildHideout4.java
-instances/LibraryOfSages/LibraryOfSages.java
-instances/Kamaloka/Kamaloka.java
-instances/MithrilMine/MithrilMine.java
-instances/MonasteryOfSilence1/MonasteryOfSilence1.java
-instances/NornilsGarden/NornilsGarden.java
-instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java
-instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java
-instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java
+
+# Instance Section
+instances/InstanceLoader.java
 
 # Gracia Section
 gracia/GraciaLoader.java
@@ -205,65 +183,22 @@ hellbound/HellboundLoader.java
 
 # Quests Section
 quests/QuestMasterHandler.java
-quests/SagasScripts/SagasSuperClass.java
 quests/TerritoryWarScripts/TerritoryWarSuperClass.java
-quests/22_TragedyInVonHellmannForest/__init__.py
-quests/23_LidiasHeart/__init__.py
-quests/25_HidingBehindTheTruth/__init__.py
-quests/60_GoodWorkReward/__init__.py
-quests/61_LawEnforcement/__init__.py
-quests/65_CertifiedSoulBreaker/__init__.py
-quests/66_CertifiedArbalester/__init__.py
-quests/117_OceanOfDistantStar/__init__.py
-quests/118_ToLeadAndBeLed/__init__.py
-quests/120_PavelsResearch/__init__.py
-quests/123_TheLeaderAndTheFollower/__init__.py
-quests/171_ActsOfEvil/__init__.py
-quests/178_IconicTrinity/__init__.py
-quests/184_Nikolas_Cooperation_Contract/__init__.py
-quests/185_Nikolas_Cooperation_Consideration/__init__.py
-quests/216_TrialOfGuildsman/__init__.py
-quests/220_TestimonyOfGlory/__init__.py
-quests/222_TestOfDuelist/__init__.py
-quests/223_TestOfChampion/__init__.py
-quests/224_TestOfSagittarius/__init__.py
-quests/225_TestOfSearcher/__init__.py
-quests/226_TestOfHealer/__init__.py
-quests/227_TestOfReformer/__init__.py
-quests/228_TestOfMagus/__init__.py
-quests/229_TestOfWitchcraft/__init__.py
-quests/230_TestOfSummoner/__init__.py
-quests/231_TestOfMaestro/__init__.py
-quests/232_TestOfLord/__init__.py
-quests/233_TestOfWarspirit/__init__.py
 quests/234_FatesWhisper/__init__.py
 quests/236_SeedsOfChaos/__init__.py
 quests/255_Tutorial/__init__.py
 quests/330_AdeptOfTaste/__init__.py
-quests/333_BlackLionHunt/__init__.py
 quests/334_TheWishingPotion/__init__.py
 quests/335_TheSongOfTheHunter/__init__.py
 quests/336_CoinOfMagic/__init__.py
 quests/337_AudienceWithTheLandDragon/__init__.py
-quests/340_SubjugationOfLizardmen/__init__.py
 quests/343_UnderTheShadowOfTheIvoryTower/__init__.py
-quests/345_MethodToRaiseTheDead/__init__.py
 quests/348_ArrogantSearch/__init__.py
-quests/351_BlackSwan/__init__.py
-quests/352_HelpRoodRaiseANewPet/__init__.py
-quests/355_FamilyHonor/__init__.py
-quests/371_ShriekOfGhosts/__init__.py
 quests/372_LegacyOfInsolence/__init__.py
-quests/373_SupplierOfReagents/__init__.py
-quests/378_MagnificentFeast/__init__.py
-quests/379_FantasyWine/__init__.py
-quests/383_SearchingForTreasure/__init__.py
 quests/384_WarehouseKeepersPastime/__init__.py
 quests/386_StolenDignity/__init__.py
 quests/419_GetAPet/__init__.py
 quests/422_RepentYourSins/__init__.py
-quests/426_FishingShot/__init__.py
-quests/501_ProofOfClanAlliance/__init__.py
 quests/503_PursuitClanAmbition/__init__.py
 quests/604_DaimontheWhiteEyedPart2/__init__.py
 quests/620_FourGoblets/__init__.py

+ 1 - 1
L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 

+ 113 - 113
L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -19,9 +19,9 @@
 package ai.fantasy_isle;
 
 import java.text.SimpleDateFormat;
+import java.util.HashMap;
 import java.util.Map;
 
-import javolution.util.FastMap;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
@@ -166,8 +166,8 @@ public class MC_Show extends AbstractNpcAI
 		}
 	}
 	
-	private static Map<String, ShoutInfo> talks = new FastMap<>();
-	private static Map<String, WalkInfo> walks = new FastMap<>();
+	private static final Map<String, ShoutInfo> TALKS = new HashMap<>();
+	private static final Map<String, WalkInfo> WALKS = new HashMap<>();
 	
 	private MC_Show()
 	{
@@ -180,112 +180,112 @@ public class MC_Show extends AbstractNpcAI
 	private void load()
 	{
 		// TODO put this stuff in Routes.xml
-		talks.put("1", new ShoutInfo(MESSAGES[1], "2", 1000));
-		talks.put("2", new ShoutInfo(MESSAGES[2], "3", 6000));
-		talks.put("3", new ShoutInfo(MESSAGES[3], "4", 4000));
-		talks.put("4", new ShoutInfo(MESSAGES[4], "5", 5000));
-		talks.put("5", new ShoutInfo(MESSAGES[5], "6", 3000));
-		talks.put("8", new ShoutInfo(MESSAGES[9], "9", 5000));
-		talks.put("9", new ShoutInfo(MESSAGES[10], "10", 5000));
-		talks.put("12", new ShoutInfo(MESSAGES[12], "13", 5000));
-		talks.put("13", new ShoutInfo(MESSAGES[13], "14", 5000));
-		talks.put("15", new ShoutInfo(MESSAGES[14], "16", 5000));
-		talks.put("16", new ShoutInfo(MESSAGES[15], "17", 5000));
-		talks.put("18", new ShoutInfo(MESSAGES[17], "19", 5000));
-		talks.put("19", new ShoutInfo(MESSAGES[18], "20", 5000));
-		talks.put("21", new ShoutInfo(MESSAGES[19], "22", 5000));
-		talks.put("22", new ShoutInfo(MESSAGES[20], "23", 400));
-		talks.put("25", new ShoutInfo(MESSAGES[21], "26", 5000));
-		talks.put("26", new ShoutInfo(MESSAGES[22], "27", 5400));
+		TALKS.put("1", new ShoutInfo(MESSAGES[1], "2", 1000));
+		TALKS.put("2", new ShoutInfo(MESSAGES[2], "3", 6000));
+		TALKS.put("3", new ShoutInfo(MESSAGES[3], "4", 4000));
+		TALKS.put("4", new ShoutInfo(MESSAGES[4], "5", 5000));
+		TALKS.put("5", new ShoutInfo(MESSAGES[5], "6", 3000));
+		TALKS.put("8", new ShoutInfo(MESSAGES[9], "9", 5000));
+		TALKS.put("9", new ShoutInfo(MESSAGES[10], "10", 5000));
+		TALKS.put("12", new ShoutInfo(MESSAGES[12], "13", 5000));
+		TALKS.put("13", new ShoutInfo(MESSAGES[13], "14", 5000));
+		TALKS.put("15", new ShoutInfo(MESSAGES[14], "16", 5000));
+		TALKS.put("16", new ShoutInfo(MESSAGES[15], "17", 5000));
+		TALKS.put("18", new ShoutInfo(MESSAGES[17], "19", 5000));
+		TALKS.put("19", new ShoutInfo(MESSAGES[18], "20", 5000));
+		TALKS.put("21", new ShoutInfo(MESSAGES[19], "22", 5000));
+		TALKS.put("22", new ShoutInfo(MESSAGES[20], "23", 400));
+		TALKS.put("25", new ShoutInfo(MESSAGES[21], "26", 5000));
+		TALKS.put("26", new ShoutInfo(MESSAGES[22], "27", 5400));
 		
-		walks.put("npc1_1", new WalkInfo(new Location(-56546, -56384, -2008, 0), "npc1_2", 1200));
-		walks.put("npc1_2", new WalkInfo(new Location(-56597, -56384, -2008, 0), "npc1_3", 1200));
-		walks.put("npc1_3", new WalkInfo(new Location(-56596, -56428, -2008, 0), "npc1_4", 1200));
-		walks.put("npc1_4", new WalkInfo(new Location(-56593, -56474, -2008, 0), "npc1_5", 1000));
-		walks.put("npc1_5", new WalkInfo(new Location(-56542, -56474, -2008, 0), "npc1_6", 1000));
-		walks.put("npc1_6", new WalkInfo(new Location(-56493, -56473, -2008, 0), "npc1_7", 2000));
-		walks.put("npc1_7", new WalkInfo(new Location(-56495, -56425, -2008, 0), "npc1_1", 4000));
-		walks.put("npc2_1", new WalkInfo(new Location(-56550, -56291, -2008, 0), "npc2_2", 1200));
-		walks.put("npc2_2", new WalkInfo(new Location(-56601, -56293, -2008, 0), "npc2_3", 1200));
-		walks.put("npc2_3", new WalkInfo(new Location(-56603, -56247, -2008, 0), "npc2_4", 1200));
-		walks.put("npc2_4", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc2_5", 1000));
-		walks.put("npc2_5", new WalkInfo(new Location(-56553, -56202, -2008, 0), "npc2_6", 1100));
-		walks.put("npc2_6", new WalkInfo(new Location(-56504, -56200, -2008, 0), "npc2_7", 2000));
-		walks.put("npc2_7", new WalkInfo(new Location(-56503, -56243, -2008, 0), "npc2_1", 4000));
-		walks.put("npc3_1", new WalkInfo(new Location(-56500, -56290, -2008, 0), "npc3_2", 1200));
-		walks.put("npc3_2", new WalkInfo(new Location(-56551, -56313, -2008, 0), "npc3_3", 1200));
-		walks.put("npc3_3", new WalkInfo(new Location(-56601, -56293, -2008, 0), "npc3_4", 1200));
-		walks.put("npc3_4", new WalkInfo(new Location(-56651, -56294, -2008, 0), "npc3_5", 1200));
-		walks.put("npc3_5", new WalkInfo(new Location(-56653, -56250, -2008, 0), "npc3_6", 1200));
-		walks.put("npc3_6", new WalkInfo(new Location(-56654, -56204, -2008, 0), "npc3_7", 1200));
-		walks.put("npc3_7", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc3_8", 1200));
-		walks.put("npc3_8", new WalkInfo(new Location(-56554, -56202, -2008, 0), "npc3_9", 1200));
-		walks.put("npc3_9", new WalkInfo(new Location(-56503, -56200, -2008, 0), "npc3_10", 1200));
-		walks.put("npc3_10", new WalkInfo(new Location(-56502, -56244, -2008, 0), "npc3_1", 900));
-		walks.put("npc4_1", new WalkInfo(new Location(-56495, -56381, -2008, 0), "npc4_2", 1200));
-		walks.put("npc4_2", new WalkInfo(new Location(-56548, -56383, -2008, 0), "npc4_3", 1200));
-		walks.put("npc4_3", new WalkInfo(new Location(-56597, -56383, -2008, 0), "npc4_4", 1200));
-		walks.put("npc4_4", new WalkInfo(new Location(-56643, -56385, -2008, 0), "npc4_5", 1200));
-		walks.put("npc4_5", new WalkInfo(new Location(-56639, -56436, -2008, 0), "npc4_6", 1200));
-		walks.put("npc4_6", new WalkInfo(new Location(-56639, -56473, -2008, 0), "npc4_7", 1200));
-		walks.put("npc4_7", new WalkInfo(new Location(-56589, -56473, -2008, 0), "npc4_8", 1200));
-		walks.put("npc4_8", new WalkInfo(new Location(-56541, -56473, -2008, 0), "npc4_9", 1200));
-		walks.put("npc4_9", new WalkInfo(new Location(-56496, -56473, -2008, 0), "npc4_10", 1200));
-		walks.put("npc4_10", new WalkInfo(new Location(-56496, -56429, -2008, 0), "npc4_1", 900));
-		walks.put("npc5_1", new WalkInfo(new Location(-56549, -56335, -2008, 0), "npc5_2", 1000));
-		walks.put("npc5_2", new WalkInfo(new Location(-56599, -56337, -2008, 0), "npc5_3", 2000));
-		walks.put("npc5_3", new WalkInfo(new Location(-56649, -56341, -2008, 0), "npc5_4", 26000));
-		walks.put("npc5_4", new WalkInfo(new Location(-56600, -56341, -2008, 0), "npc5_5", 1000));
-		walks.put("npc5_5", new WalkInfo(new Location(-56553, -56341, -2008, 0), "npc5_6", 1000));
-		walks.put("npc5_6", new WalkInfo(new Location(-56508, -56331, -2008, 0), "npc5_2", 8000));
-		walks.put("npc6_1", new WalkInfo(new Location(-56595, -56428, -2008, 0), "npc6_2", 1000));
-		walks.put("npc6_2", new WalkInfo(new Location(-56596, -56383, -2008, 0), "npc6_3", 1000));
-		walks.put("npc6_3", new WalkInfo(new Location(-56648, -56384, -2008, 0), "npc6_4", 1000));
-		walks.put("npc6_4", new WalkInfo(new Location(-56645, -56429, -2008, 0), "npc6_5", 1000));
-		walks.put("npc6_5", new WalkInfo(new Location(-56644, -56475, -2008, 0), "npc6_6", 1000));
-		walks.put("npc6_6", new WalkInfo(new Location(-56595, -56473, -2008, 0), "npc6_7", 1000));
-		walks.put("npc6_7", new WalkInfo(new Location(-56542, -56473, -2008, 0), "npc6_8", 1000));
-		walks.put("npc6_8", new WalkInfo(new Location(-56492, -56472, -2008, 0), "npc6_9", 1200));
-		walks.put("npc6_9", new WalkInfo(new Location(-56495, -56426, -2008, 0), "npc6_10", 2000));
-		walks.put("npc6_10", new WalkInfo(new Location(-56540, -56426, -2008, 0), "npc6_1", 3000));
-		walks.put("npc7_1", new WalkInfo(new Location(-56603, -56249, -2008, 0), "npc7_2", 1000));
-		walks.put("npc7_2", new WalkInfo(new Location(-56601, -56294, -2008, 0), "npc7_3", 1000));
-		walks.put("npc7_3", new WalkInfo(new Location(-56651, -56295, -2008, 0), "npc7_4", 1000));
-		walks.put("npc7_4", new WalkInfo(new Location(-56653, -56248, -2008, 0), "npc7_5", 1000));
-		walks.put("npc7_5", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc7_6", 1000));
-		walks.put("npc7_6", new WalkInfo(new Location(-56554, -56202, -2008, 0), "npc7_7", 1000));
-		walks.put("npc7_7", new WalkInfo(new Location(-56504, -56201, -2008, 0), "npc7_8", 1000));
-		walks.put("npc7_8", new WalkInfo(new Location(-56502, -56247, -2008, 0), "npc7_9", 1200));
-		walks.put("npc7_9", new WalkInfo(new Location(-56549, -56248, -2008, 0), "npc7_10", 2000));
-		walks.put("npc7_10", new WalkInfo(new Location(-56549, -56248, -2008, 0), "npc7_1", 3000));
-		walks.put("npc8_1", new WalkInfo(new Location(-56493, -56426, -2008, 0), "npc8_2", 1000));
-		walks.put("npc8_2", new WalkInfo(new Location(-56497, -56381, -2008, 0), "npc8_3", 1200));
-		walks.put("npc8_3", new WalkInfo(new Location(-56544, -56381, -2008, 0), "npc8_4", 1200));
-		walks.put("npc8_4", new WalkInfo(new Location(-56596, -56383, -2008, 0), "npc8_5", 1200));
-		walks.put("npc8_5", new WalkInfo(new Location(-56594, -56428, -2008, 0), "npc8_6", 900));
-		walks.put("npc8_6", new WalkInfo(new Location(-56645, -56429, -2008, 0), "npc8_7", 1200));
-		walks.put("npc8_7", new WalkInfo(new Location(-56647, -56384, -2008, 0), "npc8_8", 1200));
-		walks.put("npc8_8", new WalkInfo(new Location(-56649, -56362, -2008, 0), "npc8_9", 9200));
-		walks.put("npc8_9", new WalkInfo(new Location(-56654, -56429, -2008, 0), "npc8_10", 1200));
-		walks.put("npc8_10", new WalkInfo(new Location(-56644, -56474, -2008, 0), "npc8_11", 900));
-		walks.put("npc8_11", new WalkInfo(new Location(-56593, -56473, -2008, 0), "npc8_12", 1100));
-		walks.put("npc8_12", new WalkInfo(new Location(-56543, -56472, -2008, 0), "npc8_13", 1200));
-		walks.put("npc8_13", new WalkInfo(new Location(-56491, -56471, -2008, 0), "npc8_1", 1200));
-		walks.put("npc9_1", new WalkInfo(new Location(-56505, -56246, -2008, 0), "npc9_2", 1000));
-		walks.put("npc9_2", new WalkInfo(new Location(-56504, -56291, -2008, 0), "npc9_3", 1200));
-		walks.put("npc9_3", new WalkInfo(new Location(-56550, -56291, -2008, 0), "npc9_4", 1200));
-		walks.put("npc9_4", new WalkInfo(new Location(-56600, -56292, -2008, 0), "npc9_5", 1200));
-		walks.put("npc9_5", new WalkInfo(new Location(-56603, -56248, -2008, 0), "npc9_6", 900));
-		walks.put("npc9_6", new WalkInfo(new Location(-56653, -56249, -2008, 0), "npc9_7", 1200));
-		walks.put("npc9_7", new WalkInfo(new Location(-56651, -56294, -2008, 0), "npc9_8", 1200));
-		walks.put("npc9_8", new WalkInfo(new Location(-56650, -56316, -2008, 0), "npc9_9", 9200));
-		walks.put("npc9_9", new WalkInfo(new Location(-56660, -56250, -2008, 0), "npc9_10", 1200));
-		walks.put("npc9_10", new WalkInfo(new Location(-56656, -56205, -2008, 0), "npc9_11", 900));
-		walks.put("npc9_11", new WalkInfo(new Location(-56606, -56204, -2008, 0), "npc9_12", 1100));
-		walks.put("npc9_12", new WalkInfo(new Location(-56554, -56203, -2008, 0), "npc9_13", 1200));
-		walks.put("npc9_13", new WalkInfo(new Location(-56506, -56203, -2008, 0), "npc9_1", 1200));
-		walks.put("24", new WalkInfo(new Location(-56730, -56340, -2008, 0), "25", 1800));
-		walks.put("27", new WalkInfo(new Location(-56702, -56340, -2008, 0), "29", 1800));
+		WALKS.put("npc1_1", new WalkInfo(new Location(-56546, -56384, -2008, 0), "npc1_2", 1200));
+		WALKS.put("npc1_2", new WalkInfo(new Location(-56597, -56384, -2008, 0), "npc1_3", 1200));
+		WALKS.put("npc1_3", new WalkInfo(new Location(-56596, -56428, -2008, 0), "npc1_4", 1200));
+		WALKS.put("npc1_4", new WalkInfo(new Location(-56593, -56474, -2008, 0), "npc1_5", 1000));
+		WALKS.put("npc1_5", new WalkInfo(new Location(-56542, -56474, -2008, 0), "npc1_6", 1000));
+		WALKS.put("npc1_6", new WalkInfo(new Location(-56493, -56473, -2008, 0), "npc1_7", 2000));
+		WALKS.put("npc1_7", new WalkInfo(new Location(-56495, -56425, -2008, 0), "npc1_1", 4000));
+		WALKS.put("npc2_1", new WalkInfo(new Location(-56550, -56291, -2008, 0), "npc2_2", 1200));
+		WALKS.put("npc2_2", new WalkInfo(new Location(-56601, -56293, -2008, 0), "npc2_3", 1200));
+		WALKS.put("npc2_3", new WalkInfo(new Location(-56603, -56247, -2008, 0), "npc2_4", 1200));
+		WALKS.put("npc2_4", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc2_5", 1000));
+		WALKS.put("npc2_5", new WalkInfo(new Location(-56553, -56202, -2008, 0), "npc2_6", 1100));
+		WALKS.put("npc2_6", new WalkInfo(new Location(-56504, -56200, -2008, 0), "npc2_7", 2000));
+		WALKS.put("npc2_7", new WalkInfo(new Location(-56503, -56243, -2008, 0), "npc2_1", 4000));
+		WALKS.put("npc3_1", new WalkInfo(new Location(-56500, -56290, -2008, 0), "npc3_2", 1200));
+		WALKS.put("npc3_2", new WalkInfo(new Location(-56551, -56313, -2008, 0), "npc3_3", 1200));
+		WALKS.put("npc3_3", new WalkInfo(new Location(-56601, -56293, -2008, 0), "npc3_4", 1200));
+		WALKS.put("npc3_4", new WalkInfo(new Location(-56651, -56294, -2008, 0), "npc3_5", 1200));
+		WALKS.put("npc3_5", new WalkInfo(new Location(-56653, -56250, -2008, 0), "npc3_6", 1200));
+		WALKS.put("npc3_6", new WalkInfo(new Location(-56654, -56204, -2008, 0), "npc3_7", 1200));
+		WALKS.put("npc3_7", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc3_8", 1200));
+		WALKS.put("npc3_8", new WalkInfo(new Location(-56554, -56202, -2008, 0), "npc3_9", 1200));
+		WALKS.put("npc3_9", new WalkInfo(new Location(-56503, -56200, -2008, 0), "npc3_10", 1200));
+		WALKS.put("npc3_10", new WalkInfo(new Location(-56502, -56244, -2008, 0), "npc3_1", 900));
+		WALKS.put("npc4_1", new WalkInfo(new Location(-56495, -56381, -2008, 0), "npc4_2", 1200));
+		WALKS.put("npc4_2", new WalkInfo(new Location(-56548, -56383, -2008, 0), "npc4_3", 1200));
+		WALKS.put("npc4_3", new WalkInfo(new Location(-56597, -56383, -2008, 0), "npc4_4", 1200));
+		WALKS.put("npc4_4", new WalkInfo(new Location(-56643, -56385, -2008, 0), "npc4_5", 1200));
+		WALKS.put("npc4_5", new WalkInfo(new Location(-56639, -56436, -2008, 0), "npc4_6", 1200));
+		WALKS.put("npc4_6", new WalkInfo(new Location(-56639, -56473, -2008, 0), "npc4_7", 1200));
+		WALKS.put("npc4_7", new WalkInfo(new Location(-56589, -56473, -2008, 0), "npc4_8", 1200));
+		WALKS.put("npc4_8", new WalkInfo(new Location(-56541, -56473, -2008, 0), "npc4_9", 1200));
+		WALKS.put("npc4_9", new WalkInfo(new Location(-56496, -56473, -2008, 0), "npc4_10", 1200));
+		WALKS.put("npc4_10", new WalkInfo(new Location(-56496, -56429, -2008, 0), "npc4_1", 900));
+		WALKS.put("npc5_1", new WalkInfo(new Location(-56549, -56335, -2008, 0), "npc5_2", 1000));
+		WALKS.put("npc5_2", new WalkInfo(new Location(-56599, -56337, -2008, 0), "npc5_3", 2000));
+		WALKS.put("npc5_3", new WalkInfo(new Location(-56649, -56341, -2008, 0), "npc5_4", 26000));
+		WALKS.put("npc5_4", new WalkInfo(new Location(-56600, -56341, -2008, 0), "npc5_5", 1000));
+		WALKS.put("npc5_5", new WalkInfo(new Location(-56553, -56341, -2008, 0), "npc5_6", 1000));
+		WALKS.put("npc5_6", new WalkInfo(new Location(-56508, -56331, -2008, 0), "npc5_2", 8000));
+		WALKS.put("npc6_1", new WalkInfo(new Location(-56595, -56428, -2008, 0), "npc6_2", 1000));
+		WALKS.put("npc6_2", new WalkInfo(new Location(-56596, -56383, -2008, 0), "npc6_3", 1000));
+		WALKS.put("npc6_3", new WalkInfo(new Location(-56648, -56384, -2008, 0), "npc6_4", 1000));
+		WALKS.put("npc6_4", new WalkInfo(new Location(-56645, -56429, -2008, 0), "npc6_5", 1000));
+		WALKS.put("npc6_5", new WalkInfo(new Location(-56644, -56475, -2008, 0), "npc6_6", 1000));
+		WALKS.put("npc6_6", new WalkInfo(new Location(-56595, -56473, -2008, 0), "npc6_7", 1000));
+		WALKS.put("npc6_7", new WalkInfo(new Location(-56542, -56473, -2008, 0), "npc6_8", 1000));
+		WALKS.put("npc6_8", new WalkInfo(new Location(-56492, -56472, -2008, 0), "npc6_9", 1200));
+		WALKS.put("npc6_9", new WalkInfo(new Location(-56495, -56426, -2008, 0), "npc6_10", 2000));
+		WALKS.put("npc6_10", new WalkInfo(new Location(-56540, -56426, -2008, 0), "npc6_1", 3000));
+		WALKS.put("npc7_1", new WalkInfo(new Location(-56603, -56249, -2008, 0), "npc7_2", 1000));
+		WALKS.put("npc7_2", new WalkInfo(new Location(-56601, -56294, -2008, 0), "npc7_3", 1000));
+		WALKS.put("npc7_3", new WalkInfo(new Location(-56651, -56295, -2008, 0), "npc7_4", 1000));
+		WALKS.put("npc7_4", new WalkInfo(new Location(-56653, -56248, -2008, 0), "npc7_5", 1000));
+		WALKS.put("npc7_5", new WalkInfo(new Location(-56605, -56203, -2008, 0), "npc7_6", 1000));
+		WALKS.put("npc7_6", new WalkInfo(new Location(-56554, -56202, -2008, 0), "npc7_7", 1000));
+		WALKS.put("npc7_7", new WalkInfo(new Location(-56504, -56201, -2008, 0), "npc7_8", 1000));
+		WALKS.put("npc7_8", new WalkInfo(new Location(-56502, -56247, -2008, 0), "npc7_9", 1200));
+		WALKS.put("npc7_9", new WalkInfo(new Location(-56549, -56248, -2008, 0), "npc7_10", 2000));
+		WALKS.put("npc7_10", new WalkInfo(new Location(-56549, -56248, -2008, 0), "npc7_1", 3000));
+		WALKS.put("npc8_1", new WalkInfo(new Location(-56493, -56426, -2008, 0), "npc8_2", 1000));
+		WALKS.put("npc8_2", new WalkInfo(new Location(-56497, -56381, -2008, 0), "npc8_3", 1200));
+		WALKS.put("npc8_3", new WalkInfo(new Location(-56544, -56381, -2008, 0), "npc8_4", 1200));
+		WALKS.put("npc8_4", new WalkInfo(new Location(-56596, -56383, -2008, 0), "npc8_5", 1200));
+		WALKS.put("npc8_5", new WalkInfo(new Location(-56594, -56428, -2008, 0), "npc8_6", 900));
+		WALKS.put("npc8_6", new WalkInfo(new Location(-56645, -56429, -2008, 0), "npc8_7", 1200));
+		WALKS.put("npc8_7", new WalkInfo(new Location(-56647, -56384, -2008, 0), "npc8_8", 1200));
+		WALKS.put("npc8_8", new WalkInfo(new Location(-56649, -56362, -2008, 0), "npc8_9", 9200));
+		WALKS.put("npc8_9", new WalkInfo(new Location(-56654, -56429, -2008, 0), "npc8_10", 1200));
+		WALKS.put("npc8_10", new WalkInfo(new Location(-56644, -56474, -2008, 0), "npc8_11", 900));
+		WALKS.put("npc8_11", new WalkInfo(new Location(-56593, -56473, -2008, 0), "npc8_12", 1100));
+		WALKS.put("npc8_12", new WalkInfo(new Location(-56543, -56472, -2008, 0), "npc8_13", 1200));
+		WALKS.put("npc8_13", new WalkInfo(new Location(-56491, -56471, -2008, 0), "npc8_1", 1200));
+		WALKS.put("npc9_1", new WalkInfo(new Location(-56505, -56246, -2008, 0), "npc9_2", 1000));
+		WALKS.put("npc9_2", new WalkInfo(new Location(-56504, -56291, -2008, 0), "npc9_3", 1200));
+		WALKS.put("npc9_3", new WalkInfo(new Location(-56550, -56291, -2008, 0), "npc9_4", 1200));
+		WALKS.put("npc9_4", new WalkInfo(new Location(-56600, -56292, -2008, 0), "npc9_5", 1200));
+		WALKS.put("npc9_5", new WalkInfo(new Location(-56603, -56248, -2008, 0), "npc9_6", 900));
+		WALKS.put("npc9_6", new WalkInfo(new Location(-56653, -56249, -2008, 0), "npc9_7", 1200));
+		WALKS.put("npc9_7", new WalkInfo(new Location(-56651, -56294, -2008, 0), "npc9_8", 1200));
+		WALKS.put("npc9_8", new WalkInfo(new Location(-56650, -56316, -2008, 0), "npc9_9", 9200));
+		WALKS.put("npc9_9", new WalkInfo(new Location(-56660, -56250, -2008, 0), "npc9_10", 1200));
+		WALKS.put("npc9_10", new WalkInfo(new Location(-56656, -56205, -2008, 0), "npc9_11", 900));
+		WALKS.put("npc9_11", new WalkInfo(new Location(-56606, -56204, -2008, 0), "npc9_12", 1100));
+		WALKS.put("npc9_12", new WalkInfo(new Location(-56554, -56203, -2008, 0), "npc9_13", 1200));
+		WALKS.put("npc9_13", new WalkInfo(new Location(-56506, -56203, -2008, 0), "npc9_1", 1200));
+		WALKS.put("24", new WalkInfo(new Location(-56730, -56340, -2008, 0), "25", 1800));
+		WALKS.put("27", new WalkInfo(new Location(-56702, -56340, -2008, 0), "29", 1800));
 	}
 	
 	private void scheduleTimer()
@@ -487,18 +487,18 @@ public class MC_Show extends AbstractNpcAI
 			}
 			else
 			{
-				if (talks.containsKey(event))
+				if (TALKS.containsKey(event))
 				{
-					final ShoutInfo si = talks.get(event);
+					final ShoutInfo si = TALKS.get(event);
 					if (si != null)
 					{
 						autoChat(npc, si.getNpcStringId(), Say2.NPC_SHOUT);
 						startQuestTimer(si.getNextEvent(), si.getTime(), npc, null);
 					}
 				}
-				else if (walks.containsKey(event))
+				else if (WALKS.containsKey(event))
 				{
-					final WalkInfo wi = walks.get(event);
+					final WalkInfo wi = WALKS.get(event);
 					if (wi != null)
 					{
 						npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, wi.getCharPos());

+ 1 - 1
L2J_DataPack/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 

+ 3 - 4
L2J_DataPack/dist/game/data/scripts/ai/group_template/AltarsOfSacrifice.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -23,7 +23,6 @@ import java.util.logging.Level;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.GeoData;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -32,7 +31,7 @@ import com.l2jserver.gameserver.model.interfaces.ILocational;
 import com.l2jserver.util.Rnd;
 
 /**
- * @author FBIagent, janiko, FinalDestination, lion
+ * @author HorridoJoho, janiko, FinalDestination, lion
  */
 public final class AltarsOfSacrifice extends AbstractNpcAI
 {
@@ -56,7 +55,7 @@ public final class AltarsOfSacrifice extends AbstractNpcAI
 				throw new IllegalStateException();
 			}
 			
-			final L2Spawn spawn = new L2Spawn(NpcData.getInstance().getTemplate(_bossNpcIds[Rnd.get(_bossNpcIds.length)]));
+			final L2Spawn spawn = new L2Spawn(_bossNpcIds[Rnd.get(_bossNpcIds.length)]);
 			spawn.setAmount(1);
 			spawn.setHeading(Rnd.get(65536));
 			

+ 42 - 45
L2J_DataPack/dist/game/data/scripts/ai/group_template/BeastFarm.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -19,23 +19,21 @@
 package ai.group_template;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-import javolution.util.FastMap;
 import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SkillData;
-import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.serverpackets.AbstractNpcInfo;
@@ -46,7 +44,7 @@ import com.l2jserver.gameserver.util.Util;
  * Updated to Freya.
  * @author Fulminus, Gigiikun
  */
-public class BeastFarm extends AbstractNpcAI
+public final class BeastFarm extends AbstractNpcAI
 {
 	private static final int GOLDEN_SPICE = 15474;
 	private static final int CRYSTAL_SPICE = 15475;
@@ -107,8 +105,8 @@ public class BeastFarm extends AbstractNpcAI
 		18900
 	};
 	
-	private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
-	private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
+	private static final Map<Integer, Integer> FEED_INFO = new ConcurrentHashMap<>();
+	private static final Map<Integer, GrowthCapableMob> GROWTH_CAPABLE_MONSTERS = new HashMap<>();
 	private static List<TamedBeast> TAMED_BEAST_DATA = new ArrayList<>();
 	
 	private BeastFarm()
@@ -127,23 +125,23 @@ public class BeastFarm extends AbstractNpcAI
 		temp.addNpcIdForSkillId(SKILL_BLESSED_CRYSTAL_SPICE, 18869);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_GOLDEN_SPICE, 18878);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_CRYSTAL_SPICE, 18879);
-		_GrowthCapableMobs.put(18873, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18873, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18869);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18876);
-		_GrowthCapableMobs.put(18874, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18874, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18869);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18877);
-		_GrowthCapableMobs.put(18875, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18875, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18869);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18878);
-		_GrowthCapableMobs.put(18876, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18876, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18869);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18879);
-		_GrowthCapableMobs.put(18877, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18877, temp);
 		
 		// Cougar
 		temp = new GrowthCapableMob(100, 0, 18870);
@@ -153,23 +151,23 @@ public class BeastFarm extends AbstractNpcAI
 		temp.addNpcIdForSkillId(SKILL_BLESSED_CRYSTAL_SPICE, 18870);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_GOLDEN_SPICE, 18885);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_CRYSTAL_SPICE, 18886);
-		_GrowthCapableMobs.put(18880, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18880, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18870);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18883);
-		_GrowthCapableMobs.put(18881, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18881, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18870);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18884);
-		_GrowthCapableMobs.put(18882, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18882, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18870);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18885);
-		_GrowthCapableMobs.put(18883, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18883, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18870);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18886);
-		_GrowthCapableMobs.put(18884, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18884, temp);
 		
 		// Buffalo
 		temp = new GrowthCapableMob(100, 0, 18871);
@@ -179,23 +177,23 @@ public class BeastFarm extends AbstractNpcAI
 		temp.addNpcIdForSkillId(SKILL_BLESSED_CRYSTAL_SPICE, 18871);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_GOLDEN_SPICE, 18892);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_CRYSTAL_SPICE, 18893);
-		_GrowthCapableMobs.put(18887, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18887, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18871);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18890);
-		_GrowthCapableMobs.put(18888, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18888, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18871);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18891);
-		_GrowthCapableMobs.put(18889, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18889, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18871);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18892);
-		_GrowthCapableMobs.put(18890, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18890, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18871);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18893);
-		_GrowthCapableMobs.put(18891, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18891, temp);
 		
 		// Grendel
 		temp = new GrowthCapableMob(100, 0, 18872);
@@ -205,23 +203,23 @@ public class BeastFarm extends AbstractNpcAI
 		temp.addNpcIdForSkillId(SKILL_BLESSED_CRYSTAL_SPICE, 18872);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_GOLDEN_SPICE, 18899);
 		temp.addNpcIdForSkillId(SKILL_SGRADE_CRYSTAL_SPICE, 18900);
-		_GrowthCapableMobs.put(18894, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18894, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18872);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18897);
-		_GrowthCapableMobs.put(18895, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18895, temp);
 		
 		temp = new GrowthCapableMob(40, 1, 18872);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18898);
-		_GrowthCapableMobs.put(18896, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18896, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18872);
 		temp.addNpcIdForSkillId(SKILL_GOLDEN_SPICE, 18899);
-		_GrowthCapableMobs.put(18897, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18897, temp);
 		
 		temp = new GrowthCapableMob(25, 2, 18872);
 		temp.addNpcIdForSkillId(SKILL_CRYSTAL_SPICE, 18900);
-		_GrowthCapableMobs.put(18898, temp);
+		GROWTH_CAPABLE_MONSTERS.put(18898, temp);
 		
 		// Tamed beasts data
 		TAMED_BEAST_DATA.add(new TamedBeast("%name% of Focus", new SkillHolder(6432, 1), new SkillHolder(6668, 1)));
@@ -235,11 +233,11 @@ public class BeastFarm extends AbstractNpcAI
 	public void spawnNext(L2Npc npc, L2PcInstance player, int nextNpcId, int food)
 	{
 		// remove the feedinfo of the mob that got despawned, if any
-		if (_FeedInfo.containsKey(npc.getObjectId()))
+		if (FEED_INFO.containsKey(npc.getObjectId()))
 		{
-			if (_FeedInfo.get(npc.getObjectId()) == player.getObjectId())
+			if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
 			{
-				_FeedInfo.remove(npc.getObjectId());
+				FEED_INFO.remove(npc.getObjectId());
 			}
 		}
 		// despawn the old mob
@@ -254,8 +252,7 @@ public class BeastFarm extends AbstractNpcAI
 		// player might have and initialize the Tamed Beast.
 		if (Util.contains(TAMED_BEASTS, nextNpcId))
 		{
-			L2NpcTemplate template = NpcData.getInstance().getTemplate(nextNpcId);
-			L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(IdFactory.getInstance().getNextId(), template, player, food, npc.getX(), npc.getY(), npc.getZ(), true);
+			final L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(nextNpcId, player, food, npc.getX(), npc.getY(), npc.getZ(), true);
 			
 			TamedBeast beast = TAMED_BEAST_DATA.get(getRandom(TAMED_BEAST_DATA.size()));
 			String name = beast.getName();
@@ -293,7 +290,7 @@ public class BeastFarm extends AbstractNpcAI
 			L2Attackable nextNpc = (L2Attackable) addSpawn(nextNpcId, npc);
 			
 			// register the player in the feedinfo for the mob that just spawned
-			_FeedInfo.put(nextNpc.getObjectId(), player.getObjectId());
+			FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
 			nextNpc.setRunning();
 			nextNpc.addDamageHate(player, 0, 99999);
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
@@ -323,19 +320,19 @@ public class BeastFarm extends AbstractNpcAI
 		// first gather some values on local variables
 		int objectId = npc.getObjectId();
 		int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
-		if (_GrowthCapableMobs.containsKey(npcId))
+		if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
 		{
-			growthLevel = _GrowthCapableMobs.get(npcId).getGrowthLevel();
+			growthLevel = GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel();
 		}
 		
 		// prevent exploit which allows 2 players to simultaneously raise the same 0-growth beast
 		// If the mob is at 0th level (when it still listens to all feeders) lock it to the first feeder!
-		if ((growthLevel == 0) && _FeedInfo.containsKey(objectId))
+		if ((growthLevel == 0) && FEED_INFO.containsKey(objectId))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
 		
-		_FeedInfo.put(objectId, caster.getObjectId());
+		FEED_INFO.put(objectId, caster.getObjectId());
 		
 		// display the social action of the beast eating the food.
 		npc.broadcastSocialAction(2);
@@ -351,22 +348,22 @@ public class BeastFarm extends AbstractNpcAI
 		}
 		
 		// if this pet can't grow, it's all done.
-		if (_GrowthCapableMobs.containsKey(npcId))
+		if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
 		{
 			// do nothing if this mob doesn't eat the specified food (food gets consumed but has no effect).
-			int newNpcId = _GrowthCapableMobs.get(npcId).getLeveledNpcId(skillId);
+			int newNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getLeveledNpcId(skillId);
 			if (newNpcId == -1)
 			{
 				if (growthLevel == 0)
 				{
-					_FeedInfo.remove(objectId);
+					FEED_INFO.remove(objectId);
 					npc.setRunning();
 					((L2Attackable) npc).addDamageHate(caster, 0, 1);
 					npc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, caster);
 				}
 				return super.onSkillSee(npc, caster, skill, targets, isSummon);
 			}
-			else if ((growthLevel > 0) && (_FeedInfo.get(objectId) != caster.getObjectId()))
+			else if ((growthLevel > 0) && (FEED_INFO.get(objectId) != caster.getObjectId()))
 			{
 				// check if this is the same player as the one who raised it from growth 0.
 				// if no, then do not allow a chance to raise the pet (food gets consumed but has no effect).
@@ -386,9 +383,9 @@ public class BeastFarm extends AbstractNpcAI
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		// remove the feedinfo of the mob that got killed, if any
-		if (_FeedInfo.containsKey(npc.getObjectId()))
+		if (FEED_INFO.containsKey(npc.getObjectId()))
 		{
-			_FeedInfo.remove(npc.getObjectId());
+			FEED_INFO.remove(npc.getObjectId());
 		}
 		return super.onKill(npc, killer, isSummon);
 	}
@@ -399,7 +396,7 @@ public class BeastFarm extends AbstractNpcAI
 		private final int _chance;
 		private final int _growthLevel;
 		private final int _tameNpcId;
-		private final Map<Integer, Integer> _skillSuccessNpcIdList = new FastMap<>();
+		private final Map<Integer, Integer> _skillSuccessNpcIdList = new HashMap<>();
 		
 		public GrowthCapableMob(int chance, int growthLevel, int tameNpcId)
 		{

+ 2 - 2
L2J_DataPack/dist/game/data/scripts/ai/group_template/DenOfEvil.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.util.Util;
  * Dummy AI for spawns/respawns only for testing.
  * @author Gnacik
  */
-public class DenOfEvil extends AbstractNpcAI
+public final class DenOfEvil extends AbstractNpcAI
 {
 	// private static final int _buffer_id = 32656;
 	protected static final int[] EYE_IDS =

+ 9 - 9
L2J_DataPack/dist/game/data/scripts/ai/group_template/DragonValley.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -175,8 +175,8 @@ public final class DragonValley extends AbstractNpcAI
 				for (int i = 0; i < rnd; i++)
 				{
 					final L2Playable playable = isSummon ? attacker.getSummon() : attacker;
-					final L2Attackable minion = (L2Attackable) addSpawn(DRAKOS_ASSASSIN, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), true, 0, true);
-					attackPlayer(minion, playable);
+					final L2Npc minion = addSpawn(DRAKOS_ASSASSIN, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), true, 0, true);
+					addAttackPlayerDesire(minion, playable);
 				}
 			}
 		}
@@ -190,7 +190,7 @@ public final class DragonValley extends AbstractNpcAI
 		{
 			spawnGhost(npc, killer, isSummon, 20);
 		}
-		else if (((L2Attackable) npc).isSweepActive())
+		else if (((L2Attackable) npc).isSpoiled())
 		{
 			npc.dropItem(killer, getRandom(GREATER_HERB_OF_MANA, SUPERIOR_HERB_OF_MANA), 1);
 			manageMoraleBoost(killer, npc);
@@ -278,14 +278,14 @@ public final class DragonValley extends AbstractNpcAI
 		{
 			int val = npc.getScriptValue();
 			final L2Playable attacker = isSummon ? player.getSummon() : player;
-			final L2Attackable Ghost1 = (L2Attackable) addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
-			Ghost1.getVariables().set("playable", attacker);
-			attackPlayer(Ghost1, attacker);
+			final L2Npc ghost1 = addSpawn(EXPLODING_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 10, npc.getHeading(), false, 0, true);
+			ghost1.getVariables().set("playable", attacker);
+			addAttackPlayerDesire(ghost1, attacker);
 			val++;
 			if ((val < 2) && (getRandomBoolean()))
 			{
-				final L2Attackable Ghost2 = (L2Attackable) addSpawn(WRATHFUL_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 20, npc.getHeading(), false, 0, false);
-				attackPlayer(Ghost2, attacker);
+				final L2Npc ghost2 = addSpawn(WRATHFUL_ORC_GHOST, npc.getX(), npc.getY(), npc.getZ() + 20, npc.getHeading(), false, 0, false);
+				addAttackPlayerDesire(ghost2, attacker);
 				val++;
 			}
 			npc.setScriptValue(val);

+ 5 - 6
L2J_DataPack/dist/game/data/scripts/ai/group_template/FairyTrees.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -20,7 +20,6 @@ package ai.group_template;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -63,13 +62,13 @@ public class FairyTrees extends AbstractNpcAI
 		{
 			for (int i = 0; i < 20; i++)
 			{
-				final L2Attackable Guardian = (L2Attackable) addSpawn(SOUL_GUARDIAN, npc.getX(), npc.getY(), npc.getZ(), npc.getHeading(), false, 30000);
+				final L2Npc guardian = addSpawn(SOUL_GUARDIAN, npc, false, 30000);
 				final L2Playable attacker = isSummon ? killer.getSummon() : killer;
-				attackPlayer(Guardian, attacker);
+				addAttackPlayerDesire(guardian, attacker);
 				if (getRandomBoolean())
 				{
-					Guardian.setTarget(attacker);
-					Guardian.doCast(VENOMOUS_POISON.getSkill());
+					guardian.setTarget(attacker);
+					guardian.doCast(VENOMOUS_POISON.getSkill());
 				}
 			}
 		}

+ 107 - 96
L2J_DataPack/dist/game/data/scripts/ai/group_template/FeedableBeasts.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -18,21 +18,20 @@
  */
 package ai.group_template;
 
+import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
-import javolution.util.FastMap;
 import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
+import quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWildBeasts;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.idfactory.IdFactory;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2TamedBeastInstance;
-import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
@@ -42,17 +41,27 @@ import com.l2jserver.gameserver.util.Util;
  * Growth-capable mobs: Polymorphing upon successful feeding.
  * @author Fulminus
  */
-public class FeedableBeasts extends AbstractNpcAI
+public final class FeedableBeasts extends AbstractNpcAI
 {
 	private static final int GOLDEN_SPICE = 6643;
 	private static final int CRYSTAL_SPICE = 6644;
 	private static final int SKILL_GOLDEN_SPICE = 2188;
 	private static final int SKILL_CRYSTAL_SPICE = 2189;
 	private static final int FOODSKILLDIFF = GOLDEN_SPICE - SKILL_GOLDEN_SPICE;
+	// Tamed Wild Beasts
+	private static final int TRAINED_BUFFALO1 = 16013;
+	private static final int TRAINED_BUFFALO2 = 16014;
+	private static final int TRAINED_COUGAR1 = 16015;
+	private static final int TRAINED_COUGAR2 = 16016;
+	private static final int TRAINED_KOOKABURRA1 = 16017;
+	private static final int TRAINED_KOOKABURRA2 = 16018;
+	// private static final int TRAINED_TINY_BABY_BUFFALO = 16020; // TODO: Implement.
+	// private static final int TRAINED_TINY_BABY_COUGAR = 16022; // TODO: Implement.
+	// private static final int TRAINED_TINY_BABY_KOOKABURRA = 16024; // TODO: Implement.
 	// @formatter:off
 	private static final int[] TAMED_BEASTS =
 	{
-		16013, 16014, 16015, 16016, 16017, 16018
+		TRAINED_BUFFALO1, TRAINED_BUFFALO2, TRAINED_COUGAR1, TRAINED_COUGAR2, TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2
 	};
 	// all mobs that can eat...
 	private static final int[] FEEDABLE_BEASTS =
@@ -63,11 +72,11 @@ public class FeedableBeasts extends AbstractNpcAI
 		21481, 21482, 21483, 21484, 21485, 21486, 21487, 21488, 21489, 21490,
 		21491, 21492, 21493, 21494, 21495, 21496, 21497, 21498, 21499, 21500,
 		21501, 21502, 21503, 21504, 21505, 21506, 21507, 21824, 21825, 21826,
-		21827, 21828, 21829, 16013, 16014, 16015, 16016, 16017, 16018
+		21827, 21828, 21829, TRAINED_BUFFALO1, TRAINED_BUFFALO2, TRAINED_COUGAR1, TRAINED_COUGAR2, TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2
 	};
 	// @formatter:on
 	
-	private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new FastMap<>();
+	private static final Map<Integer, Integer> MAD_COW_POLYMORPH = new HashMap<>();
 	static
 	{
 		MAD_COW_POLYMORPH.put(21824, 21468);
@@ -120,8 +129,8 @@ public class FeedableBeasts extends AbstractNpcAI
 		NpcStringId.ANIMALS_NEED_LOVE_TOO
 	};
 	
-	private static Map<Integer, Integer> _FeedInfo = new FastMap<>();
-	private static Map<Integer, GrowthCapableMob> _GrowthCapableMobs = new FastMap<>();
+	private static final Map<Integer, Integer> FEED_INFO = new ConcurrentHashMap<>();
+	private static final Map<Integer, GrowthCapableMob> GROWTH_CAPABLE_MONSTERS = new HashMap<>();
 	
 	// all mobs that grow by eating
 	private static class GrowthCapableMob
@@ -129,7 +138,7 @@ public class FeedableBeasts extends AbstractNpcAI
 		private final int _growthLevel;
 		private final int _chance;
 		
-		private final Map<Integer, int[][]> _spiceToMob = new FastMap<>();
+		private final Map<Integer, int[][]> _spiceToMob = new HashMap<>();
 		
 		public GrowthCapableMob(int growthLevel, int chance)
 		{
@@ -186,8 +195,8 @@ public class FeedableBeasts extends AbstractNpcAI
 		final int[][] Kookabura_1_Gold_2 = {{ 21461, 21463 }};
 		final int[][] Kookabura_1_Crystal_1 = {{ 21464, 21466 }};
 		final int[][] Kookabura_1_Crystal_2 = {{ 21465, 21467 }};
-		final int[][] Kookabura_2_1 = {{ 21468, 21824}, { 16017, 16018 }};
-		final int[][] Kookabura_2_2 = {{ 21469, 21825}, { 16017, 16018 }};
+		final int[][] Kookabura_2_1 = {{ 21468, 21824}, { TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 }};
+		final int[][] Kookabura_2_2 = {{ 21469, 21825}, { TRAINED_KOOKABURRA1, TRAINED_KOOKABURRA2 }};
 		
 		final int[][] Buffalo_0_Gold = {{ 21471, 21472, 21473, 21474 }};
 		final int[][] Buffalo_0_Crystal = {{ 21475, 21476, 21477, 21478 }};
@@ -195,156 +204,156 @@ public class FeedableBeasts extends AbstractNpcAI
 		final int[][] Buffalo_1_Gold_2 = {{ 21481, 21482 }};
 		final int[][] Buffalo_1_Crystal_1 = {{ 21483, 21485 }};
 		final int[][] Buffalo_1_Crystal_2 = {{ 21484, 21486 }};
-		final int[][] Buffalo_2_1 = {{ 21487,21826}, {16013, 16014 }};
-		final int[][] Buffalo_2_2 = {{ 21488,21827}, {16013, 16014 }};
+		final int[][] Buffalo_2_1 = {{ 21487, 21826}, {TRAINED_BUFFALO1, TRAINED_BUFFALO2 }};
+		final int[][] Buffalo_2_2 = {{ 21488, 21827}, {TRAINED_BUFFALO1, TRAINED_BUFFALO2 }};
 		
 		final int[][] Cougar_0_Gold = {{ 21490, 21491, 21492, 21493 }};
-		final int[][] Cougar_0_Crystal = {{ 21494,21495, 21496, 21497 }};
+		final int[][] Cougar_0_Crystal = {{ 21494, 21495, 21496, 21497 }};
 		final int[][] Cougar_1_Gold_1 = {{ 21498, 21500 }};
 		final int[][] Cougar_1_Gold_2 = {{ 21499, 21501 }};
-		final int[][] Cougar_1_Crystal_1 = {{ 21502,21504 }};
-		final int[][] Cougar_1_Crystal_2 = {{ 21503,21505 }};
-		final int[][] Cougar_2_1 = {{ 21506, 21828 }, { 16015,16016 }};
-		final int[][] Cougar_2_2 = {{ 21507, 21829 }, { 16015,16016 }};
+		final int[][] Cougar_1_Crystal_1 = {{ 21502, 21504 }};
+		final int[][] Cougar_1_Crystal_2 = {{ 21503, 21505 }};
+		final int[][] Cougar_2_1 = {{ 21506, 21828 }, { TRAINED_COUGAR1, TRAINED_COUGAR2 }};
+		final int[][] Cougar_2_2 = {{ 21507, 21829 }, { TRAINED_COUGAR1, TRAINED_COUGAR2 }};
 		//@formatter:on
 		
 		// Alpen Kookabura
 		temp = new GrowthCapableMob(0, 100);
 		temp.addMobs(GOLDEN_SPICE, Kookabura_0_Gold);
 		temp.addMobs(CRYSTAL_SPICE, Kookabura_0_Crystal);
-		_GrowthCapableMobs.put(21451, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21451, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Kookabura_1_Gold_1);
-		_GrowthCapableMobs.put(21452, temp);
-		_GrowthCapableMobs.put(21454, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21452, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21454, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Kookabura_1_Gold_2);
-		_GrowthCapableMobs.put(21453, temp);
-		_GrowthCapableMobs.put(21455, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21453, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21455, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Kookabura_1_Crystal_1);
-		_GrowthCapableMobs.put(21456, temp);
-		_GrowthCapableMobs.put(21458, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21456, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21458, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Kookabura_1_Crystal_2);
-		_GrowthCapableMobs.put(21457, temp);
-		_GrowthCapableMobs.put(21459, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21457, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21459, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Kookabura_2_1);
-		_GrowthCapableMobs.put(21460, temp);
-		_GrowthCapableMobs.put(21462, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21460, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21462, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Kookabura_2_2);
-		_GrowthCapableMobs.put(21461, temp);
-		_GrowthCapableMobs.put(21463, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21461, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21463, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Kookabura_2_1);
-		_GrowthCapableMobs.put(21464, temp);
-		_GrowthCapableMobs.put(21466, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21464, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21466, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Kookabura_2_2);
-		_GrowthCapableMobs.put(21465, temp);
-		_GrowthCapableMobs.put(21467, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21465, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21467, temp);
 		
 		// Alpen Buffalo
 		temp = new GrowthCapableMob(0, 100);
 		temp.addMobs(GOLDEN_SPICE, Buffalo_0_Gold);
 		temp.addMobs(CRYSTAL_SPICE, Buffalo_0_Crystal);
-		_GrowthCapableMobs.put(21470, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21470, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Buffalo_1_Gold_1);
-		_GrowthCapableMobs.put(21471, temp);
-		_GrowthCapableMobs.put(21473, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21471, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21473, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Buffalo_1_Gold_2);
-		_GrowthCapableMobs.put(21472, temp);
-		_GrowthCapableMobs.put(21474, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21472, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21474, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Buffalo_1_Crystal_1);
-		_GrowthCapableMobs.put(21475, temp);
-		_GrowthCapableMobs.put(21477, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21475, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21477, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Buffalo_1_Crystal_2);
-		_GrowthCapableMobs.put(21476, temp);
-		_GrowthCapableMobs.put(21478, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21476, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21478, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Buffalo_2_1);
-		_GrowthCapableMobs.put(21479, temp);
-		_GrowthCapableMobs.put(21481, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21479, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21481, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Buffalo_2_2);
-		_GrowthCapableMobs.put(21480, temp);
-		_GrowthCapableMobs.put(21482, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21480, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21482, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Buffalo_2_1);
-		_GrowthCapableMobs.put(21483, temp);
-		_GrowthCapableMobs.put(21485, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21483, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21485, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Buffalo_2_2);
-		_GrowthCapableMobs.put(21484, temp);
-		_GrowthCapableMobs.put(21486, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21484, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21486, temp);
 		
 		// Alpen Cougar
 		temp = new GrowthCapableMob(0, 100);
 		temp.addMobs(GOLDEN_SPICE, Cougar_0_Gold);
 		temp.addMobs(CRYSTAL_SPICE, Cougar_0_Crystal);
-		_GrowthCapableMobs.put(21489, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21489, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Cougar_1_Gold_1);
-		_GrowthCapableMobs.put(21490, temp);
-		_GrowthCapableMobs.put(21492, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21490, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21492, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(GOLDEN_SPICE, Cougar_1_Gold_2);
-		_GrowthCapableMobs.put(21491, temp);
-		_GrowthCapableMobs.put(21493, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21491, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21493, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Cougar_1_Crystal_1);
-		_GrowthCapableMobs.put(21494, temp);
-		_GrowthCapableMobs.put(21496, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21494, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21496, temp);
 		
 		temp = new GrowthCapableMob(1, 40);
 		temp.addMobs(CRYSTAL_SPICE, Cougar_1_Crystal_2);
-		_GrowthCapableMobs.put(21495, temp);
-		_GrowthCapableMobs.put(21497, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21495, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21497, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Cougar_2_1);
-		_GrowthCapableMobs.put(21498, temp);
-		_GrowthCapableMobs.put(21500, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21498, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21500, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(GOLDEN_SPICE, Cougar_2_2);
-		_GrowthCapableMobs.put(21499, temp);
-		_GrowthCapableMobs.put(21501, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21499, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21501, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Cougar_2_1);
-		_GrowthCapableMobs.put(21502, temp);
-		_GrowthCapableMobs.put(21504, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21502, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21504, temp);
 		
 		temp = new GrowthCapableMob(2, 25);
 		temp.addMobs(CRYSTAL_SPICE, Cougar_2_2);
-		_GrowthCapableMobs.put(21503, temp);
-		_GrowthCapableMobs.put(21505, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21503, temp);
+		GROWTH_CAPABLE_MONSTERS.put(21505, temp);
 	}
 	
 	private void spawnNext(L2Npc npc, int growthLevel, L2PcInstance player, int food)
@@ -360,11 +369,11 @@ public class FeedableBeasts extends AbstractNpcAI
 			{
 				if (player.getClassId().isMage())
 				{
-					nextNpcId = _GrowthCapableMobs.get(npcId).getMob(food, 1, 1);
+					nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 1, 1);
 				}
 				else
 				{
-					nextNpcId = _GrowthCapableMobs.get(npcId).getMob(food, 1, 0);
+					nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 1, 0);
 				}
 			}
 			else
@@ -373,26 +382,26 @@ public class FeedableBeasts extends AbstractNpcAI
 				// that is a stronger-than-normal animal that attacks its feeder
 				if (getRandom(5) == 0)
 				{
-					nextNpcId = _GrowthCapableMobs.get(npcId).getMob(food, 0, 1);
+					nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 1);
 				}
 				else
 				{
-					nextNpcId = _GrowthCapableMobs.get(npcId).getMob(food, 0, 0);
+					nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 0);
 				}
 			}
 		}
 		else
 		{
 			// all other levels of growth are straight-forward
-			nextNpcId = _GrowthCapableMobs.get(npcId).getRandomMob(food);
+			nextNpcId = GROWTH_CAPABLE_MONSTERS.get(npcId).getRandomMob(food);
 		}
 		
 		// remove the feedinfo of the mob that got despawned, if any
-		if (_FeedInfo.containsKey(npc.getObjectId()))
+		if (FEED_INFO.containsKey(npc.getObjectId()))
 		{
-			if (_FeedInfo.get(npc.getObjectId()) == player.getObjectId())
+			if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
 			{
-				_FeedInfo.remove(npc.getObjectId());
+				FEED_INFO.remove(npc.getObjectId());
 			}
 		}
 		// despawn the old mob
@@ -422,11 +431,13 @@ public class FeedableBeasts extends AbstractNpcAI
 				}
 			}
 			
-			L2NpcTemplate template = NpcData.getInstance().getTemplate(nextNpcId);
-			L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(IdFactory.getInstance().getNextId(), template, player, food - FOODSKILLDIFF, npc.getX(), npc.getY(), npc.getZ());
+			final L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(nextNpcId, player, food - FOODSKILLDIFF, npc.getX(), npc.getY(), npc.getZ());
 			nextNpc.setRunning();
 			Q00020_BringUpWithLove.checkJewelOfInnocence(player);
 			
+			// Support for A Grand Plan for Taming Wild Beasts (655) quest.
+			Q00655_AGrandPlanForTamingWildBeasts.reward(player, nextNpc);
+			
 			// also, perform a rare random chat
 			if (getRandom(20) == 0)
 			{
@@ -465,7 +476,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			}
 			
 			// register the player in the feedinfo for the mob that just spawned
-			_FeedInfo.put(nextNpc.getObjectId(), player.getObjectId());
+			FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
 			nextNpc.setRunning();
 			nextNpc.addDamageHate(player, 0, 99999);
 			nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
@@ -480,9 +491,9 @@ public class FeedableBeasts extends AbstractNpcAI
 			if (MAD_COW_POLYMORPH.containsKey(npc.getId()))
 			{
 				// remove the feed info from the previous mob
-				if (_FeedInfo.get(npc.getObjectId()) == player.getObjectId())
+				if (FEED_INFO.get(npc.getObjectId()) == player.getObjectId())
 				{
-					_FeedInfo.remove(npc.getObjectId());
+					FEED_INFO.remove(npc.getObjectId());
 				}
 				// despawn the mad cow
 				npc.deleteMe();
@@ -490,7 +501,7 @@ public class FeedableBeasts extends AbstractNpcAI
 				L2Attackable nextNpc = (L2Attackable) addSpawn(MAD_COW_POLYMORPH.get(npc.getId()), npc);
 				
 				// register the player in the feedinfo for the mob that just spawned
-				_FeedInfo.put(nextNpc.getObjectId(), player.getObjectId());
+				FEED_INFO.put(nextNpc.getObjectId(), player.getObjectId());
 				nextNpc.setRunning();
 				nextNpc.addDamageHate(player, 0, 99999);
 				nextNpc.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, player);
@@ -520,19 +531,19 @@ public class FeedableBeasts extends AbstractNpcAI
 		// first gather some values on local variables
 		int objectId = npc.getObjectId();
 		int growthLevel = 3; // if a mob is in FEEDABLE_BEASTS but not in _GrowthCapableMobs, then it's at max growth (3)
-		if (_GrowthCapableMobs.containsKey(npcId))
+		if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
 		{
-			growthLevel = _GrowthCapableMobs.get(npcId).getGrowthLevel();
+			growthLevel = GROWTH_CAPABLE_MONSTERS.get(npcId).getGrowthLevel();
 		}
 		
 		// prevent exploit which allows 2 players to simultaneously raise the same 0-growth beast
 		// If the mob is at 0th level (when it still listens to all feeders) lock it to the first feeder!
-		if ((growthLevel == 0) && _FeedInfo.containsKey(objectId))
+		if ((growthLevel == 0) && FEED_INFO.containsKey(objectId))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
 		
-		_FeedInfo.put(objectId, caster.getObjectId());
+		FEED_INFO.put(objectId, caster.getObjectId());
 		
 		int food = 0;
 		if (skillId == SKILL_GOLDEN_SPICE)
@@ -548,10 +559,10 @@ public class FeedableBeasts extends AbstractNpcAI
 		npc.broadcastSocialAction(2);
 		
 		// if this pet can't grow, it's all done.
-		if (_GrowthCapableMobs.containsKey(npcId))
+		if (GROWTH_CAPABLE_MONSTERS.containsKey(npcId))
 		{
 			// do nothing if this mob doesn't eat the specified food (food gets consumed but has no effect).
-			if (_GrowthCapableMobs.get(npcId).getMob(food, 0, 0) == null)
+			if (GROWTH_CAPABLE_MONSTERS.get(npcId).getMob(food, 0, 0) == null)
 			{
 				return super.onSkillSee(npc, caster, skill, targets, isSummon);
 			}
@@ -568,7 +579,7 @@ public class FeedableBeasts extends AbstractNpcAI
 				npc.broadcastPacket(packet);
 			}
 			
-			if ((growthLevel > 0) && (_FeedInfo.get(objectId) != caster.getObjectId()))
+			if ((growthLevel > 0) && (FEED_INFO.get(objectId) != caster.getObjectId()))
 			{
 				// check if this is the same player as the one who raised it from growth 0.
 				// if no, then do not allow a chance to raise the pet (food gets consumed but has no effect).
@@ -576,7 +587,7 @@ public class FeedableBeasts extends AbstractNpcAI
 			}
 			
 			// Polymorph the mob, with a certain chance, given its current growth level
-			if (getRandom(100) < _GrowthCapableMobs.get(npcId).getChance())
+			if (getRandom(100) < GROWTH_CAPABLE_MONSTERS.get(npcId).getChance())
 			{
 				spawnNext(npc, growthLevel, caster, food);
 			}
@@ -603,9 +614,9 @@ public class FeedableBeasts extends AbstractNpcAI
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{
 		// remove the feedinfo of the mob that got killed, if any
-		if (_FeedInfo.containsKey(npc.getObjectId()))
+		if (FEED_INFO.containsKey(npc.getObjectId()))
 		{
-			_FeedInfo.remove(npc.getObjectId());
+			FEED_INFO.remove(npc.getObjectId());
 		}
 		return super.onKill(npc, killer, isSummon);
 	}

+ 3 - 12
L2J_DataPack/dist/game/data/scripts/ai/group_template/FleeMonsters.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2004-2014 L2J DataPack
+ * Copyright (C) 2004-2015 L2J DataPack
  * 
  * This file is part of L2J DataPack.
  * 
@@ -20,7 +20,6 @@ package ai.group_template;
 
 import ai.npc.AbstractNpcAI;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ai.CtrlIntention;
 import com.l2jserver.gameserver.model.Location;
@@ -32,7 +31,7 @@ import com.l2jserver.gameserver.util.Util;
 
 /**
  * Flee Monsters AI.
- * @author Pandragon, Nos
+ * @author Pandragon, NosBit
  */
 public final class FleeMonsters extends AbstractNpcAI
 {
@@ -74,15 +73,7 @@ public final class FleeMonsters extends AbstractNpcAI
 		final int posY = (int) (npc.getY() + (FLEE_DISTANCE * Math.sin(radians)));
 		final int posZ = npc.getZ();
 		
-		final Location destination;
-		if (Config.GEODATA > 0)
-		{
-			destination = GeoData.getInstance().moveCheck(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, attacker.getInstanceId());
-		}
-		else
-		{
-			destination = new Location(posX, posY, posZ);
-		}
+		final Location destination = GeoData.getInstance().moveCheck(npc.getX(), npc.getY(), npc.getZ(), posX, posY, posZ, attacker.getInstanceId());
 		npc.getAI().setIntention(CtrlIntention.AI_INTENTION_MOVE_TO, destination);
 		return super.onAttack(npc, attacker, damage, isSummon);
 	}

Some files were not shown because too many files changed in this diff