首页 发现 帮助
注册 登录
L2j
/
l2j-server-datapack
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

BETA: Olympiad htmls for noble player thanks osiride

Rumen Nikiforov 13 年之前
父节点
b42bcc9575
当前提交
35d9a57655
共有 32 个文件被更改，包括 418 次插入 和 161 次删除
合并视图 显示文件统计
  1. 3 2
      L2J_DataPack_BETA/data/html/default/31688-1.htm
  2. 2 1
      L2J_DataPack_BETA/data/html/default/31688-4.htm
  3. 14 14
      L2J_DataPack_BETA/data/html/default/31688.htm
  4. 17 5
      L2J_DataPack_BETA/data/html/olympiad/hero_main.htm
  5. 10 0
      L2J_DataPack_BETA/data/html/olympiad/hero_main2.htm
  6. 10 0
      L2J_DataPack_BETA/data/html/olympiad/noble_cursed_weapon.htm
  7. 13 7
      L2J_DataPack_BETA/data/html/olympiad/noble_desc1a.htm
  8. 9 3
      L2J_DataPack_BETA/data/html/olympiad/noble_desc1b.htm
  9. 11 9
      L2J_DataPack_BETA/data/html/olympiad/noble_desc1c.htm
  10. 4 3
      L2J_DataPack_BETA/data/html/olympiad/noble_desc1d.htm
  11. 15 17
      L2J_DataPack_BETA/data/html/olympiad/noble_desc1e.htm
  12. 19 8
      L2J_DataPack_BETA/data/html/olympiad/noble_desc2a.htm
  13. 13 4
      L2J_DataPack_BETA/data/html/olympiad/noble_desc2b.htm
  14. 11 4
      L2J_DataPack_BETA/data/html/olympiad/noble_desc2c.htm
  15. 15 4
      L2J_DataPack_BETA/data/html/olympiad/noble_desc2d.htm
  16. 13 7
      L2J_DataPack_BETA/data/html/olympiad/noble_desc4a.htm
  17. 19 8
      L2J_DataPack_BETA/data/html/olympiad/noble_main.htm
  18. 10 3
      L2J_DataPack_BETA/data/html/olympiad/noble_nopoints1.htm
  19. 10 3
      L2J_DataPack_BETA/data/html/olympiad/noble_nopoints2.htm
  20. 11 4
      L2J_DataPack_BETA/data/html/olympiad/noble_settle.htm
  21. 11 0
      L2J_DataPack_BETA/data/html/olympiad/noble_sub.htm
  22. 13 0
      L2J_DataPack_BETA/data/html/olympiad/noble_thirdclass.htm
  23. 12 0
      L2J_DataPack_BETA/data/html/olympiad/noble_unregister.htm
  24. 11 5
      L2J_DataPack_BETA/data/html/olympiad/olympiad_5buffs.htm
  25. 13 5
      L2J_DataPack_BETA/data/html/olympiad/olympiad_buffs.htm
  26. 9 2
      L2J_DataPack_BETA/data/html/olympiad/olympiad_nobuffs.htm
  27. 10 3
      L2J_DataPack_BETA/data/scripts/custom/HeroCirclet/already_have_circlet.htm
  28. 10 3
      L2J_DataPack_BETA/data/scripts/custom/HeroCirclet/no_hero.htm
  29. 10 3
      L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/already_have_weapon.htm
  30. 10 3
      L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/no_hero.htm
  31. 25 16
      L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/weapon_list.htm
  32. 55 15
      L2J_DataPack_BETA/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java

+ 3 - 2
L2J_DataPack_BETA/data/html/default/31688-1.htm
查看文件 

@@ -1,6 +1,7 @@
 
-<html><head><body scroll="no">Grand Olympiad Manager:<br><br><br><br>

+<html><head><body scroll="no">Grand Olympiad Manager:<br><br><br>

 <center>

 <center>

-Listen to the explanation about the Grand Olympiad's history, match rules,<br>

+Listen to the explanation about<br>

+the Grand Olympiad's history, match rules,<br>

 and points before challenging it.<br><br><br>

 and points before challenging it.<br><br><br>

 <a action="bypass -h npc_%objectId%_Chat 4">Hear about basic content (history).</a><br>

 <a action="bypass -h npc_%objectId%_Chat 4">Hear about basic content (history).</a><br>

 <a action="bypass -h npc_%objectId%_Chat 5">Hear about match rules.</a><br>

 <a action="bypass -h npc_%objectId%_Chat 5">Hear about match rules.</a><br>

+ 2 - 1
L2J_DataPack_BETA/data/html/default/31688-4.htm
查看文件 

@@ -2,7 +2,8 @@
 
 <center>

 <center>

 The Olympiad boasts a long history.<br>

 The Olympiad boasts a long history.<br>

 During the mythical era of giants,<br>

 During the mythical era of giants,<br>

-this arena was created to foster peace and understanding among the races.<br>

+this arena was created to foster peace and<br>

+understanding among the races.<br>

 This is the Grand Olympiad.<br><br><br><br>

 This is the Grand Olympiad.<br><br><br><br>

 <a action="bypass -h npc_%objectId%_Chat 1">Back</a>

 <a action="bypass -h npc_%objectId%_Chat 1">Back</a>

 </center>

 </center>

+ 14 - 14
L2J_DataPack_BETA/data/html/default/31688.htm
查看文件 

@@ -1,18 +1,18 @@
 
 <html><head><body scroll="no">

 <html><head><body scroll="no">

 <table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

 <table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

 <tr><td valign="top" align="center">

 <tr><td valign="top" align="center">

-<!-- Grand Olympiad Emblem -->

-<table border=0 cellpadding=0 cellspacing=0>

-<tr><td width=256 height=185 background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td></tr>

-</table>

