Explorar o código

BETA: "To make it faster and easier to increase your Clan Level, the Reputation Points and required number of members needed for leveling has been decreased for certain clan levels.
The clan points reward for these Clan Quests have been doubled: A Clan's Reputation, A Clan's Prestige, A Clan's Fame."
And some other minor quest fixes. (by lion)

DrLecter %!s(int64=14) %!d(string=hai) anos
pai
achega
94f19fd5a0

+ 6 - 6
L2J_DataPack_BETA/data/scripts/quests/508_TheClansReputation/__init__.py

@@ -43,12 +43,12 @@ RAHHA                   = 25051
 
 # id:[RaidBossNpcId,questItemId,minClanPoints,maxClanPoints]
 REWARDS_LIST={
-    1:[PALIBATI_QUEEN_THEMIS,  THEMIS_SCALE,65,100],
-    2:[HEKATON_PRIME,          NUCLEUS_OF_HEKATON_PRIME,40,75],
-    3:[GARGOYLE_LORD_TIPHON,   TIPHON_SHARD,30,65],
-    4:[LAST_LESSER_GIANT_GLAKI,GLAKIS_NUCLEUS,105,140],
-    5:[RAHHA,                  RAHHAS_FANG,40,75],
-    6:[FLAMESTONE_GIANT,       NUCLEUS_OF_FLAMESTONE_GIANT,60,95]
+    1:[PALIBATI_QUEEN_THEMIS,  THEMIS_SCALE,130,200],
+    2:[HEKATON_PRIME,          NUCLEUS_OF_HEKATON_PRIME,80,150],
+    3:[GARGOYLE_LORD_TIPHON,   TIPHON_SHARD,60,130],
+    4:[LAST_LESSER_GIANT_GLAKI,GLAKIS_NUCLEUS,210,280],
+    5:[RAHHA,                  RAHHAS_FANG,80,150],
+    6:[FLAMESTONE_GIANT,       NUCLEUS_OF_FLAMESTONE_GIANT,120,190]
     }
 
 RADAR={

+ 5 - 5
L2J_DataPack_BETA/data/scripts/quests/509_TheClansPrestige/__init__.py

@@ -27,11 +27,11 @@ QUEEN_SHYEED	       = 25514
 
 # id:[RaidBossNpcId,questItemId,minClanPoints,maxClanPoints]
 REWARDS_LIST={
-    1:[DAIMON_THE_WHITE_EYED,	DAIMONS_EYES,180,215],
-    2:[HESTIA_GUARDIAN_DEITY,	HESTIAS_FAIRY_STONE,430,465],
-    3:[PLAGUE_GOLEM,		NUCLEUS_OF_LESSER_GOLEM,380,415],
-    4:[DEMONS_AGENT_FALSTON,	FALSTON_FANG,220,255],
-    5:[QUEEN_SHYEED,		SHAIDS_TALON,130,165]
+    1:[DAIMON_THE_WHITE_EYED,	DAIMONS_EYES,360,430],
+    2:[HESTIA_GUARDIAN_DEITY,	HESTIAS_FAIRY_STONE,860,930],
+    3:[PLAGUE_GOLEM,		NUCLEUS_OF_LESSER_GOLEM,760,830],
+    4:[DEMONS_AGENT_FALSTON,	FALSTON_FANG,440,510],
+    5:[QUEEN_SHYEED,		SHAIDS_TALON,260,330]
     }
 
 RADAR={

+ 1 - 1
L2J_DataPack_BETA/data/scripts/quests/510_AClansReputation/__init__.py

@@ -14,7 +14,7 @@ Valdis = 31331
 Claw = 8767
 
 # Reward
-CLAN_POINTS_REWARD = 50 # Rep Points Per Tyrannosaurus Item - need to be confirmed
+CLAN_POINTS_REWARD = 100 # Rep Points Per Tyrannosaurus Item - need to be confirmed
 
 class Quest (JQuest) :
 

+ 1 - 1
L2J_DataPack_BETA/data/scripts/quests/Q10283_RequestOfIceMerchant/32020-00.htm

@@ -1,4 +1,4 @@
 <html><body>Rafforty:<br>
-Haven't you heard of this place? It's too dangerous, just remain here... curio Request of Ice Merchantus from a distance. <br>
+Haven't you heard of this place? It's too dangerous, just remain here... curious from a distance. <br>
 (Only characters level 82 or above who have completed quest The Other Side of Truth may take on this quest.)<br>
 </body></html>

+ 1 - 1
L2J_DataPack_BETA/data/scripts/quests/Q10283_RequestOfIceMerchant/32022-01.html

@@ -1,4 +1,4 @@
-<html><body>Rafforty:<br>
+<html><body><br>
 (Hm. I looked for the Divine Sword around Kier as Rafforty said, but it doesn't seem to be here.<br>
 Wait, what's that behind me?)<br>
 <a action="bypass -h Quest 10283_RequestOfIceMerchant spawn">Look around.</a><br>

+ 4 - 0
L2J_DataPack_BETA/data/scripts/quests/Q10283_RequestOfIceMerchant/32760-10.html

@@ -0,0 +1,4 @@
+<html><body>Jinia:<br>
+Who are you?<br>
+<a action="bypass -h npc_%objectId%_Quest">Rafforty send me</a><br>
+</body></html>

+ 7 - 5
L2J_DataPack_BETA/data/scripts/quests/Q10283_RequestOfIceMerchant/Q10283_RequestOfIceMerchant.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.quest.State;
  **
  ** 2010-08-07 Based on Freya PTS
  */
-
 public class Q10283_RequestOfIceMerchant extends Quest
 {
 	private static final String qn = "10283_RequestOfIceMerchant";
@@ -110,7 +109,7 @@ public class Q10283_RequestOfIceMerchant extends Quest
 						htmltext = "32020-08.htm";
 					break;
 				case State.COMPLETED:
-					htmltext = "31350-08.htm";
+					htmltext = "32020-09.htm";
 					break;
 			}
 		}
@@ -129,12 +128,15 @@ public class Q10283_RequestOfIceMerchant extends Quest
 	public String onFirstTalk(L2Npc npc, L2PcInstance player)
 	{
 		QuestState st = player.getQuestState(qn);
-		if (st == null)
-			return null;
-		if (npc.getNpcId() == _jinia && st.getInt("cond") == 2)
+
+		if (npc.getInstanceId() > 0)
+			return "32760-10.html";
+		if (npc.getNpcId() == _jinia && st != null && st.getInt("cond") == 2)
 			return "32760-01.html";
+		
 		return null;
 	}
+	
 	public static void main(String[] args)
 	{
 		new Q10283_RequestOfIceMerchant(10283, qn, "Request of Ice Merchant");

+ 1 - 1
L2J_DataPack_BETA/data/scripts/quests/Q148_PathtoBecominganExaltedMercenary/Q148_PathtoBecominganExaltedMercenary.java

@@ -93,7 +93,7 @@ public class Q148_PathtoBecominganExaltedMercenary extends Quest
 				case State.STARTED :
 					if (st.getInt("cond") < 4)
 					{
-						htmltext = "elite-04.htm";
+						htmltext = "exalted-04.htm";
 					}
 					else if (st.getInt("cond") == 4)
 					{

+ 18 - 18
L2J_DataPack_BETA/data/scripts/village_master/9000_clan/9000-03.htm

@@ -1,22 +1,22 @@
 <html><body>
-Clan level can be raised. To do so requires the following:<br>
-Level 1: 20,000 SP, 650,000 Adena<br>
-Level 2: 100,000 SP, 2,500,000 Adena<br>
-Level 3: 350,000 SP, Evidence of Blood<br>
-Level 4: 1,000,000 SP, Evidence of Determination<br>
-Level 5: 2,500,000 SP, Evidence of Aspiration<br>
-Level 6: 5,000 Clan Fame points, more than 30 clan members<br>
-Level 7: 10,000 Clan Fame points, more than 50 clan members<br>
-Level 8: 20,000 Clan Fame points, more than 80 clan members<br>
-Level 9: 40,000 Clan Fame points, more than 120 clan members, 150 Blood Oaths<br>
-Level 10: 40,000 Clan Fame points, more than 140 clan members, 5 Blood Alliances<br>
-Level 11: 75,000 Clan Fame points, more than 170 clan members, Territory Owner<br>
-You can get Evidence of Blood when you catch Bloody Queen in Dragon Valley.<br>
-To obtain Evidence of Determination, meet Sir Christopher Rodemai in Giran Castle Town. <br>
-To obtain Evidence of Aspiration, see Sir Gustav Athebaldt in the Town of Oren. <br>
-To obtain the Blood Oath, you must capture and hold a fortress and demonstrate protection of your territory.<br>
-To get the Determination of Blood, you must capture and hold a castle and demonstrate protection of your territory and care for your subjects.<br>
-<a action="bypass -h Quest 9000_clan 9000-16.htm">See how to obtain Clan Fame points.</a><br>
+The clan level can be raised. Raising clan level requires the following:<br>
+Level 1 - SP : 20,000 Adena : 650,000<br>
+Level 2 - SP: 100,000 / Adena: 2,500,000<br>
+Level 3 - SP: 350,000 / Item: Blood Mark<br>
+Level 4 - SP: 1,000,000 / Item: Alliance Manifesto<br>
+Level 5 - SP: 2,500,000 / Item: Seal of Aspiration<br>
+Level 6 - Clan Fame: 5,000 / Clan Member: More than 30<br>
+Level 7 - Clan Fame: 10,000 / Clan Member: More than 50<br>
+Level 8 - Clan Fame: 20,000 / Clan Member: More than 80<br>
+Level 9 - Clan Fame: 40,000 / Clan Member: More than 120 / Item: 150 Blood Oaths<br>
+Level 10 - Clan Fame: 40,000 / Clan Member: More than 140 / Item: 5 Blood Alliance<br>
+Level 11 - Clan Fame: 75,000 / Clan Member: More than 170 / Must be Territory Owner<br>
+You can obtain a Blood Mark by killing a Bloody Queen. They are located in Watcher's Tomb or around the Forbidden Gateway.<br>
+To obtain an Alliance Manifesto, meet sir Christopher Rodemai of Giran Castle Town.<br>
+To obtain a Seal of Aspiration, see Sir Gustav Athebaldt in the Town of Oren.<br>
+To obtain Blood Oath, acquire a fortress and prove that the territories are being protected.<br>
+To obtain the Determination of Blood, possess a castle and prove that the territories are being protected and citizens are being taken care of. <br>
+<a action="bypass -h Quest 9000_clan 9000-16.htm">How to obtain Clan Fame</a><br>
 <button value="Level Up" action="bypass -h npc_%objectId%_increase_clan_level" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 <button value="Cancel" action="bypass -h Quest 9000_clan 9000-01.htm" width=80 height=27 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF">
 </body></html>