summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/guild/gldfunc_manager.txt29
-rw-r--r--npc/guild/gldfunc_treasure.txt5
-rw-r--r--npc/guild/nguild/nguild_treas.txt11
-rw-r--r--npc/guild/nguild/nguild_warper.txt14
5 files changed, 34 insertions, 28 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index b2e06aa03..d57e2b49c 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -30,6 +30,9 @@ Playtester
Date Added
======
10/06
+ * Added official treasure spawn to Novice Castles [Lupus]
+ - Added official Novice WoE restriction: Only the 1st class players (+Novice, SN) < 60 Base Level can enter.
+ - You can't invest Eco/Def, hire Guardians at Novice Castles
* Many minor fixes, thanks to theultramage [Lupus]
- Fixed "mymob" Niflheim bug, fixed Sworman Job Quest timer issue, fixed overlapping NPCs.
10/05
diff --git a/npc/guild/gldfunc_manager.txt b/npc/guild/gldfunc_manager.txt
index febbee445..e81beb5f7 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.41
+//= 1.5
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
@@ -19,18 +19,15 @@
//= arg(3): y1 coordinate for warp to treasure room
//= arg(4): guild script suffix for kafra, gaurdian scripts etc.
//===== Additional Comments: =================================
-//= v1.31: Added support for Emsolute Develop [celest]
-//= v1.2: All Guild manager scripts use this function. Optimized
-//= Comerce and Defense investment. [kobra_k88]
-//= v1.2a Function now returns to script that called it.
-//= Added disablenpc line to surrender castle option to remove kafra
-//= upon surrender.[kobra_k88]
-//= 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]
-//= v1.3 Now you can't install Guardians during WOE [Lupus]
-//= 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]
+//= 1.31: Added support for Emsolute Develop [celest]
+//= 1.2: All Guild manager scripts use this function. Optimized Comerce and Defense investment. [kobra_k88]
+//= 1.2a Function now returns to script that called it. Added disablenpc line to surrender castle option to remove kafra upon surrender.[kobra_k88]
+//= 1.2b U can't surrender the base during WOE [Lupus]
+//= 1.2c Fixed issue of guardians hp not increasing upon defense investment.[kobra_k88]
+//= 1.3 Now you can't install Guardians during WOE [Lupus]
+//= 1.4 Remove surrender abbility (Was 100% custom as far as I can tell) [Kayla]
+//= 1.41 Fixed possible Economy investment overflow with Emsolute Develop learnt [Lupus]
+//= 1.5 Official Novice Castles Menu (u can't invest / hire guardians) [Lupus]
//============================================================
@@ -63,6 +60,12 @@ L_Start:
mes "[ "+getarg(0)+" ]";
mes "Welcome Master ^5533FF" + getguildmaster(@GID) + "^000000 ! I will assist you in any way I can!";
next;
+
+ //Novice Castles. (we don't need ELSE here. Menu has direct labels)
+ if(getarg(1) == "nguild_prt" || getarg(1) == "nguild_alde" || getarg(1) == "nguild_gef" || getarg(1) == "nguild_pay" )
+ menu "Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
+
+ //Common WoE Castles
menu "Guild Base Briefing",M_Base, "Commerce Investment",M_Comrc, "Defence Investment",M_Def, "Guardian Installation",M_Gaurd,
"Kafra Service Employment / Dismissal",M_Kaf, "Enter Treasure Room",M_Treas, "Cancel",M_End;
diff --git a/npc/guild/gldfunc_treasure.txt b/npc/guild/gldfunc_treasure.txt
index 17d3380aa..9118e8a82 100644
--- a/npc/guild/gldfunc_treasure.txt
+++ b/npc/guild/gldfunc_treasure.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= holyAngelX (1.0) Akaru and ho|yAnge|X (1.1)
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= eAthena 1+; RO Episode 4+
//===== Description: =========================================
@@ -37,6 +37,7 @@
//= 1.5 Fixed treasure number 'round exploit' [Lupus]
//= 1.6 to Aegis X.2 formula 4..24 Treasure Chests [Lupus]
//= 1.7 Box Count fix by Zoc. Now it spawns 1st/2nd Treasure Chest 50%/50% [Lupus]
+//= 1.8 Official Treasure Spawn in Novice Castles. Had to add +1 in odd/even formula to leave correct ID of NG Treasure Box 8) [Lupus]
//============================================================
@@ -60,7 +61,7 @@ function script F_GldTreas {
set getarg(3), getarg(2); //sets the counter variable = to the box number amount
L_SPAWN:
- set getarg(4), getarg(5)+(getarg(3) & 1); //sets the box id variable = to the box id
+ set getarg(4), getarg(5)+((getarg(3)+1) & 1); //sets the box id variable = to the box id
areamonster getarg(0)+".gat",getarg(6),getarg(7),getarg(8),getarg(9),"Treasure Chest",getarg(4),1,"Treasure_"+getarg(1)+"::OnDied";
set getarg(3), getarg(3) - 1;
if(getarg(3) > 0) goto L_SPAWN;
diff --git a/npc/guild/nguild/nguild_treas.txt b/npc/guild/nguild/nguild_treas.txt
index 5c16e71a0..27e3ff228 100644
--- a/npc/guild/nguild/nguild_treas.txt
+++ b/npc/guild/nguild/nguild_treas.txt
@@ -3,13 +3,14 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.1
+//= 1.2
//===== Compatible With: =====================================
//= eAthena 0.1+; RO Episode 4+
//===== Description: =========================================
//=
//===== Additional Comments: =================================
//= Based off existing guild scripts. Do not know if it is accurate.[kobra_k88]
+//= 1.2 Official treasure spawn [Lupus]
//============================================================
@@ -23,7 +24,7 @@ OnRecvCastleN01:
OnInit:
if($boxNumN01 == 0) end;
set $@bxN01, $boxNumN01;
- callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324,114,218,123,227,1;
+ callfunc "F_GldTreas","nguild_alde","N01",$boxNumN01,$@bxN01,$@boxIdN01,1324+rand(10),114,218,123,227,1;
end;
OnDied:
@@ -49,7 +50,7 @@ OnRecvCastleN02:
OnInit:
if($boxNumN02 == 0) end;
set $@bxN02, $boxNumN02;
- callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334,150,108,158,114,1;
+ callfunc "F_GldTreas","nguild_gef","N02",$boxNumN02,$@bxN02,$@boxIdN02,1334+rand(10),150,108,158,114,1;
end;
OnDied:
@@ -74,7 +75,7 @@ OnRecvCastleN03:
OnInit:
if($boxNumN03 == 0) end;
set $@bxN03, $boxNumN03;
- callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344,286,4,295,13,1;
+ callfunc "F_GldTreas","nguild_pay","N03",$boxNumN03,$@bxN03,$@boxIdN03,1344+rand(10),286,4,295,13,1;
end;
OnDied:
@@ -99,7 +100,7 @@ OnRecvCastleN04:
OnInit:
if($boxNumN04 == 0) end;
set $@bxN04, $boxNumN04;
- callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354,6,204,15,213,1;
+ callfunc "F_GldTreas","nguild_prt","N04",$boxNumN04,$@bxN04,$@boxIdN04,1354+rand(10),6,204,15,213,1;
end;
OnDied:
diff --git a/npc/guild/nguild/nguild_warper.txt b/npc/guild/nguild/nguild_warper.txt
index 37638129a..860a8eafc 100644
--- a/npc/guild/nguild/nguild_warper.txt
+++ b/npc/guild/nguild/nguild_warper.txt
@@ -3,9 +3,9 @@
//===== By: ==================================================
//= Lupus
//===== Current Version: =====================================
-//= 1.5
+//= 1.6
//===== Compatible With: =====================================
-//= eAthena 1+; RO Episode 4+
+//= eAthena 1+ with eaclass(); RO Episode 4+
//===== Description: =========================================
//=
//===== Additional Comments: =================================
@@ -22,7 +22,8 @@
//= updated list of unallowed buffs [Lupus]
//= 1.4 Restricted it to 80 Base Level [Lupus]
//= 1.5 According to official info: 1 Treasure Chest per Castle
-//= TODO: The official entrance is in Izlude.
+//= 1.6 Only 1st Class < 60 BaseLevel Players can participate
+//= TODO: The official entrance is in Izlude.
//============================================================
@@ -30,11 +31,8 @@ prontera.gat,146,163,6 script Novice Castles 729,{
mes "[Cita]";
mes "Hey! I'm a new usher of Novice Castles.";
next;
- if( BaseJob == Job_SuperNovice || BaseJob == Job_Novice
- || (Class==Job_Taekwon && BaseLevel<60)
- || (Class==Job_Gunslinger && BaseLevel<60)
- || (BaseJob>=Job_Novice && BaseJob<=Job_Thief && BaseLevel<60)
- ) menu "Warp me to Novice Castles",M_WARP,"Cancel",-;
+ if( !(eaclass()&(EAJL_2|EAJL_UPPER)) && BaseLevel<60 )
+ menu "Warp me to Novice Castles",M_WARP,"Cancel",-;
mes "[Cita]";
mes "I'm sorry, you can't enter the sacred Novice Castles place.";
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-04 08:24:51 +0000