-<!-- // Grand Olympiad Emblem -->

-<table border=0 cellpadding=0 cellspacing=0>

-<tr><td align=center>Welcome to the Olympiad.</td></tr>

-<tr><td height=10></td></tr>

-<tr><td align=center>(You must be a noblesse <br></td></tr>

-<tr><td align=center>in order to participate in the match.)</td></tr>

-<tr><td height=40></td></tr>

-<tr><td align=center><button action="bypass -h npc_%objectId%_Link olympiad/olympiad_observe.htm" value="Watch Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Watch_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>

-<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 1" value="Examine" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Info_Down" fore="L2UI_CT1.OlympiadWnd_DF_Info"></td></tr>

-</table>

+	<!-- Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td width=256 height=185 background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td></tr>

+	</table>

+	<!-- // Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td align=center>Welcome to the Olympiad.</td></tr>

+		<tr><td height=10></td></tr>

+		<tr><td align=center>(You must be a noblesse <br></td></tr>

+		<tr><td align=center>in order to participate in the match.)</td></tr>

+		<tr><td height=40></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_Link olympiad/olympiad_observe.htm" value="Watch Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Watch_Down" fore="L2UI_CT1.OlympiadWnd_DF_Watch"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 1" value="Examine" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Info_Down" fore="L2UI_CT1.OlympiadWnd_DF_Info"></td></tr>

+	</table>

 </body></html>
 
 </body></html>

+ 17 - 5
L2J_DataPack_BETA/data/html/olympiad/hero_main.htm
查看文件 

@@ -1,6 +1,18 @@
 
-<html><body>Monument of Heroes:<br>

-You are a Noblesse. Welcome. I offer many things - but only for Heroes.<br>

-<a action="bypass -h npc_%objectId%_Quest HeroWeapon">I want to receive weapons for a Hero.</a><br>

-<a action="bypass -h npc_%objectId%_Quest HeroCirclet">I want to receive the Wings of Destiny Circlet for Heroes Only.</a><br>

-<a action="bypass npc_%objectId%_Olympiad 4">I want to verify who is the Hero of this era.</a>

+<html><head><body scroll="no">

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+<tr><td valign="top" align="center">

+	<!-- Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td width=256 height=185 background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td></tr>

+	</table>

+	<!-- // Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td align=center>The Obelisk is etched with images of heroes.</td></tr>

+		<tr><td height=10></td></tr>

+		<tr><td align=center>It offers several services with regard to heroes.</td></tr>

+		<tr><td height=34></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_Link olympiad/hero_main2.htm" value="Receive Reward" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Reward_Down" fore="L2UI_CT1.OlympiadWnd_DF_Reward"></td></tr>

+		<tr><td align=center><button action="bypass npc_%objectId%_Olympiad 4" value="Hero List" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_HeroConfirm_Down" fore="L2UI_CT1.OlympiadWnd_DF_HeroConfirm"></td></tr>

+	</table>

+</td></tr></table>

 </body></html>
 
 </body></html>

+ 10 - 0
L2J_DataPack_BETA/data/html/olympiad/hero_main2.htm
查看文件 

@@ -0,0 +1,10 @@
 
+<html><head><body scroll="no">
 
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
 
+<tr><td height=54></td></tr>
 
+<tr><td align=center>A Hero can receive either a Hero Exclusive <br> Circlet or Hero Exclusive weapon.</td></tr>
 
+<tr><td height=54></td></tr>
 
+<tr><td align=center><button action="bypass -h npc_%objectId%_Quest HeroCirclet" value="Receive circlet" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Reward_Down" fore="L2UI_CT1.OlympiadWnd_DF_Reward"></td></tr>
 
+<tr><td align=center><button action="bypass -h npc_%objectId%_Quest HeroWeapon" value="Receive weapon" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_HeroConfirm_Down" fore="L2UI_CT1.OlympiadWnd_DF_HeroConfirm"></td></tr>
 
+<tr><td height=160></td></tr>
 
+</table>
 
+</body></html>

+ 10 - 0
L2J_DataPack_BETA/data/html/olympiad/noble_cursed_weapon.htm
查看文件 

@@ -0,0 +1,10 @@
 
+<html noscrollbar><head><body>
 
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center>Oh, carrier of the cursed sword.</td></tr>
 
+	<tr><td height=10></td></tr>
 
+	<tr><td align=center>You are not qualified to participate in the match.</td></tr>
 
+	<tr><td height=34></td></tr>
 
+	<tr><td height=200></td></tr>
 
+</table>
 
+</body></html>

+ 13 - 7
L2J_DataPack_BETA/data/html/olympiad/noble_desc1a.htm
查看文件 

@@ -1,8 +1,14 @@
 
-<html><body>Grand Olympiad Manager :<br>

-Would you like to learn more about the Grand Olympiad?<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1b">"Yes, please tell me the history of the Grand Olympiad."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1c">"What are the rules of the Grand Olympiad?"</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1d">"What are the rules regarding scoring in the Grand Olympiad?"</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1e">"What are the rules on how to settle Grand Olympiad points"</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">"Return"</a>

+<html noscrollbar><head><body>Grand Olympiad Manager: <br><br><br>

+<center>

+Listen to the explanation about <br>

+the Grand Olympiad's history, match rules, <br>

+and points before challenging it. <br><br>

+<a action="bypass -h npc_%objectId%_OlympiadDesc 1b">Hear about basic content (history).</a><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 1c">Hear about match rules.</a><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 1d">Hear about Olympiad points.</a><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 1e">Hear about points settlement rules.</a><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 3a">View past Olympiad period ranking.</a><br> 

+<a action="bypass -h npc_%objectId%_Quest">Quest</a><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a><br>

+</center>

 </body></html>
 
 </body></html>

+ 9 - 3
L2J_DataPack_BETA/data/html/olympiad/noble_desc1b.htm
查看文件 

