BETA: Priest Of Blessing minor code update.

L2J_DataPack_BETA/dist/game/data/scripts/retail/PriestOfBlessing/PriestOfBlessing.java

@@ -14,7 +14,6 @@
  */
 package retail.PriestOfBlessing;
 
-import com.l2jserver.gameserver.instancemanager.QuestManager;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
@@ -27,7 +26,7 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- ** @author Gnacik
+ * @author Gnacik
  */
 public class PriestOfBlessing extends Quest
 {
@@ -37,57 +36,109 @@ public class PriestOfBlessing extends Quest
 	private static final int _priest = 32783;
 	// Prices
 	private static final int _price_voice = 100000;
-	// 
+	//
 	private static final int _nevit_voice = 17094;
-	// 
-	private static final int[] _prices_hourglass = { 4000, 30000, 110000, 310000, 970000, 2160000, 5000000 };
 	//
-	private static final int[][] _hourglasses = {
-		{ 17095, 17096, 17097, 17098, 17099 },
-		{ 17100, 17101, 17102, 17103, 17104 },
-		{ 17105, 17106, 17107, 17108, 17109 },
-		{ 17110, 17111, 17112, 17113, 17114 },
-		{ 17115, 17116, 17117, 17118, 17119 },
-		{ 17120, 17121, 17122, 17123, 17124 },
-		{ 17125, 17126, 17127, 17128, 17129 }
+	private static final int[] _prices_hourglass =
+	{
+		4000, 30000, 110000, 310000, 970000, 2160000, 5000000
+	};
+	//
+	private static final int[][] _hourglasses =
+	{
+		{
+			17095, 17096, 17097, 17098, 17099
+		},
+		{
+			17100, 17101, 17102, 17103, 17104
+		},
+		{
+			17105, 17106, 17107, 17108, 17109
+		},
+		{
+			17110, 17111, 17112, 17113, 17114
+		},
+		{
+			17115, 17116, 17117, 17118, 17119
+		},
+		{
+			17120, 17121, 17122, 17123, 17124
+		},
+		{
+			17125, 17126, 17127, 17128, 17129
+		}
 	};
 	// Spawns
-	private static final int[][] _spawns = {
-		{ -84139, 243145, -3704, 8473 },
-		{ -119702, 44557, 360, 33023 },
-		{ 45413, 48351, -3056, 50020 },
-		{ 115607, -177945, -896, 38058 },
-		{ 12086, 16589, -4584, 3355 },
-		{ -45032, -113561, -192, 32767 },
-		{ -83112, 150922, -3120, 2280 },
-		{ -13931, 121938, -2984, 30212 },
-		{ 87127, -141330, -1336, 49153 },
-		{ 43520, -47590, -792, 43738 },
-		{ 148060, -55314, -2728, 40961 },
-		{ 82801, 149381, -3464, 53707 },
-		{ 82433, 53285, -1488, 22942 },
-		{ 147059, 25930, -2008, 56399 },
-		{ 111171, 221053, -3544, 2058 },
-		{ 15907, 142901, -2688, 14324 },
-		{ 116972, 77255, -2688, 41951 }
+	private static final int[][] _spawns =
+	{
+		{
+			-84139, 243145, -3704, 8473
+		},
+		{
+			-119702, 44557, 360, 33023
+		},
+		{
+			45413, 48351, -3056, 50020
+		},
+		{
+			115607, -177945, -896, 38058
+		},
+		{
+			12086, 16589, -4584, 3355
+		},
+		{
+			-45032, -113561, -192, 32767
+		},
+		{
+			-83112, 150922, -3120, 2280
+		},
+		{
+			-13931, 121938, -2984, 30212
+		},
+		{
+			87127, -141330, -1336, 49153
+		},
+		{
+			43520, -47590, -792, 43738
+		},
+		{
+			148060, -55314, -2728, 40961
+		},
+		{
+			82801, 149381, -3464, 53707
+		},
+		{
+			82433, 53285, -1488, 22942
+		},
+		{
+			147059, 25930, -2008, 56399
+		},
+		{
+			111171, 221053, -3544, 2058
+		},
+		{
+			15907, 142901, -2688, 14324
+		},
+		{
+			116972, 77255, -2688, 41951
+		}
 	};
 	
-	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
 		String htmltext = event;
-		
 		QuestState st = player.getQuestState(getName());
-		Quest q = QuestManager.getInstance().getQuest(getName());
-		if (st == null || q == null)
+		if (st == null)
+		{
 			return null;
+		}
 		
 		if (event.equalsIgnoreCase("buy_voice"))
 		{
-			if(st.getQuestItemsCount(57) >= _price_voice)
+			if (st.getQuestItemsCount(57) >= _price_voice)
 			{
-				String value = q.loadGlobalQuestVar(player.getAccountName()+"_voice");
+				String value = loadGlobalQuestVar(player.getAccountName() + "_voice");
 				long _reuse_time = value == "" ? 0 : Long.parseLong(value);
 				
 				if (System.currentTimeMillis() > _reuse_time)
@@ -95,7 +146,7 @@ public class PriestOfBlessing extends Quest
 					st.setState(State.STARTED);
 					st.takeItems(57, _price_voice);
 					st.giveItems(_nevit_voice, 1);
-					q.saveGlobalQuestVar(player.getAccountName()+"_voice", Long.toString(System.currentTimeMillis() + (20 * 3600000)));
+					saveGlobalQuestVar(player.getAccountName() + "_voice", Long.toString(System.currentTimeMillis() + (20 * 3600000)));
 				}
 				else
 				{
@@ -111,27 +162,29 @@ public class PriestOfBlessing extends Quest
 				return null;
 			}
 			else
+			{
 				htmltext = "32783-adena.htm";
+			}
 		}
 		else if (event.equalsIgnoreCase("buy_hourglass"))
 		{
 			int _index = getHGIndex(player.getLevel());
 			int _price_hourglass = _prices_hourglass[_index];
 			
-			if(st.getQuestItemsCount(57) >= _price_hourglass)
+			if (st.getQuestItemsCount(57) >= _price_hourglass)
 			{
-				String value = q.loadGlobalQuestVar(player.getAccountName()+"_hg_"+_index);
+				String value = loadGlobalQuestVar(player.getAccountName() + "_hg_" + _index);
 				long _reuse_time = value == "" ? 0 : Long.parseLong(value);
-								
+				
 				if (System.currentTimeMillis() > _reuse_time)
 				{
 					int[] _hg = _hourglasses[_index];
-					int _nevit_hourglass = _hg[Rnd.get(0,_hg.length-1)];
-
+					int _nevit_hourglass = _hg[Rnd.get(0, _hg.length - 1)];
+					
 					st.setState(State.STARTED);
 					st.takeItems(57, _price_hourglass);
 					st.giveItems(_nevit_hourglass, 1);
-					q.saveGlobalQuestVar(player.getAccountName()+"_hg_"+_index, Long.toString(System.currentTimeMillis() + (20 * 3600000)));
+					saveGlobalQuestVar(player.getAccountName() + "_hg_" + _index, Long.toString(System.currentTimeMillis() + (20 * 3600000)));
 				}
 				else
 				{
@@ -147,7 +200,9 @@ public class PriestOfBlessing extends Quest
 				return null;
 			}
 			else
+			{
 				htmltext = "32783-adena.htm";
+			}
 		}
 		return htmltext;
 	}
@@ -158,11 +213,10 @@ public class PriestOfBlessing extends Quest
 		QuestState st = player.getQuestState(getName());
 		if (st == null)
 		{
-			Quest q = QuestManager.getInstance().getQuest(getName());
-			st = q.newQuestState(player);
+			st = newQuestState(player);
 		}
-		NpcHtmlMessage html = new NpcHtmlMessage(0);
-		String content = getHtm(player.getHtmlPrefix(), "32783.htm");
+		final NpcHtmlMessage html = new NpcHtmlMessage(0);
+		final String content = getHtm(player.getHtmlPrefix(), "32783.htm");
 		html.setHtml(content);
 		html.replace("%donate%", Util.formatAdena(_prices_hourglass[getHGIndex(player.getLevel())]));
 		player.sendPacket(html);
@@ -172,20 +226,34 @@ public class PriestOfBlessing extends Quest
 	private int getHGIndex(int lvl)
 	{
 		int index = 0;
-		if(lvl < 20)
+		if (lvl < 20)
+		{
 			index = 0;
-		else if(lvl < 40)
+		}
+		else if (lvl < 40)
+		{
 			index = 1;
+		}
 		else if (lvl < 52)
+		{
 			index = 2;
+		}
 		else if (lvl < 61)
+		{
 			index = 3;
+		}
 		else if (lvl < 76)
+		{
 			index = 4;
+		}
 		else if (lvl < 80)
+		{
 			index = 5;
+		}
 		else if (lvl < 86)
+		{
 			index = 6;
+		}
 		return index;
 	}
 	
@@ -196,10 +264,12 @@ public class PriestOfBlessing extends Quest
 		addStartNpc(_priest);
 		addFirstTalkId(_priest);
 		addTalkId(_priest);
-		if(!_spawned)
+		if (!_spawned)
 		{
 			for (int[] _spawn : _spawns)
+			{
 				addSpawn(_priest, _spawn[0], _spawn[1], _spawn[2], _spawn[3], false, 0);
+			}
 			_spawned = true;
 		}
 	}
@@ -208,4 +278,4 @@ public class PriestOfBlessing extends Quest
 	{
 		new PriestOfBlessing(-1, "PriestOfBlessing", "retail");
 	}
-}
+}