Sfoglia il codice sorgente

fixed WoE defence/eco underflow

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8741 54d463be-8e91-2dee-dedb-b68131a5f0ec
Lupus 18 anni fa
parent
commit
4e0274eac0
2 ha cambiato i file con 12 aggiunte e 7 eliminazioni
  1. 1 0
      npc/Changelog.txt
  2. 11 7
      npc/guild/gldfunc_ev_agit.txt

+ 1 - 0
npc/Changelog.txt

@@ -35,6 +35,7 @@ Date		Added
 09/14
 	* Fixed typos in Gunslinger & Thief Job Quest & various NPCs [Lupus]
 		thanks to cbmaster & $ephiroth
+	- Fixed Guild Defence / Economy underflow, thx2 kyoki
 09/11
 	* Moved custom Umbalian quests to custom folder [Lupus]
 	* Added back Guild Storage. Confirmed kRO feature. [Lupus]

+ 11 - 7
npc/guild/gldfunc_ev_agit.txt

@@ -4,7 +4,7 @@
 //= jAthena - kalen (1.0)
 //= 1.1 by Akaru, ho|yAnge|X, and Valaris
 //===== Current Version: =====================================
-//= 1.3
+//= 1.3a
 //===== Compatible With: =====================================
 //= eAthena 0.1+; RO Episode 4+
 //===== Description: =========================================
@@ -25,6 +25,7 @@
 //= v1.2: All OnAgitStart and OnAgitBreak calls will use these functions.[kobra_k88]
 //= v1.2a: Added OnAgitEnd function.[kobra_k88]
 //= 1.3 Added code for abandoning captured castles on /breakguild [Lupus]
+//= 1.3a fixed Defence / Economy underflow [Lupus] thanks2 kyoki
 //============================================================
 
 
@@ -127,12 +128,15 @@ function	script	F_AgitBreak	{
 	//killmonsterall getarg(0)+".gat";
 	set @GID,getcharid(2);
 	if (@GID <= 0) return;
-	set @Economy,GetCastleData(getarg(0)+".gat",2);
-	SetCastleData getarg(0)+".gat",2, @Economy-5;
-	if (GetCastleData(getarg(0)+".gat",2) < 0) SetCastleData getarg(0)+".gat",2,0;
-	set @Defence,GetCastleData(getarg(0)+".gat",3);
-	SetCastleData getarg(0)+".gat",3, @Defence-5;
-	if (GetCastleData(getarg(0)+".gat",3) < 0) SetCastleData getarg(0)+".gat",3,0;
+
+	set @Economy,GetCastleData(getarg(0)+".gat",2) - 5;
+	if (@Economy < 0) set @Economy, 0;
+	SetCastleData getarg(0)+".gat",2, @Economy;
+
+	set @Defence,GetCastleData(getarg(0)+".gat",3) - 5;
+	if (@Defence < 0) set @Defence, 0;
+	SetCastleData getarg(0)+".gat",3, @Defence;
+
 	SetCastleData getarg(0)+".gat",1, @GID;
 	MapAnnounce getarg(0)+".gat","The emperium has been destroyed.",17;
 	Announce "Guild Base [" + GetCastleName(getarg(0)+".gat") + "] has been taken by the [" + GetGuildName(@GID) + "] guild.",0;