@@ -1,4 +1,10 @@
 
-<html><body>Grand Olympiad Manager :<br>

-The Grand Olympiad has a very long history. It was a competition that was originally initiated to promote harmony and peace among the tribes in the time of ancient myths, the Era of Giants.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Return</a>

+<html noscrollbar><head><body>Grand Olympiad Manager: <br><br><br><br>

+<center>

+The Olympiad boasts a long history.<br> 

+During the mythical era of giants,<br>

+this arena was created to foster peace and<br>

+understanding among the races.<br> 

+This is the Grand Olympiad.<br><br><br><br> 

+<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a><br>

+</center>

 </body></html>
 
 </body></html>

+ 11 - 9
L2J_DataPack_BETA/data/html/olympiad/noble_desc1c.htm
查看文件 

@@ -1,10 +1,12 @@
 
-<html><body>Grand Olympiad Operator:<br>

-Grand Olympiad has the following rules.<br>

-The Olympiad match can be generally divided by three types. One is a class-irrelevant-team match where 3 people become a team to compete with other teams, one is a class-irrelevant-individual match where 1:1 competition is held regardless of the class, one is a class-relevant-individual match where a person can compete with an opponent with the same class as his.<br>

-To become a hero through Grand Olympiad, you have to win many Grand Olympiad matches. Winning goes to a team/an individual who inflicted the most damage to their opponent(s) in the Olympiad matches. Damage to a servitor of summoner, Golem of Maestro, or Dark Panther of Hell Knight will by no means affect the winning. The team with the 'most survived members' will win at a team match.<br>

-The winner at Grand Olympiad will take some of the Olympiad points from the loser. In terms of calculating the Olympiad points, the winner takes 1/3 (1/5, in case of class-irrelevant-team or individual matches) of the least points after comparing the two total points, and the loser's points will be subtracted by as much as the winner takes. However, both teams' points will be subtracted by 1/5 from their own points in case of a tie.<br>

-With a team match, 3 people will make up a team and only the party leader can apply for a match. All party members should have over 10 olympiad points in order to register for a team match. Addition/subtraction of points upon winning/losing will be calculated by adding every team members' points, and the loser's points will be partially subtracted.<br>

-Added or deducted points due to win or lose is up to maximum 10 points for either an individual or team match.<br>

-Appreciable amounts of Olympiad points will be given when the cycle of Olympiad starts and a small amount of points will be added at regular intervals. You can participate in an Olympiad match with at least 1 Olympiad point but you no longer participate in Grand Olympiad when the point is 0.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a> 

+<html><head><body>

+Grand Olympiad Manager: 

+<br>The Olympiad match can be generally divided by three types. One is a 3 vs. 3 Team Match where 3 people become a team to compete with other teams, one is a 1 vs. 1 Match where 1:1 competition is held regardless of the class, one is a 1 vs. 1 Class Match where a person can compete with an opponent with the same class as his.

+<br>To become a hero through Grand Olympiad, you have to win many Grand Olympiad matches. Winning goes to a team/an individual who inflicted the most damage to their opponent(s) in the Olympiad matches. Damage to a servitor of summoner, Golem of Maestro, or Dark Panther of Hell Knight will by no means affect the winning. The team with the 'most survived members' will win at a team match.

+<br>The winner of a Grand Olympiad match will take Olympiad points from the loser of the match. In order to calculate the amount of points that will be won/lost at the end of the match, the total points from both participants are compared at the beginning of the match. The lowest amount between the two is used as a starting amount. The winner will take 1/5th of the loser's points based on the lowest Olympiad amount.

+<br>As an example, if one participant has 60 Olympiad points and the other participant has 40 Olympiad points, the amount of points that can be won/lost would be based on the 40 Olympiad points, as that is the lowest amount. The winner of the match would receive1/5th of 40 Olympiad points and the loser would lose 1/5th of 40 Olympiad points.

+<br>The maximum amount of points that can be won/lost at the end of a match cannot exceed 10. In situations where both participants start a match with 50 or more points, neither combatant will lose more than 10 points.

+<br>With a team match, 3 people will make up a team and only the party leader can apply for a match. All party members should have over 2 Olympiad points in order to register for a team match. Addition/subtraction of points upon winning/losing will be calculated by adding every team members' points, and the loser's points will be partially subtracted.

+<br>Appreciable amounts of Olympiad points will be given when the cycle of Olympiad starts and a small amount of points will be added at regular intervals. You can participate in an Olympiad match with at least 1 Olympiad point but you are no longer participate in Grand Olympiad when point is 0.

+<br>

+<center><a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a><br></center>

 </body></html>
 
 </body></html>

+ 4 - 3
L2J_DataPack_BETA/data/html/olympiad/noble_desc1d.htm
查看文件 

@@ -1,4 +1,5 @@
 
-<html><body>Grand Olympiad Operator:<br>

-You must earn Grand Olympiad Points in order to become a hero. The person who acquires the most points in each class is selected to become the hero of that period. If you participate in a certain number of games, you can also exchange Grand Olympiad Points for Olympiad Tokens.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a>

+<html noscrollbar><head><body>

+Grand Olympiad Manager: <br>

+You must earn Grand Olympiad Points in order to become a hero. The person who acquires the most points in each class is selected to become the hero of that period. If you participate in a certain number of games, you can also exchange Grand Olympiad Points for Olympiad Tokens.<br><br>

+<center><a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a><br></center>

 </body></html>
 
 </body></html>

+ 15 - 17
L2J_DataPack_BETA/data/html/olympiad/noble_desc1e.htm
查看文件 

@@ -1,40 +1,38 @@
 
-<html><body>Grand Olympiad Operator:<br>

