From 77dd27bd7a4e6e7a8c98da2fada2db0c86be422d Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 4 May 2020 14:18:01 +0000 Subject: [PATCH] Olympiad fixes. Contributed by pecanha. --- .../dist/game/config/Olympiad.ini | 4 +- .../game/data/html/olympiad/hero_main.htm | 74 ++++- .../dist/game/data/multisell/103.xml | 6 - .../MonumentOfHeroes/MonumentOfHeroes.java | 17 ++ .../MonumentOfHeroes/already_have_circlet.htm | 2 +- .../MonumentOfHeroes/already_have_weapon.htm | 2 +- .../MonumentOfHeroes/already_hero_status.htm | 9 + .../MonumentOfHeroes/no_hero_circlet.htm | 2 +- .../MonumentOfHeroes/no_hero_status.htm | 11 + .../MonumentOfHeroes/no_hero_weapon.htm | 2 +- .../others/MonumentOfHeroes/receive_hero.htm | 11 + .../others/MonumentOfHeroes/weapon_list.htm | 279 ++++++++++++++++-- .../java/org/l2jmobius/Config.java | 2 +- 13 files changed, 376 insertions(+), 45 deletions(-) create mode 100644 L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_hero_status.htm create mode 100644 L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/no_hero_status.htm create mode 100644 L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/receive_hero.htm diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini index 0485608e59..f45008ba31 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Olympiad.ini @@ -74,8 +74,8 @@ AltOlyNonClassedRewItemCount = 40 AltOlyCompRewItem = 13722 # Rate to exchange points to reward item. -# Default: 1000 -AltOlyGPPerPoint = 1000 +# Default: 1 +AltOlyGPPerPoint = 1 # Noblesse points awarded to Heroes. # Default: 180 diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/olympiad/hero_main.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/olympiad/hero_main.htm index 77b39d0737..bce595bbaa 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/olympiad/hero_main.htm +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/html/olympiad/hero_main.htm @@ -1,6 +1,68 @@ -Monument of Heroes:
-You are a Noblesse. Welcome. I offer many things - but only for Heroes.
-I want to receive weapons for a Hero.
-I want to receive the Wings of Destiny Circlet for Heroes Only.
-I want to verify who is the Hero of this era. - \ No newline at end of file +Monument Of Heroes + +
+ + +
+ + + +
+ +
+
+ + + + + +
+ + + Monument of Heroes: You are a Noblesse. Welcome. I offer many things - but only for Heroes. +
+
+
+ + + + +
+
+
+
+
+ + + + +
+
+
+
+
+
+ + + + +
+
+
+
+ +
+ +
+
+ + + +
+ +
+ + + \ No newline at end of file diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/103.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/103.xml index f43e8e3e17..d376108e30 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/103.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/multisell/103.xml @@ -177,12 +177,6 @@ - - - - - - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java index 1c88a2980b..e5b0b6f229 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java @@ -19,6 +19,7 @@ package ai.others.MonumentOfHeroes; import org.l2jmobius.commons.util.CommonUtil; import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; +import org.l2jmobius.gameserver.model.entity.Hero; import ai.AbstractNpcAI; @@ -68,6 +69,22 @@ public class MonumentOfHeroes extends AbstractNpcAI { switch (event) { + case "HeroClaim": + { + if (Hero.getInstance().isHero(player.getObjectId())) + { + return "already_hero_status.htm"; + } + else if (!Hero.getInstance().isUnclaimedHero(player.getObjectId())) + { + return "no_hero_status.htm"; + } + else + { + Hero.getInstance().claimHero(player); + return "receive_hero.htm"; + } + } case "HeroWeapon": { if (player.isHero()) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm index 2b7053aefb..9343614788 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/ai/others/MonumentOfHeroes/already_have_circlet.htm @@ -5,7 +5,7 @@ You cannot receive again. -