summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/guild/gldfunc_manager.txt8
-rw-r--r--npc/kafras/functions_kafras.txt7
3 files changed, 13 insertions, 5 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 7a1a644e0..a20f1de19 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -35,6 +35,9 @@ Other Ppl
Date Added
======
+03/23
+ * WOE 1.3 Now you can't install Guardians during WOE [Lupus]
+ * Set only Storage/Cancel to Kafra in Niflheim. [Lupus]
03/22
* Moved position for Marx Hansen to payon_in03, thanks to Dino9021 [celest]
03/18
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index de47fbeab..ec40e5a1e 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.2b
+//= 1.3
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -27,6 +27,7 @@
//= v1.2b U can't surrender the base during WOE [Lupus]
//= v1.2c Fixed issue of guardians hp not increasing upon defense
//= investment.[kobra_k88]
+//= 1.3 Now you can't install Guardians during WOE [Lupus]
//============================================================
@@ -222,6 +223,7 @@ L_Start:
//set @SGuardian,strmobinfo(4,1287) + (@Defence*2000);
mes "[ "+getarg(0)+" ]";
+ if(agitcheck(0) != 0) goto L_CantGuard;
mes "Would you like to install a guardian? Guardians will protect the guild base from enemies.";
mes "Please choose a guardian.";
next;
@@ -308,6 +310,10 @@ L_Start:
mes "Excuse me Master, but that guardian has already been installed.....";
emotion 4;
return 0;
+ L_CantGuard:
+ mes "Master.... don't you know that we can't install guardians during the War Of Emperium?!!";
+ emotion 4;
+ return 0;
//===========================
M_Kaf:
diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt
index 0483ebafe..ff4b552ee 100644
--- a/npc/kafras/functions_kafras.txt
+++ b/npc/kafras/functions_kafras.txt
@@ -9,7 +9,7 @@
//= Lupus
//= kobra_k88 (2.0)
//===== Current Version: =====================================
-//= 2.2b
+//= 2.3
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: ===============================================
@@ -24,7 +24,7 @@
//= 2.2a Minor changes to function calls. Using agruments. Added Guild options. [kobra_k88]
//= 2.2b This version uses arrays for the teleport option.
//= Rearranged next statements to make menu transitions smoother. [kobra_k88]
-//= Fixed typo >_< [Aria]
+//= 2.3 Removed SAVE from Niflheim. [Lupus]
//============================================================
@@ -44,8 +44,7 @@ function script F_Kafra {
if(getarg(0)==2) menu "-Use Storage",M_Storage, "-Use Guild Storage",M_GStorage, "-Rent a Cart",M_Cart, "-Use Teleport Service",M_Teleport, "-Cancel",M_End;
- if(getarg(1)==1) menu "-Save",M_Save, "-Use Storage",M_Storage, "-Rent a Cart",M_Cart, "-Kafra Pass",M_Pass, "-Other Information Check",M_Info,
- "-Cancel",M_End;
+ if(getarg(1)==1) menu "-Use Storage",M_Storage, "-Cancel",M_End;
menu "-Save",M_Save, "-Use Storage",M_Storage, "-Use Teleport Service",M_Teleport, "-Rent a Cart",M_Cart, "-Kafra Pass",M_Pass,
"-Other Information Check",M_Info, "-Cancel",M_End;