-Once the Olympiad period ends, Olympiad Points are awarded to participating Noblesse. You can exchange each point for 1000 Olympiad Tokens.<br>

-Those who achieve hero status are eligible to receive additional Olympiad Tokens equivalent to 180 Olympiad Points.<br>

-<center>

-<table border="1" border color="white" width=200 height=150>

+<html><head><body>

+Grand Olympiad Manager: <br>

+Once the Olympiad period ends, Olympiad Points are awarded to participating Noblesse. In order to exchange Olympiad Points for Olympiad Tokens, you must first participate in at least 15 matches. You can exchange 1 Olympiad Point for 1,000 Olympiad Tokens. For example, if you have 55 Olympiad Points you can receive 55,000 Olympiad Tokens.<br>

+Those who achieve hero status are eligible to receive additional Olympiad Tokens equivalent to 200 Olympiad Points.<br><br>

+<center><table border="1" border color="white" width=200 height=150>

 <tr>

 <tr>

 <td align="center">Class</td>

 <td align="center">Class</td>

 <td align="center">Basis</td>

 <td align="center">Basis</td>

 <td align="center">Points</td>

 <td align="center">Points</td>

 </tr>

 </tr>

 <tr>

 <tr>

-<td align="center">1 Class</td>

+<td align="center">1st Rank</td>

 <td>Top 1%</td>

 <td>Top 1%</td>

-<td align="center">120 pt</td>

+<td align="center">100 pt</td>

 </tr>

 </tr>

 <tr>

 <tr>

-<td align="center">2 Class</td>

+<td align="center">2nd Rank</td>

 <td>Top 10%</td>

 <td>Top 10%</td>

-<td align="center">80 pt</td>

+<td align="center">75 pt</td>

 </tr>

 </tr>

 <tr>

 <tr>

-<td align="center">3 Class</td>

+<td align="center">3rd Rank</td>

 <td>Top 25%</td>

 <td>Top 25%</td>

 <td align="center">55 pt</td>

 <td align="center">55 pt</td>

 </tr>

 </tr>

 <tr>

 <tr>

-<td align="center">4 Class</td>

+<td align="center">4th Rank</td>

 <td>Top 50%</td>

 <td>Top 50%</td>

-<td align="center">35 pt</td>

+<td align="center">40 pt</td>

 </tr>

 </tr>

 <tr>

 <tr>

-<td align="center">5 Class</td>

+<td align="center">5th Rank</td>

 <td>Top 100%</td>

 <td>Top 100%</td>

-<td align="center">20 pt</td>

+<td align="center">30 pt</td>

 </tr>

 </tr>

 </table>

 </table>

-<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a>

-</center>

+<br><br><center><a action="bypass -h npc_%objectId%_OlympiadDesc 1a">Back</a><br></center>

 </body></html>
 
 </body></html>

+ 19 - 8
L2J_DataPack_BETA/data/html/olympiad/noble_desc2a.htm
查看文件 

@@ -1,9 +1,20 @@
 
-<html><body>Grand Olympiad Manager:<br>

-Would you like to register for the Grand Olympiad?<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 2b">Join a 3 vs 3 class irrelevant team match.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 2d">Join a class irrelevant individual match.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 2c">Join a class specific individual match.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 2">View the number of people on the waiting list.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 3">View the current Noblesse points.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+<tr><td valign="top" align="center">

+	<!-- Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td width=256 height=185 background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td></tr>

+	</table>

+	<!-- // Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td align=center>Select the match you desire.</td></tr>

+		<tr><td height=10></td></tr>

+		<tr><td align=center><font color="bea27b">(%olympiad_round% period %olympiad_week% rounds currently %olympiad_participant% people participating)</font></td></tr>

+		<tr><td height=19></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 2c" msg="1482" value="1 vs 1 Class Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 2d" msg="1481" value="1 vs 1 Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight1None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 2b" msg="2465" value="3 vs 3 Team Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight3None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight3None"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	</table>

+</td></tr></table>

 </body></html>
 
 </body></html>

+ 13 - 4
L2J_DataPack_BETA/data/html/olympiad/noble_desc2b.htm
查看文件 

@@ -1,5 +1,14 @@
 
-<html><body>Grand Olympiad Operator:<br>

-If you really wish to discover your true strength, you will need to depend on flawless teamwork, excellent communication, and the skill and courage to defeat other classes. Only the best deserve to be heroes.<br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 11" msg="2465">Join a 3 vs 3 class irrelevant team match.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>Match your breathing to your fellow comrades.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>You will need strength and courage</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>to achieve victory.</td></tr>

+	<tr><td height=34></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 11" msg="2465" value="3 vs 3 Team Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight3None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight3None"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=50></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 11 - 4
L2J_DataPack_BETA/data/html/olympiad/noble_desc2c.htm
查看文件 

@@ -1,5 +1,12 @@
 
-<html><body>Grand Olympiad Manager:<br>

-Heroes must ultimately be victorious over themselves. You must prevail in your challenge.<br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 5" msg="1482">"I'll do it!"</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>If someone challenges you,</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>turn their challenge into your victory!</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 5" msg="1482" value="1 vs 1 Class Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply"></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=50></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 15 - 4
L2J_DataPack_BETA/data/html/olympiad/noble_desc2d.htm
查看文件 

@@ -1,5 +1,16 @@
 
-<html><body>Grand Olympiad Operator:<br>

-If you really want to test your true strength, you need the skill and courage to defeat other classes. Only the best deserve to be heroes.<br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 4" msg="1481">Join a class irrelevant individual match.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>In a match with</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>someone with a different occupation,</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>You will need strength and courage</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>to achieve victory.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 4" msg="1481" value="1 vs 1 Class-free Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Fight1None_Down" fore="L2UI_CT1.OlympiadWnd_DF_Fight1None"></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=50></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 13 - 7
L2J_DataPack_BETA/data/html/olympiad/noble_desc4a.htm
查看文件 

@@ -1,8 +1,14 @@
 
-<html><body>Grand Olympiad Operator:<br>

-You wish to exchange Olympiad Points for Olympiad Tokens? Remember, to do so you must first have a specific number of points...<br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 9">View your Noblesse points.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 6">Exchange Olympiad Points for Tokens.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 7">Purchase an item using Noblesse Gate Pass.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 8">Purchase an item using Olympiad Tokens.</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=54></td></tr>

+	<tr><td align=center>You can calculate your Olympiad points</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>or obtain items with tokens.</td></tr>

+	<tr><td height=54></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 6" value="Calculate Points" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Reward_Down" fore="L2UI_CT1.OlympiadWnd_DF_Reward"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 7" value="Equipment Rewards" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEquip_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEquip"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 8" value="Misc. Rewards" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_BuyEtc_Down" fore="L2UI_CT1.OlympiadWnd_DF_BuyEtc"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=100></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 19 - 8
L2J_DataPack_BETA/data/html/olympiad/noble_main.htm
查看文件 

@@ -1,9 +1,20 @@
 
-<html><body>Grand Olympiad Manager :<br>

-You are a Noblesse. Walk the path of Heroes of the Grand Olympiad. You are born with such a destiny.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 1a">"Tell me more about the Grand Olympiad."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 2a">"I want to participate in the Grand Olympiad."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 1" msg="1480">"I want to cancel the participation in the Grand Olympiad."</a><br>

-<a action="bypass -h npc_%objectId%_Link olympiad/olympiad_observe.htm">"I want to observe the Grand Olympiad games."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 3a">"I want to know the ranking of the last Grand Olympiad period."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 4a">"I want to have Grand Olympiad points calculated."</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+<tr><td valign="top" align="center">

+	<!-- Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td width=256 height=185 background="L2UI_CT1.OlympiadWnd_DF_GrandTexture"></td></tr>

+	</table>

+	<!-- // Grand Olympiad Emblem -->

+	<table border=0 cellpadding=0 cellspacing=0>

+		<tr><td align=center>Welcome to the Olympiad.</td></tr>

+		<tr><td height=10></td></tr>

+		<tr><td align=center>Walk the path of the hero.</td></tr>

+		<tr><td height=19></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 0" value="Join Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Apply_Down" fore="L2UI_CT1.OlympiadWnd_DF_Apply"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_Link olympiad/olympiad_observe.htm" value="Watch Match" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Watch_Down" fore="L2UI_CT1.OlympiadWnd_DF_Watch"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 4a" value="Rewards" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Reward_Down" fore="L2UI_CT1.OlympiadWnd_DF_Reward"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 1a" value="Information" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Info_Down" fore="L2UI_CT1.OlympiadWnd_DF_Info"></td></tr>

+	</table>

+</td></tr></table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/html/olympiad/noble_nopoints1.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Grand Olympiad Operator:<br>

-Since you currently have 0 Olympiad points, you cannot participate in the game.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 0">Return</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>Your current Olympiad score is</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>0 points, so you cannot participate in the match.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/html/olympiad/noble_nopoints2.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Grand Olympiad Operator:<br>

-I'm sorry. You do not have enough points to obtain Olympiad Tokens. Better luck next time.<br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 4a">Back</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>You have not met the minimum requirements</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>to calculate your points.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 4a" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=230></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 11 - 4
L2J_DataPack_BETA/data/html/olympiad/noble_settle.htm
查看文件 

@@ -1,5 +1,12 @@
 
-<html><body>Grand Olympiad Manager:<br>

-Your points have reached a certain level. Are you ready to settle?<br>

-<a action="bypass -h npc_%objectId%_OlympiadNoble 10">"I want to settle."</a><br>

-<a action="bypass -h npc_%objectId%_OlympiadDesc 4a">Return</a>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>You have met the minimum match requirement.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>Would you like to calculate your points?</td></tr>

+	<tr><td height=34></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 10" value="Calculate Points" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+		<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 4a" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=100></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 11 - 0
L2J_DataPack_BETA/data/html/olympiad/noble_sub.htm
查看文件 

@@ -0,0 +1,11 @@
 
+<html noscrollbar><head><body>
 
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center>In the sub-class status,</td></tr>
 
+	<tr><td height=10></td></tr>
 
+	<tr><td align=center>You cannot request an Olympiad match.</td></tr>
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
 
+	<tr><td height=200></td></tr>
 
+</table>
 
+</body></html>

+ 13 - 0
L2J_DataPack_BETA/data/html/olympiad/noble_thirdclass.htm
查看文件 

@@ -0,0 +1,13 @@
 
+<html noscrollbar><head><body>
 
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center>In order to participate in the Olympiad match,</td></tr>
 
+	<tr><td height=10></td></tr>
 
+	<tr><td align=center>you must be noblesse with 3rd class change</td></tr>
 
+	<tr><td height=10></td></tr>
 
+	<tr><td align=center>completed.</td></tr>
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
 
+	<tr><td height=200></td></tr>
 
+</table>
 
+</body></html>

+ 12 - 0
L2J_DataPack_BETA/data/html/olympiad/noble_unregister.htm
查看文件 

@@ -0,0 +1,12 @@
 
+<html noscrollbar><head><body>
 
+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center>You are already registered for a match.</td></tr>
 
+	<tr><td height=10></td></tr>
 
+	<tr><td align=center>Do you wish to cancel?</td></tr>
 
+	<tr><td height=34></td></tr>
 
+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadNoble 1" msg="1480" value="Cancel" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
 
+	<tr><td align=center><button action="bypass -h npc_%objectId%_OlympiadDesc 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>
 
+	<tr><td height=50></td></tr>
 
+</table>
 
