Advertisement
warc222

Custom Clan Halls

Sep 24th, 2015
119
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 37.07 KB | None | 0 0
  1. ### Eclipse Workspace Patch 1.0
  2. #P datapack_development
  3. Index: data/zones/clan_hall_zone.xml
  4. ===================================================================
  5. --- data/zones/clan_hall_zone.xml (revision 7177)
  6. +++ data/zones/clan_hall_zone.xml (working copy)
  7. -2894,4 +2894,75 @@
  8. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-1580" maxZ="-1450">
  9. <stat name="clanHallId" val="201" />
  10. <!-- residence_territory -->
  11. <node X="80243" Y="57126" />
  12. <node X="80235" Y="56695" />
  13. <node X="81014" Y="56695" />
  14. <node X="81013" Y="57134" />
  15. <!-- owner_restart_point_list -->
  16. <spawn X="80696" Y="56840" Z="-1530" />
  17. <!-- chao_restart_point_list -->
  18. <spawn X="80694" Y="56413" Z="-1560" isChaotic="true" />
  19. </zone>
  20. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-1580" maxZ="-1450">
  21. <stat name="clanHallId" val="202" />
  22. <!-- residence_territory -->
  23. <node X="82840" Y="56252" />
  24. <node X="83292" Y="56250" />
  25. <node X="83300" Y="56341" />
  26. <node X="83667" Y="56341" />
  27. <node X="83660" Y="56769" />
  28. <node X="82833" Y="56768" />
  29. <!-- owner_restart_point_list -->
  30. <spawn X="83064" Y="56456" Z="-1530" />
  31. <!-- chao_restart_point_list -->
  32. <spawn X="83053" Y="56098" Z="-1525" isChaotic="true" />
  33. </zone>
  34. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-1580" maxZ="-1450">
  35. <stat name="clanHallId" val="203" />
  36. <!-- residence_territory -->
  37. <node X="81937" Y="53168" />
  38. <node X="81486" Y="53170" />
  39. <node X="81492" Y="52661" />
  40. <node X="82310" Y="52658" />
  41. <node X="82310" Y="53070" />
  42. <node X="81940" Y="53085" />
  43. <!-- owner_restart_point_list -->
  44. <spawn X="81720" Y="52904" Z="-1530" />
  45. <!-- chao_restart_point_list -->
  46. <spawn X="81693" Y="53327" Z="-1465" isChaotic="true" />
  47. </zone>
  48. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="3700" maxZ="-3500">
  49. <stat name="clanHallId" val="205" />
  50. <!-- residence_territory -->
  51. <node X="113265" Y="217467" />
  52. <node X="113266" Y="216990" />
  53. <node X="114152" Y="216989" />
  54. <node X="114153" Y="217462" />
  55. <!-- owner_restart_point_list -->
  56. <spawn X="113784" Y="217208" Z="-3610" />
  57. <!-- chao_restart_point_list -->
  58. <spawn X="114368" Y="217223" Z="-3550" isChaotic="true" />
  59. </zone>
  60. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="3700" maxZ="-3500">
  61. <stat name="clanHallId" val="206" />
  62. <!-- residence_territory -->
  63. <node X="114273" Y="223388" />
  64. <node X="113806" Y="223401" />
  65. <node X="113805" Y="222517" />
  66. <node X="114284" Y="222516" />
  67. <!-- owner_restart_point_list -->
  68. <spawn X="114056" Y="222856" Z="-3610" />
  69. <!-- chao_restart_point_list -->
  70. <spawn X="114045" Y="222316" Z="-3550" isChaotic="true" />
  71. </zone>
  72. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="3700" maxZ="-3500">
  73. <stat name="clanHallId" val="206" />
  74. <!-- residence_territory -->
  75. <node X="114273" Y="223388" />
  76. <node X="113806" Y="223401" />
  77. <node X="113805" Y="222517" />
  78. <node X="114284" Y="222516" />
  79. <!-- owner_restart_point_list -->
  80. <spawn X="114056" Y="222856" Z="-3610" />
  81. <!-- chao_restart_point_list -->
  82. <spawn X="114045" Y="222316" Z="-3550" isChaotic="true" />
  83. </zone>
  84. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-3700" maxZ="-3500">
  85. <stat name="clanHallId" val="207" />
  86. <!-- residence_territory -->
  87. <node X="108844" Y="223117" />
  88. <node X="108380" Y="223112" />
  89. <node X="108382" Y="222227" />
  90. <node X="108858" Y="222228" />
  91. <!-- owner_restart_point_list -->
  92. <spawn X="108616" Y="222600" Z="-3590" />
  93. <!-- chao_restart_point_list -->
  94. <spawn X="108625" Y="222014" Z="-3520" isChaotic="true" />
  95. </zone>
  96. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-3700" maxZ="-3500">
  97. <stat name="clanHallId" val="208" />
  98. <!-- residence_territory -->
  99. <node X="109285" Y="218503" />
  100. <node X="109294" Y="218950" />
  101. <node X="109160" Y="218950" />
  102. <node X="109163" Y="219090" />
  103. <node X="108851" Y="219077" />
  104. <node X="108836" Y="218298" />
  105. <node X="108716" Y="218295" />
  106. <node X="108721" Y="217948" />
  107. <node X="109128" Y="217953" />
  108. <node X="109161" Y="218500" />
  109. <!-- owner_restart_point_list -->
  110. <spawn X="108965" Y="218310" Z="-3640" />
  111. <!-- chao_restart_point_list -->
  112. <spawn X="108497" Y="218170" Z="-3676" isChaotic="true" />
  113. </zone>
  114. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-3700" maxZ="-3500">
  115. <stat name="clanHallId" val="209" />
  116. <!-- residence_territory -->
  117. <node X="108210" Y="220254" />
  118. <node X="108654" Y="220252" />
  119. <node X="108660" Y="220387" />
  120. <node X="108794" Y="220391" />
  121. <node X="108795" Y="220695" />
  122. <node X="108012" Y="220718" />
  123. <node X="107998" Y="220837" />
  124. <node X="107645" Y="220835" />
  125. <node X="107645" Y="220420" />
  126. <node X="108204" Y="220382" />
  127. <!-- owner_restart_point_list -->
  128. <spawn X="108012" Y="220573" Z="-3580" />
  129. <!-- chao_restart_point_list -->
  130. <spawn X="107876" Y="221027" Z="-3610" isChaotic="true" />
  131. </zone>
  132. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-2200" maxZ="-2000">
  133. <stat name="clanHallId" val="210" />
  134. <!-- residence_territory -->
  135. <node X="108210" Y="220254" />
  136. <node X="108654" Y="220252" />
  137. <node X="108660" Y="220387" />
  138. <node X="108794" Y="220391" />
  139. <node X="108795" Y="220695" />
  140. <node X="108012" Y="220718" />
  141. <node X="107998" Y="220837" />
  142. <node X="107645" Y="220835" />
  143. <node X="107645" Y="220420" />
  144. <node X="108204" Y="220382" />
  145. <!-- owner_restart_point_list -->
  146. <spawn X="108012" Y="220573" Z="-3580" />
  147. <!-- chao_restart_point_list -->
  148. <spawn X="107876" Y="221027" Z="-3610" isChaotic="true" />
  149. </zone>
  150. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-1850" maxZ="-1750">
  151. <stat name="clanHallId" val="211" />
  152. <!-- residence_territory -->
  153. <node X="121213" Y="77231" />
  154. <node X="120433" Y="76996" />
  155. <node X="120577" Y="76546" />
  156. <node X="121332" Y="76768" />
  157. <!-- owner_restart_point_list -->
  158. <spawn X="119994" Y="78511" Z="-1800" />
  159. <!-- chao_restart_point_list -->
  160. <spawn X="119739" Y="78290" Z="-1820" isChaotic="true" />
  161. </zone>
  162. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-1600" maxZ="-1550">
  163. <stat name="clanHallId" val="212" />
  164. <!-- residence_territory -->
  165. <node X="118696" Y="79400" />
  166. <node X="119320" Y="79992" />
  167. <node X="118952" Y="80360" />
  168. <node X="118328" Y="79768" />
  169. <node X="118696" Y="79400" />
  170. <!-- owner_restart_point_list -->
  171. <spawn X="118847" Y="79877" Z="-1590" />
  172. <!-- chao_restart_point_list -->
  173. <spawn X="118933" Y="79403" Z="-1610" isChaotic="true" />
  174. </zone>
  175. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-3550" maxZ="-3450">
  176. <stat name="clanHallId" val="215" />
  177. <!-- residence_territory -->
  178. <node X="17401" Y="169782" />
  179. <node X="16951" Y="169756" />
  180. <node X="16956" Y="169529" />
  181. <node X="17394" Y="169523" />
  182. <!-- owner_restart_point_list -->
  183. <spawn X="17196" Y="169682" Z="-3480" />
  184. <!-- chao_restart_point_list -->
  185. <spawn X="17181" Y="169958" Z="-3495" isChaotic="true" />
  186. </zone>
  187. <zone name="fortress_of_restless" type="ClanHallZone" shape="NPoly" minZ="-3550" maxZ="-3450">
  188. <stat name="clanHallId" val="216" />
  189. <!-- residence_territory -->
  190. <node X="17737" Y="170597" />
  191. <node X="18194" Y="170625" />
  192. <node X="18195" Y="170854" />
  193. <node X="17744" Y="170854" />
  194. <!-- owner_restart_point_list -->
  195. <spawn X="17945" Y="170729" Z="-3485" />
  196. <!-- chao_restart_point_list -->
  197. <spawn X="17948" Y="170381" Z="-3505" isChaotic="true" />
  198. </zone>
  199. </list>
  200. Index: data/html/clanHallManager/teleFloran1.htm
  201. ===================================================================
  202. --- data/html/clanHallManager/teleFloran1.htm (revision 0)
  203. +++ data/html/clanHallManager/teleFloran1.htm (revision 0)
  204. -0,0 +1,4 @@
  205. +<html><body>&$556;<br><br>
  206. +<a action="bypass -h npc_%objectId%_goto 508" msg="811;Village Square">Village Square - 500</a><br1>
  207. +<a action="bypass -h npc_%objectId%_goto 513" msg="811;Floran Agricultural Area">Floran Agricultural Area - 500</a><br1>
  208. +</body></html>
  209. \ No newline at end of file
  210. Index: sql/clanhall.sql
  211. ===================================================================
  212. --- sql/clanhall.sql (revision 7177)
  213. +++ sql/clanhall.sql (working copy)
  214. -54,4 +54,22 @@
  215. INSERT IGNORE INTO `clanhall` VALUES ('61','Titan Hall','0','500000','Clan hall located in the Town of Schuttgart','Schuttgart','0','2','0');
  216. INSERT IGNORE INTO `clanhall` VALUES ('62','Rainbow Springs','0','0','','Goddard','0','0','0');
  217. INSERT IGNORE INTO `clanhall` VALUES ('63','Beast Farm','0','0','','Rune','0','0','0');
  218. -INSERT IGNORE INTO `clanhall` VALUES ('64','Fortress of the Dead','0','0','','Rune','0','0','0');
  219. \ No newline at end of file
  220. +INSERT IGNORE INTO `clanhall` VALUES ('64','Fortress of the Dead','0','0','','Rune','0','0','0');
  221. +
  222. +-- Custom Clan Halls Oren
  223. +INSERT IGNORE INTO `clanhall` VALUES ('201','Titanum Chamber','0','500000','Clan hall located in the Town of Oren','Oren','0','2','0');
  224. +INSERT IGNORE INTO `clanhall` VALUES ('202','Knights Chamber','0','500000','Clan hall located in the Town of Oren','Oren','0','2','0');
  225. +INSERT IGNORE INTO `clanhall` VALUES ('203','Phoenix Chamber','0','500000','Clan hall located in the Town of Oren','Oren','0','2','0');
  226. +-- Custom Clan Halls Heine
  227. +INSERT IGNORE INTO `clanhall` VALUES ('205','Waterfall Hall','0','500000','Clan hall located in Heine','Heine','0','2','0');
  228. +INSERT IGNORE INTO `clanhall` VALUES ('206','Giants Hall','0','500000','Clan hall located in Heine','Heine','0','2','0');
  229. +INSERT IGNORE INTO `clanhall` VALUES ('207','Earth Hall','0','500000','Clan hall located in Heine','Heine','0','2','0');
  230. +INSERT IGNORE INTO `clanhall` VALUES ('208','Wenus Chamber','0','1000000','Clan hall located in Heine','Heine','0','3','0');
  231. +INSERT IGNORE INTO `clanhall` VALUES ('209','Saturn Chamber','0','1000000','Clan hall located in Heine','Heine','0','3','0');
  232. +-- Custom Clan Halls Hunters
  233. +INSERT IGNORE INTO `clanhall` VALUES ('210','Hunters Hall','0','500000','Clan hall located in Hunters Village','Hunters','0','2','0');
  234. +INSERT IGNORE INTO `clanhall` VALUES ('211','Forbidden Hall','0','500000','Clan hall located in Hunters Village','Hunters','0','2','0');
  235. +INSERT IGNORE INTO `clanhall` VALUES ('212','Enchanted Hall','0','500000','Clan hall located in Hunters Village','Hunters','0','2','0');
  236. +-- Custom Clan Halls Floran
  237. +INSERT IGNORE INTO `clanhall` VALUES ('215','Lion Hall','0','200000','Clan hall located in Floran Village','Floran','0','1','0');
  238. +INSERT IGNORE INTO `clanhall` VALUES ('216','Puma Hall','0','200000','Clan hall located in Floran Village','Floran','0','1','0');
  239. Index: data/html/clanHallManager/teleOren2.htm
  240. ===================================================================
  241. --- data/html/clanHallManager/teleOren2.htm (revision 0)
  242. +++ data/html/clanHallManager/teleOren2.htm (revision 0)
  243. -0,0 +1,6 @@
  244. +<html><body>&$556;<br><br>
  245. +<a action="bypass -h npc_%objectId%_goto 582" msg="811;Village Square">Village Square - 500 </a><br1>
  246. +<a action="bypass -h npc_%objectId%_goto 1076" msg="811;Skyshadow Meadow">Skyshadow Meadow - 780 </a><br1>
  247. +<a action="bypass -h npc_%objectId%_goto 97" msg="811;Plains of Lizardmen">Plains of Lizardmen - 1900 </a><br1>
  248. +<a action="bypass -h npc_%objectId%_goto 1077" msg="811;Outlaw Forest">Forest Outlaw - 5200 </a><br1>
  249. +</body></html>
  250. \ No newline at end of file
  251. Index: data/html/clanHallManager/teleHunters1.htm
  252. ===================================================================
  253. --- data/html/clanHallManager/teleHunters1.htm (revision 0)
  254. +++ data/html/clanHallManager/teleHunters1.htm (revision 0)
  255. -0,0 +1,3 @@
  256. +<html><body>&$556;<br><br>
  257. +<a action="bypass -h npc_%objectId%_goto 608" msg="811;Village Square">Village Square - 500</a><br1>
  258. +</body></html>
  259. \ No newline at end of file
  260. Index: data/html/clanHallDoormen/doormen-tele.htm
  261. ===================================================================
  262. --- data/html/clanHallDoormen/doormen-tele.htm (revision 0)
  263. +++ data/html/clanHallDoormen/doormen-tele.htm (revision 0)
  264. -0,0 +1,9 @@
  265. +<html><body>
  266. +Oh, how are you?<br>
  267. +It is an honor to serve a member of clan <font color="00FFFF">%clanname%</font>.<br>
  268. +What may I do for you?<br>
  269. +<center>
  270. +<br><button action="bypass -h npc_%objectId%_open_doors" value="Teleport inside" width=120 height=24 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
  271. +<br><button action="bypass -h npc_%objectId%_close_doors" value="Teleport outside" width=120 height=24 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
  272. +</center>
  273. +</body></html>
  274. \ No newline at end of file
  275. Index: data/html/clanHallManager/teleHunters2.htm
  276. ===================================================================
  277. --- data/html/clanHallManager/teleHunters2.htm (revision 0)
  278. +++ data/html/clanHallManager/teleHunters2.htm (revision 0)
  279. -0,0 +1,6 @@
  280. +<html><body>&$556;<br><br>
  281. +<a action="bypass -h npc_%objectId%_goto 608" msg="811;Village Square">Village Square - 500</a><br1>
  282. +<a action="bypass -h npc_%objectId%_goto 99" msg="811;Northern Pathway of Enchanted Valley">Northern Pathway of Enchanted Valley - 3600</a><br1>
  283. +<a action="bypass -h npc_%objectId%_goto 100" msg="811;Southern Pathway of Enchanted Valley">Southern Pathway of Enchanted Valley - 1300</a><br1>
  284. +<a action="bypass -h npc_%objectId%_goto 101" msg="811;Entrance to the Forest of Mirrors">Entrance to the Forest of Mirrors - 2000</a><br1>
  285. +</body></html>
  286. \ No newline at end of file
  287. Index: data/scripts.cfg
  288. ===================================================================
  289. --- data/scripts.cfg (revision 7177)
  290. +++ data/scripts.cfg (working copy)
  291. -599,6 +599,7 @@
  292. custom/IOPRace/IOPRace.java
  293. custom/PinsAndPouchUnseal/PinsAndPouchUnseal.java
  294. custom/SkillTransfer/SkillTransfer.java
  295. +custom/CustomClanHalls/CustomClanHalls.java
  296.  
  297. # Events
  298. events/CharacterBirthday/CharacterBirthday.java
  299. Index: data/scripts/custom/CustomClanHalls/CustomClanHalls.java
  300. ===================================================================
  301. --- data/scripts/custom/CustomClanHalls/CustomClanHalls.java (revision 0)
  302. +++ data/scripts/custom/CustomClanHalls/CustomClanHalls.java (revision 0)
  303. -0,0 +1,103 @@
  304. /*
  305. * This program is free software: you can redistribute it and/or modify it under
  306. * the terms of the GNU General Public License as published by the Free Software
  307. * Foundation, either version 3 of the License, or (at your option) any later
  308. * version.
  309. *
  310. * This program is distributed in the hope that it will be useful, but WITHOUT
  311. * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  312. * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  313. * details.
  314. *
  315. * You should have received a copy of the GNU General Public License along with
  316. * this program. If not, see <http://www.gnu.org/licenses/>.
  317. */
  318. package custom.CustomClanHalls;
  319.  
  320. import com.l2jserver.Config;
  321. import com.l2jserver.gameserver.model.quest.Quest;
  322.  
  323. /**
  324. * @author Gnacik
  325. */
  326. public class CustomClanHalls extends Quest
  327. {
  328. public CustomClanHalls(int id, String name, String descr)
  329. {
  330. super(id, name, descr);
  331.  
  332. if (Config.USE_CUSTOM_CLANHALLS)
  333. {
  334. _log.info("Custom ClanHalls active, spawning NPC's");
  335. // Titanum Chamber
  336. addSpawn(30772, 80634, 56474, -1560, 47997, false, 0);
  337. addSpawn(30772, 80622, 56732, -1545, 16962, false, 0);
  338. addSpawn(35441, 80769, 56740, -1545, 17358, false, 0);
  339.  
  340. // Knights Chamber
  341. addSpawn(30773, 83132, 56281, -1510, 14750, false, 0);
  342. addSpawn(30773, 82993, 56135, -1525, 48920, false, 0);
  343. addSpawn(35443, 82976, 56275, -1510, 16905, false, 0);
  344.  
  345. // Phoenix Chamber
  346. addSpawn(35440, 81618, 53136, -1483, 49151, false, 0);
  347. addSpawn(35440, 81751, 53278, -1496, 15640, false, 0);
  348. addSpawn(35451, 81775, 53138, -1483, 49700, false, 0);
  349.  
  350. // Waterfall Hall
  351. addSpawn(30772, 114260, 217223, -3550, 0, false, 0 );
  352. addSpawn(30772, 114184, 217225, -3547, 32767, false, 0 );
  353. addSpawn(35441, 113954, 217226, -3628, 32964, false, 0 );
  354.  
  355. // Giants Hall
  356. addSpawn(30773, 114107, 222400, -3547, 16011, false, 0 );
  357. addSpawn(30773, 114044, 222490, -3547, 49151, false, 0 );
  358. addSpawn(35443, 114047, 222708, -3626, 16058, false, 0 );
  359.  
  360. // Earth Hall
  361. addSpawn(35440, 108622, 222209, -3520, 16109, false, 0 );
  362. addSpawn(35440, 108623, 222118, -3522, 48539, false, 0 );
  363. addSpawn(35441, 108620, 222411, -3599, 17251, false, 0 );
  364.  
  365. // Wenus Chamber
  366. addSpawn(30772, 108635, 218169, -3646, 33807, false, 0 );
  367. addSpawn(30772, 108885, 218007, -3645, 15344, false, 0 );
  368. addSpawn(35443, 108967, 218009, -3645, 16818, false, 0 );
  369.  
  370. // Saturn Chamber
  371. addSpawn(30773, 107878, 220906, -3585, 17184, false, 0 );
  372. addSpawn(30773, 107718, 220671, -3584, 65220, false, 0 );
  373. addSpawn(35443, 107716, 220589, -3584, 193, false, 0 );
  374.  
  375. // Hunters Hall
  376. addSpawn(30772, 120792, 77066, -2129, 51707, false, 0 );
  377. addSpawn(30772, 120753, 77157, -2143, 18809, false, 0 );
  378. addSpawn(35441, 120931, 77111, -2128, 51052, false, 0 );
  379.  
  380. // Forbidden Hall
  381. addSpawn(30773, 119917, 78354, -1803, 7348, false, 0 );
  382. addSpawn(30773, 119765, 78403, -1820, 36123, false, 0 );
  383. addSpawn(35443, 119833, 78450, -1802, 7152, false, 0 );
  384.  
  385. // Enchanted Hall
  386. addSpawn(35440, 118983, 79624, -1612, 57343, false, 0 );
  387. addSpawn(35440, 119025, 79784, -1596, 24027, false, 0 );
  388. addSpawn(35441, 118931, 79701, -1596, 22723, false, 0 );
  389.  
  390. // Lion Hall
  391. addSpawn(30772, 17155, 169757, -3483, 46596, false, 0 );
  392. addSpawn(30772, 17257, 169844, -3500, 15229, false, 0 );
  393. addSpawn(35443, 17274, 169753, -3483, 49151, false, 0 );
  394.  
  395. // Puma Hall
  396. addSpawn(30773, 17883, 170530, -3504, 49400, false, 0 );
  397. addSpawn(30773, 17982, 170638, -3488, 16699, false, 0 );
  398. addSpawn(35443, 17874, 170637, -3488, 16383, false, 0 );
  399. }
  400. }
  401.  
  402. public static void main(String[] args)
  403. {
  404. new CustomClanHalls(-1, "CustomClanHalls", "custom");
  405. }
  406. }
  407. Index: data/html/clanHallManager/teleOren1.htm
  408. ===================================================================
  409. --- data/html/clanHallManager/teleOren1.htm (revision 0)
  410. +++ data/html/clanHallManager/teleOren1.htm (revision 0)
  411. -0,0 +1,3 @@
  412. +<html><body>&$556;<br><br>
  413. +<a action="bypass -h npc_%objectId%_goto 582" msg="811;Village Square">Village Square - 500</a><br1>
  414. +</body></html>
  415. \ No newline at end of file
  416. Index: data/html/clanHallManager/teleHeine1.htm
  417. ===================================================================
  418. --- data/html/clanHallManager/teleHeine1.htm (revision 0)
  419. +++ data/html/clanHallManager/teleHeine1.htm (revision 0)
  420. -0,0 +1,3 @@
  421. +<html><body>&$556;<br><br>
  422. +<a action="bypass -h npc_%objectId%_goto 107" msg="811;Village Square">Village Square - 8500</a><br1>
  423. +</body></html>
  424. \ No newline at end of file
  425. Index: data/html/clanHallManager/teleFloran2.htm
  426. ===================================================================
  427. --- data/html/clanHallManager/teleFloran2.htm (revision 0)
  428. +++ data/html/clanHallManager/teleFloran2.htm (revision 0)
  429. -0,0 +1,6 @@
  430. +<html><body>&$556;<br><br>
  431. +<a action="bypass -h npc_%objectId%_goto 508" msg="811;Village Square">Village Square - 500</a><br1>
  432. +<a action="bypass -h npc_%objectId%_goto 513" msg="811;Floran Agricultural Area">Floran Agricultural Area - 500</a><br1>
  433. +<a action="bypass -h npc_%objectId%_goto 507" msg="811;Town of Dion">Town of Dion - 500</a><br1>
  434. +<a action="bypass -h npc_%objectId%_goto 514" msg="811;Plains of Dion">Plains of Dion - 500</a><br1>
  435. +</body></html>
  436. \ No newline at end of file
  437. Index: data/html/clanHallManager/teleHeine2.htm
  438. ===================================================================
  439. --- data/html/clanHallManager/teleHeine2.htm (revision 0)
  440. +++ data/html/clanHallManager/teleHeine2.htm (revision 0)
  441. -0,0 +1,7 @@
  442. +<html><body>&$556;<br><br>
  443. +<a action="bypass -h npc_%objectId%_goto 107" msg="811;Village Square">Village Square - 8500</a><br1>
  444. +<a action="bypass -h npc_%objectId%_goto 200918" msg="811;Isle of Prayer">Isle of Prayer - 7200</a><br1>
  445. +<a action="bypass -h npc_%objectId%_goto 66" msg="811;Field of Silence">Field of Silence - 2500 Adena</a><br1>
  446. +<a action="bypass -h npc_%objectId%_goto 67" msg="811;Field of Whispers">Field of Whispers - 2300 Adena</a><br1>
  447. +<a action="bypass -h npc_%objectId%_goto 68" msg="811;Alligator Islands">Alligator Islands - 2100 Adena</a><br1>
  448. +</body></html>
  449. \ No newline at end of file
  450. Index: sql/npc.sql
  451. ===================================================================
  452. --- sql/npc.sql (revision 7177)
  453. +++ sql/npc.sql (working copy)
  454. -9852,4 +9852,7 @@
  455. (36596,36596,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
  456. (36597,36597,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
  457. (36598,36598,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false'),
  458. -(36599,36599,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false');
  459. \ No newline at end of file
  460. +(36599,36599,'Supplies Safe',0,'',0,'LineageMonster.mimic',8.50,8.50,80,'male','L2Monster',40,5198,1859,0.00,0.00,40,43,30,21,20,20,0,0,1952,577,905,469,253,0,333,0,0,0,0,80,1,0,0,'LAST_HIT','false');
  461. +
  462. +-- Custom Clan Halls Npcs
  463. +UPDATE `npc` SET type='L2ClanHallTeleporter', title='Clan Hall Teleporter',serverSideTitle='1' WHERE id IN (30772, 30773, 35440);
  464. #P L2_GameServer
  465. Index: java/com/l2jserver/Config.java
  466. ===================================================================
  467. --- java/com/l2jserver/Config.java (revision 4001)
  468. +++ java/com/l2jserver/Config.java (working copy)
  469. -662,7 +662,7 @@
  470. public static List<String> L2JMOD_MULTILANG_ALLOWED = new ArrayList<String>();
  471. public static String L2JMOD_MULTILANG_DEFAULT;
  472. public static boolean L2JMOD_MULTILANG_VOICED_ALLOW;
  473. -
  474. + public static boolean USE_CUSTOM_CLANHALLS;
  475. //--------------------------------------------------
  476. // NPC Settings
  477. //--------------------------------------------------
  478. -2187,6 +2187,7 @@
  479. if (!L2JMOD_MULTILANG_ALLOWED.contains(L2JMOD_MULTILANG_DEFAULT))
  480. _log.warning("MultiLang[Config.load()]: default language: " + L2JMOD_MULTILANG_DEFAULT + " is not in allowed list !");
  481. L2JMOD_MULTILANG_VOICED_ALLOW = Boolean.parseBoolean(L2JModSettings.getProperty("MultiLangVoiceCommand", "True"));
  482. + USE_CUSTOM_CLANHALLS = Boolean.parseBoolean(L2JModSettings.getProperty("UseCustomClanHalls", "True"));
  483. }
  484. catch (Exception e)
  485. {
  486. Index: java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallTeleporterInstance.java
  487. ===================================================================
  488. --- java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallTeleporterInstance.java (revision 0)
  489. +++ java/com/l2jserver/gameserver/model/actor/instance/L2ClanHallTeleporterInstance.java (revision 0)
  490. -0,0 +1,132 @@
  491. +/*
  492. + * This program is free software: you can redistribute it and/or modify it under
  493. + * the terms of the GNU General Public License as published by the Free Software
  494. + * Foundation, either version 3 of the License, or (at your option) any later
  495. + * version.
  496. + *
  497. + * This program is distributed in the hope that it will be useful, but WITHOUT
  498. + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  499. + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  500. + * details.
  501. + *
  502. + * You should have received a copy of the GNU General Public License along with
  503. + * this program. If not, see <http://www.gnu.org/licenses/>.
  504. + */
  505. +package com.l2jserver.gameserver.model.actor.instance;
  506. +
  507. +import com.l2jserver.gameserver.datatables.ClanTable;
  508. +import com.l2jserver.gameserver.datatables.MapRegionTable;
  509. +import com.l2jserver.gameserver.instancemanager.ClanHallManager;
  510. +import com.l2jserver.gameserver.model.L2Clan;
  511. +import com.l2jserver.gameserver.model.Location;
  512. +import com.l2jserver.gameserver.model.entity.ClanHall;
  513. +import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
  514. +import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
  515. +import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
  516. +
  517. +public class L2ClanHallTeleporterInstance extends L2DoormenInstance
  518. +{
  519. + private boolean _init = false;
  520. + private ClanHall _clanHall = null;
  521. +
  522. + public L2ClanHallTeleporterInstance(int objectID, L2NpcTemplate template)
  523. + {
  524. + super(objectID, template);
  525. + setInstanceType(InstanceType.L2ClanHallDoormenInstance);
  526. + }
  527. +
  528. + @Override
  529. + public void showChatWindow(L2PcInstance player)
  530. + {
  531. + player.sendPacket(ActionFailed.STATIC_PACKET);
  532. +
  533. + NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
  534. +
  535. + if (getClanHall() != null)
  536. + {
  537. + L2Clan owner = ClanTable.getInstance().getClan(getClanHall().getOwnerId());
  538. + if (isOwnerClan(player))
  539. + {
  540. + html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-tele.htm");
  541. + html.replace("%clanname%", owner.getName());
  542. + }
  543. + else
  544. + {
  545. + if (owner != null && owner.getLeader() != null)
  546. + {
  547. + html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/doormen-no.htm");
  548. + html.replace("%leadername%", owner.getLeaderName());
  549. + html.replace("%clanname%", owner.getName());
  550. + }
  551. + else
  552. + {
  553. + html.setFile(player.getHtmlPrefix(), "data/html/clanHallDoormen/emptyowner.htm");
  554. + html.replace("%hallname%", getClanHall().getName());
  555. + }
  556. + }
  557. + }
  558. + else
  559. + return;
  560. +
  561. + html.replace("%objectId%", String.valueOf(getObjectId()));
  562. + player.sendPacket(html);
  563. + }
  564. +
  565. + @Override
  566. + protected final void openDoors(L2PcInstance player, String command)
  567. + {
  568. + Location _loc = getClanHall().getZone().getSpawnLoc();
  569. +
  570. + if (_loc != null)
  571. + {
  572. + player.teleToLocation(_loc, false);
  573. + if (player.getPet() != null)
  574. + player.getPet().teleToLocation(_loc, false);
  575. + }
  576. + }
  577. +
  578. + @Override
  579. + protected final void closeDoors(L2PcInstance player, String command)
  580. + {
  581. + Location _loc = getClanHall().getZone().getChaoticSpawnLoc();
  582. + if (_loc != null)
  583. + {
  584. + player.teleToLocation(_loc, false);
  585. + if (player.getPet() != null)
  586. + player.getPet().teleToLocation(_loc, false);
  587. + }
  588. + else
  589. + {
  590. + player.teleToLocation(MapRegionTable.TeleportWhereType.Town);
  591. + if (player.getPet() != null)
  592. + player.getPet().teleToLocation(MapRegionTable.TeleportWhereType.Town);
  593. + }
  594. + }
  595. +
  596. + private final ClanHall getClanHall()
  597. + {
  598. + if (!_init)
  599. + {
  600. + synchronized (this)
  601. + {
  602. + if (!_init)
  603. + {
  604. + _clanHall = ClanHallManager.getInstance().getNearbyClanHall(getX(), getY(), 500);
  605. + _init = true;
  606. + }
  607. + }
  608. + }
  609. + return _clanHall;
  610. + }
  611. +
  612. + @Override
  613. + protected final boolean isOwnerClan(L2PcInstance player)
  614. + {
  615. + if (player.getClan() != null && getClanHall() != null)
  616. + {
  617. + if (player.getClanId() == getClanHall().getOwnerId())
  618. + return true;
  619. + }
  620. + return false;
  621. + }
  622. +}
  623. \ No newline at end of file
  624. Index: java/com/l2jserver/gameserver/instancemanager/AuctionManager.java
  625. ===================================================================
  626. --- java/com/l2jserver/gameserver/instancemanager/AuctionManager.java (revision 4001)
  627. +++ java/com/l2jserver/gameserver/instancemanager/AuctionManager.java (working copy)
  628. -21,6 +21,7 @@
  629. import java.util.logging.Level;
  630. import java.util.logging.Logger;
  631.  
  632. +import com.l2jserver.Config;
  633. import com.l2jserver.L2DatabaseFactory;
  634. import com.l2jserver.gameserver.model.entity.Auction;
  635.  
  636. -70,13 +71,27 @@
  637. "(58, 0, 'NPC', 'NPC Clan', 'ClanHall', 58, 0, 'Eisen Hall', 1, 50000000, 0, 1164841200000)",
  638. "(59, 0, 'NPC', 'NPC Clan', 'ClanHall', 59, 0, 'Heavy Metal Hall', 1, 50000000, 0, 1164841200000)",
  639. "(60, 0, 'NPC', 'NPC Clan', 'ClanHall', 60, 0, 'Molten Ore Hall', 1, 50000000, 0, 1164841200000)",
  640. - "(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000)"
  641. + "(61, 0, 'NPC', 'NPC Clan', 'ClanHall', 61, 0, 'Titan Hall', 1, 50000000, 0, 1164841200000)",
  642. + "(201,0, 'NPC', 'NPC Clan', 'ClanHall',201, 0, 'Titanum Chamber', 1, 50000000, 0, 1164841200000)",
  643. + "(202,0, 'NPC', 'NPC Clan', 'ClanHall',202, 0, 'Knights Chamber', 1, 50000000, 0, 1164841200000)",
  644. + "(203,0, 'NPC', 'NPC Clan', 'ClanHall',203, 0, 'Phoenix Chamber', 1, 50000000, 0, 1164841200000)",
  645. + "(205,0, 'NPC', 'NPC Clan', 'ClanHall',205, 0, 'Waterfall Hall', 1, 50000000, 0, 1164841200000)",
  646. + "(206,0, 'NPC', 'NPC Clan', 'ClanHall',206, 0, 'Giants Hall', 1, 50000000, 0, 1164841200000)",
  647. + "(207,0, 'NPC', 'NPC Clan', 'ClanHall',207, 0, 'Earth Hall', 1, 50000000, 0, 1164841200000)",
  648. + "(208,0, 'NPC', 'NPC Clan', 'ClanHall',208, 0, 'Wenus Chamber', 1, 50000000, 0, 1164841200000)",
  649. + "(209,0, 'NPC', 'NPC Clan', 'ClanHall',209, 0, 'Saturn Chamber', 1, 50000000, 0, 1164841200000)",
  650. + "(210,0, 'NPC', 'NPC Clan', 'ClanHall',210, 0, 'Hunters Hall', 1, 50000000, 0, 1164841200000)",
  651. + "(211,0, 'NPC', 'NPC Clan', 'ClanHall',211, 0, 'Forbidden Hall', 1, 50000000, 0, 1164841200000)",
  652. + "(212,0, 'NPC', 'NPC Clan', 'ClanHall',212, 0, 'Enchanted Hall', 1, 50000000, 0, 1164841200000)",
  653. + "(215,0, 'NPC', 'NPC Clan', 'ClanHall',215, 0, 'Lion Hall', 1, 50000000, 0, 1164841200000)",
  654. + "(216,0, 'NPC', 'NPC Clan', 'ClanHall',216, 0, 'Puma Hall', 1, 50000000, 0, 1164841200000)"
  655. };
  656.  
  657. private static final Integer[] ItemInitDataId =
  658. {
  659. 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 36, 37, 38, 39, 40, 41, 42,
  660. - 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61
  661. + 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
  662. + 201, 202, 203, 205, 206, 207, 208, 209, 210, 211, 212, 215, 216
  663. };
  664.  
  665. public static final AuctionManager getInstance()
  666. -158,6 +173,9 @@
  667. /** Init Clan NPC aution */
  668. public void initNPC(int id)
  669. {
  670. + if (id >= 200 && !Config.USE_CUSTOM_CLANHALLS)
  671. + return;
  672. +
  673. Connection con = null;
  674. int i;
  675. for (i = 0; i < ItemInitDataId.length; i++)
  676. Index: java/config/l2jmods.properties
  677. ===================================================================
  678. --- java/config/l2jmods.properties (revision 4001)
  679. +++ java/config/l2jmods.properties (working copy)
  680. -355,3 +355,6 @@
  681. # Default: True
  682. MultiLangVoiceCommand = True
  683.  
  684. +# Custom ClanHalls
  685. +# Default: False
  686. +UseCustomClanHalls = False
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement