summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-20 11:43:54 +0000
committerLupus <Lupus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-03-20 11:43:54 +0000
commit3ba7080dfd21b1c163cd8f44f6f63508f6d04fa7 (patch)
tree337a0b75f54e22c80832415d84c814726b2d774c
parent2b658a40d4d4b1ca2ef717e7303392d139629c79 (diff)
downloadhercules-3ba7080dfd21b1c163cd8f44f6f63508f6d04fa7.tar.gz
hercules-3ba7080dfd21b1c163cd8f44f6f63508f6d04fa7.tar.bz2
hercules-3ba7080dfd21b1c163cd8f44f6f63508f6d04fa7.tar.xz
hercules-3ba7080dfd21b1c163cd8f44f6f63508f6d04fa7.zip
Fixed possible Castle Economy investment overflow with Emsolute Develop learnt
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5676 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/Changelog.txt1
-rw-r--r--npc/guild/gldfunc_manager.txt8
2 files changed, 5 insertions, 4 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 4f83c636e..e1393ef50 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -28,6 +28,7 @@ Nexon
Date Added
======
03/20
+ * Fixed possible Castle Economy investment overflow with Emsolute Develop learnt [Lupus]
* Removed Berserk Potions from all shops, but Comodo [Lupus]
03/19
* Fixed Female Thief Bug in novice land. [Vicious]
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index 59ad69442..febbee445 100644
--- a/npc/guild/gldfunc_manager.txt
+++ b/npc/guild/gldfunc_manager.txt
@@ -4,7 +4,7 @@
//= jAthena - kalen (1.0)
//= 1.1 by Akaru, ho|yAnge|X, and Valaris
//===== Current Version: =====================================
-//= 1.31
+//= 1.41
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -29,7 +29,8 @@
//= v1.2c Fixed issue of guardians hp not increasing upon defense
//= investment.[kobra_k88]
//= v1.3 Now you can't install Guardians during WOE [Lupus]
-//= v1.4 Reomve surrender abbility (Was 100% custom as far as I can tell) [Kayla]
+//= v1.4 Remove surrender abbility (Was 100% custom as far as I can tell) [Kayla]
+//= v1.41 Fixed possible Economy investment overflow with Emsolute Develop learnt [Lupus]
//============================================================
@@ -118,8 +119,7 @@ L_Start:
set Zeny,Zeny-@eco_invest;
SetCastleData getarg(1)+".gat",4,@TriggerE+1;
// if we learnt Emsolute Develop there's 50% chance to get +1 investment again
- if (getgdskilllv(@GID,10014) > 0 && rand(100)>50) set @Economy, @Economy + 1;
- SetCastleData getarg(1)+".gat",2,@Economy+1;
+ SetCastleData getarg(1)+".gat",2,@Economy + 1 + (getgdskilllv(@GID,10014)>0 && rand(100)>50 && @Economy<99);
mes "[ "+getarg(0)+" ]";
mes "You have invested successfully.";
return 0;