+</body></html>

+ 11 - 5
L2J_DataPack_BETA/data/html/olympiad/olympiad_5buffs.htm
查看文件 

@@ -1,6 +1,10 @@
 
-<html><body>Olympiad Master:<br>

-Choose one of the following skills:<br><br>

-<center>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>Choose the following buff skills.</td></tr>

+	<tr><td height=24></td></tr>

+	<tr><td><center>

+<br><center>

 <a action="bypass -h npc_%objectId%_OlyBuff 4357">Haste Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4357">Haste Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4342">Wind Walk Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4342">Wind Walk Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4356">Empower Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4356">Empower Lv3</a><br>

@@ -10,6 +14,8 @@ Choose one of the following skills:<br><br>
 
 <a action="bypass -h npc_%objectId%_OlyBuff 4358">Guidance Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4358">Guidance Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4359">Focus Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4359">Focus Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4360">Death Whisper Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4360">Death Whisper Lv3</a><br>

-<a action="bypass -h npc_%objectId%_OlyBuff 4352">Berserker Spirit Lv2</a>

-</center>

+<a action="bypass -h npc_%objectId%_OlyBuff 4352">Berserker Spirit Lv2</a> 

+	</center></td></tr>

+	<tr><td height=24></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 13 - 5
L2J_DataPack_BETA/data/html/olympiad/olympiad_buffs.htm
查看文件 

@@ -1,6 +1,12 @@
 
-<html><body>Olympiad Master:<br>

-Good luck to all of you participating in the event. Please choose 5 skills from the list below:<br><br>

-<center>

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>May all you participants achieve victory.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>Select 5 buffs from below.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td><center>

+<br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4357">Haste Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4357">Haste Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4342">Wind Walk Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4342">Wind Walk Lv2</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4356">Empower Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4356">Empower Lv3</a><br>

@@ -10,6 +16,8 @@ Good luck to all of you participating in the event. Please choose 5 skills from
 
 <a action="bypass -h npc_%objectId%_OlyBuff 4358">Guidance Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4358">Guidance Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4359">Focus Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4359">Focus Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4360">Death Whisper Lv3</a><br>

 <a action="bypass -h npc_%objectId%_OlyBuff 4360">Death Whisper Lv3</a><br>

-<a action="bypass -h npc_%objectId%_OlyBuff 4352">Berserker Spirit Lv2</a>

-</center>

+<a action="bypass -h npc_%objectId%_OlyBuff 4352">Berserker Spirit Lv2</a> 

+	</center></td></tr>

+	<tr><td height=24></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 9 - 2
L2J_DataPack_BETA/data/html/olympiad/olympiad_nobuffs.htm
查看文件 

@@ -1,3 +1,10 @@
 
-<html><body>Olympiad Master:<br>

-Your buffs have been chosen. Good luck to all participants!

+<html noscrollbar><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>All buffs have been provided.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>May you achieve victory.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/scripts/custom/HeroCirclet/already_have_circlet.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Monument of Heroes:<br>

-You've already received a Wings of Destiny Circlet and cannot have another one.<br>

-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>

+<html><head><body scroll="no">

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>You already received the Wings of Destiny Circlet.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>You cannot receive again.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/scripts/custom/HeroCirclet/no_hero.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Monument of Heroes:<br>

-You're not a Hero and aren't eligible to receive the Wings of Destiny Circlet. Better luck next time.<br>

-<a action="bypass -h npc_%objectId%_Chat 0">Return</a>

+<html><head><body scroll="no">

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>You cannot receive the circlet if you are not a hero.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>Please come back next time as a hero.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/already_have_weapon.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Monument of Heroes:<br>

-You've already received a weapon and cannot have another one.<br>

-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>

+<html><head><body scroll="no">

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>You already received a weapon.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>You cannot receive another weapon.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 10 - 3
L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/no_hero.htm
查看文件 

@@ -1,4 +1,11 @@
 
-<html><body>Monument of Heroes:<br>

-You do not meet the requirements. You must become a Hero first!<br>

-<a action="bypass -h npc_%objectId%_Chat 0">Back</a>

+<html><head><body scroll="no">

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>If you are not a hero, you cannot receive a weapon.</td></tr>

+	<tr><td height=10></td></tr>

+	<tr><td align=center>Please come back next time as a hero.</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=200></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 25 - 16
L2J_DataPack_BETA/data/scripts/custom/HeroWeapon/weapon_list.htm
查看文件 

@@ -1,17 +1,26 @@
 
-<html><body>Monument of Heroes:<br>

-You are eligible to wield these weapons. Choose only one of the following 14 weapons. Be sure to choose wisely -- you cannot change weapons once you have made your selection!<br>

-<a action="bypass -h Quest HeroWeapon 6611" msg="1484;">Infinity Blade (One-Handed Sword).</a><br>

-<a action="bypass -h Quest HeroWeapon 6612" msg="1484;">Infinity Cleaver (Two-Handed Sword).</a><br>

-<a action="bypass -h Quest HeroWeapon 6613" msg="1484;">Infinity Axe (One-Handed Blunt Weapon).</a><br>

-<a action="bypass -h Quest HeroWeapon 6614" msg="1484;">Infinity Rod (One-Handed Blunt Weapon).</a><br>

-<a action="bypass -h Quest HeroWeapon 6615" msg="1484;">Infinity Crusher (Two-Handed Blunt Weapon).</a><br>

-<a action="bypass -h Quest HeroWeapon 6616" msg="1484;">Infinity Scepter (Two-Handed Staff).</a><br>

-<a action="bypass -h Quest HeroWeapon 6617" msg="1484;">Infinity Stringer (Dagger).</a><br>

-<a action="bypass -h Quest HeroWeapon 6618" msg="1484;">Infinity Fang (Fist Weapon).</a><br>

-<a action="bypass -h Quest HeroWeapon 6619" msg="1484;">Infinity Bow (Bow).</a><br>

-<a action="bypass -h Quest HeroWeapon 6620" msg="1484;">Infinity Wing (Dualsword).</a><br>

-<a action="bypass -h Quest HeroWeapon 6621" msg="1484;">Infinity Spear (Pole Arm).</a><br>

-<a action="bypass -h Quest HeroWeapon 9388" msg="2234;">Infinity Rapier (Kamael-Exclusive Short Sword).</a><br>

-<a action="bypass -h Quest HeroWeapon 9389" msg="2234;">Infinity Sword (Kamael-Exclusive Ancient Sword).</a><br>

-<a action="bypass -h Quest HeroWeapon 9390" msg="2234;">Infinity Shooter (Kamael-Exclusive Crossbow).</a>

+<html><head><body>

+<table border=0 cellpadding=0 cellspacing=0 width=292 height=358 background="L2UI_CH3.refinewnd_back_Pattern">

+	<tr><td height=34></td></tr>

+	<tr><td align=center>Select a weapon that suits you.</td></tr>

+	<tr><td height=30></td></tr>

+	<tr><td align=center>

+<a action="bypass -h Quest HeroWeapon 6611" msg="1484;">Infinity Blade (One-Handed Sword)</a><br>

+<a action="bypass -h Quest HeroWeapon 6612" msg="1484;">Infinity Cleaver (Two-Handed Sword)</a><br>

+<a action="bypass -h Quest HeroWeapon 6613" msg="1484;">Infinity Axe (One-Handed Blunt Weapon)</a><br>

+<a action="bypass -h Quest HeroWeapon 6614" msg="1484;">Infinity Rod (One-Handed Blunt Weapon)</a><br>

+<a action="bypass -h Quest HeroWeapon 6615" msg="1484;">Infinity Crusher (Two-Handed Blunt Weapon)</a><br>

+<a action="bypass -h Quest HeroWeapon 6616" msg="1484;">Infinity Scepter (Two-Handed Staff)</a><br>

+<a action="bypass -h Quest HeroWeapon 6617" msg="1484;">Infinity Stinger (Dagger)</a><br>

+<a action="bypass -h Quest HeroWeapon 6618" msg="1484;">Infinity Fang (Fist Weapon)</a><br>

+<a action="bypass -h Quest HeroWeapon 6619" msg="1484;">Infinity Bow (Bow)</a><br>

+<a action="bypass -h Quest HeroWeapon 6620" msg="1484;">Infinity Wing (Dualsword)</a><br>

+<a action="bypass -h Quest HeroWeapon 6621" msg="1484;">Infinity Spear (Pole Arm)</a><br>

+<a action="bypass -h Quest HeroWeapon 9388" msg="2234;">Infinity Rapier (Kamael-Exclusive Short Sword)</a><br>

+<a action="bypass -h Quest HeroWeapon 9389" msg="2234;">Infinity Sword (Kamael-Exclusive Ancient Sword)</a><br>

+<a action="bypass -h Quest HeroWeapon 9390" msg="2234;">Infinity Shooter (Kamael-Exclusive Crossbow)</a><br>

+</td></tr>

+	<tr><td height=34></td></tr>

+	<tr><td align=center><button action="bypass -h npc_%objectId%_Chat 0" value="Back" width=200 height=31 back="L2UI_CT1.OlympiadWnd_DF_Back_Down" fore="L2UI_CT1.OlympiadWnd_DF_Back"></td></tr>

+	<tr><td height=30></td></tr>

+</table>

 </body></html>
 
 </body></html>

+ 55 - 15
L2J_DataPack_BETA/data/scripts/handlers/bypasshandlers/OlympiadManagerLink.java
查看文件 

@@ -75,19 +75,59 @@ public class OlympiadManagerLink implements IBypassHandler
 
 			}

 			}

 			else if (command.toLowerCase().startsWith(COMMANDS[1])) // noble

 			else if (command.toLowerCase().startsWith(COMMANDS[1])) // noble

 			{

 			{

-				if (!activeChar.isNoble() || activeChar.getClassId().level() < 3)

+				NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());

+				

+				if (activeChar.isCursedWeaponEquipped())

+				{

+					html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_cursed_weapon.htm");

+					activeChar.sendPacket(html);

+					return false;

+				}

+				if (activeChar.getClassIndex() != 0)

+				{

+					html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_sub.htm");

+					html.replace("%objectId%", String.valueOf(target.getObjectId()));

+					activeChar.sendPacket(html);

 					return false;

 					return false;

+				}

+				if (!activeChar.isNoble() || activeChar.getClassId().level() < 3)

+				{

+					html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_thirdclass.htm");

+					html.replace("%objectId%", String.valueOf(target.getObjectId()));

+					activeChar.sendPacket(html);

+					return false;					

+				}

 				

 				

 				int passes;

 				int passes;

 				int val = Integer.parseInt(command.substring(14));

 				int val = Integer.parseInt(command.substring(14));

-				NpcHtmlMessage html = new NpcHtmlMessage(target.getObjectId());

 				

 				

 				switch(val)

 				switch(val)

 				{

 				{

-					case 1:

+					case 0: // H5 match selection

+						if (!OlympiadManager.getInstance().isRegistered(activeChar))

+						{

+							final int olympiad_round = 0;		// TODO : implement me

+							final int olympiad_week = 0;		// TODO: implement me

+							final int olympiad_participant = 0;	// TODO: implement me

+							

+							html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_desc2a.htm");

+							html.replace("%objectId%", String.valueOf(target.getObjectId()));

+							html.replace("%olympiad_round%", String.valueOf(olympiad_round));

+							html.replace("%olympiad_week%", String.valueOf(olympiad_week));

+							html.replace("%olympiad_participant%", String.valueOf(olympiad_participant));

+							activeChar.sendPacket(html);

+						}

+						else

+						{

+							html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_unregister.htm");

+							html.replace("%objectId%", String.valueOf(target.getObjectId()));

+							activeChar.sendPacket(html);

+						}

+					break;

+					case 1: // unregister

 						OlympiadManager.getInstance().unRegisterNoble(activeChar);

 						OlympiadManager.getInstance().unRegisterNoble(activeChar);

 						break;

 						break;

-					case 2:

+					case 2: // show waiting list | TODO: cleanup (not used anymore)

 						final int nonClassed = OlympiadManager.getInstance().getRegisteredNonClassBased().size();

 						final int nonClassed = OlympiadManager.getInstance().getRegisteredNonClassBased().size();

 						final int teams = OlympiadManager.getInstance().getRegisteredTeamsBased().size();

 						final int teams = OlympiadManager.getInstance().getRegisteredTeamsBased().size();

 						final Collection<List<Integer>> allClassed = OlympiadManager.getInstance().getRegisteredClassBased().values();

 						final Collection<List<Integer>> allClassed = OlympiadManager.getInstance().getRegisteredClassBased().values();

@@ -116,20 +156,20 @@ public class OlympiadManagerLink implements IBypassHandler
 
 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						activeChar.sendPacket(html);

 						activeChar.sendPacket(html);

 						break;

 						break;

-					case 3:

+					case 3: // There are %points% Grand Olympiad points granted for this event. | TODO: cleanup (not used anymore)

 						int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId());

 						int points = Olympiad.getInstance().getNoblePoints(activeChar.getObjectId());

 						html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm");

 						html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points1.htm");

 						html.replace("%points%", String.valueOf(points));

 						html.replace("%points%", String.valueOf(points));

 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						activeChar.sendPacket(html);

 						activeChar.sendPacket(html);

 						break;

 						break;

-					case 4:

+					case 4: // register non classed

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.NON_CLASSED);

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.NON_CLASSED);

 						break;

 						break;

-					case 5:

+					case 5: // register classed

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.CLASSED);

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.CLASSED);

 						break;

 						break;

-					case 6:

+					case 6: // request tokens reward

 						passes = Olympiad.getInstance().getNoblessePasses(activeChar, false);

 						passes = Olympiad.getInstance().getNoblessePasses(activeChar, false);

 						if (passes > 0)

 						if (passes > 0)

 						{

 						{

@@ -144,20 +184,20 @@ public class OlympiadManagerLink implements IBypassHandler
 
 							activeChar.sendPacket(html);

 							activeChar.sendPacket(html);

 						}

 						}

 						break;

 						break;

-					case 7:

+					case 7: // Equipment Rewards

 						MultiSell.getInstance().separateAndSend(102, activeChar, (L2Npc)target, false);

 						MultiSell.getInstance().separateAndSend(102, activeChar, (L2Npc)target, false);

 						break;

 						break;

-					case 8:

+					case 8: // Misc. Rewards

 						MultiSell.getInstance().separateAndSend(103, activeChar, (L2Npc)target, false);

 						MultiSell.getInstance().separateAndSend(103, activeChar, (L2Npc)target, false);

 						break;

 						break;

-					case 9:

+					case 9: // Your Grand Olympiad Score from the previous period is %points% point(s) | TODO: cleanup (not used anymore)

 						int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId());

 						int point = Olympiad.getInstance().getLastNobleOlympiadPoints(activeChar.getObjectId());

 						html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm");

 						html.setFile(activeChar.getHtmlPrefix(), Olympiad.OLYMPIAD_HTML_PATH + "noble_points2.htm");

 						html.replace("%points%", String.valueOf(point));

 						html.replace("%points%", String.valueOf(point));

 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						html.replace("%objectId%", String.valueOf(target.getObjectId()));

 						activeChar.sendPacket(html);

 						activeChar.sendPacket(html);

 						break;

 						break;

-					case 10:

+					case 10: // give tokens to player

 						passes = Olympiad.getInstance().getNoblessePasses(activeChar, true);

 						passes = Olympiad.getInstance().getNoblessePasses(activeChar, true);

 						if (passes > 0)

 						if (passes > 0)

 						{

 						{

@@ -173,7 +213,7 @@ public class OlympiadManagerLink implements IBypassHandler
 
 							activeChar.sendPacket(sm);

 							activeChar.sendPacket(sm);

 						}

 						}

 						break;

 						break;

-					case 11:

+					case 11: // register team

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.TEAMS);

 						OlympiadManager.getInstance().registerNoble(activeChar, CompetitionType.TEAMS);

 						break;

 						break;

 					default:

 					default:

@@ -249,7 +289,7 @@ public class OlympiadManagerLink implements IBypassHandler
 
 				

 				

 				switch (val)

 				switch (val)

 				{

 				{

-					case 2:

+					case 2: // show rank for a specific class 

 						// for example >> Olympiad 1_88

 						// for example >> Olympiad 1_88

 						int classId = Integer.parseInt(command.substring(11));

 						int classId = Integer.parseInt(command.substring(11));

 						if ((classId >= 88 && classId <= 118) || (classId >= 131 && classId <= 134) || classId == 136)

 						if ((classId >= 88 && classId <= 118) || (classId >= 131 && classId <= 134) || classId == 136)

@@ -276,7 +316,7 @@ public class OlympiadManagerLink implements IBypassHandler
 
 							activeChar.sendPacket(reply);

 							activeChar.sendPacket(reply);

 						}

 						}

 						break;

 						break;

-					case 4:

+					case 4: // hero list

 						activeChar.sendPacket(new ExHeroList());

 						activeChar.sendPacket(new ExHeroList());

 						break;

 						break;

 					default:

 					default: