summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--npc/Changelog.txt3
-rw-r--r--npc/jobs/2-1/assassin.txt27
-rw-r--r--npc/jobs/2-1/wizard.txt15
-rw-r--r--npc/warps/cities/yuno.txt21
4 files changed, 42 insertions, 24 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 494b3399a..ffaa37c48 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -33,6 +33,9 @@ KarLaeda
Date Added
======
+12/11 * Added Yuno Government Buildings warps. Thanks to $ephiroth [Lupus]
+ - Added missing next, removed extra line to Wizard Job Quest
+ * Fixed Rogue / Assassin exploit, thanks to El Nino
12/06
* Minor fix to the sign quest, thanks to theultramage for pointing it out [MasterOfMuppets]
12/01
diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt
index fc30115c0..3ed03987b 100644
--- a/npc/jobs/2-1/assassin.txt
+++ b/npc/jobs/2-1/assassin.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 2.4
+//= 2.5
//===== Compatible With: =====================================
//= eAthena RC4
//===== Description: =========================================
@@ -31,6 +31,7 @@
//= 2.3 Fixed typo and change Nameless addtimer to 100 (with 700ms I
//= was still able to bypass it) [Toms]
//= 2.4 Fixed skipping of Nameless NPC [Lupus]
+//= 2.5 Fixed a Rogue exploit [Lupus]
//============================================================
@@ -90,23 +91,23 @@ in_moc_16.gat,19,33,4 script Guildsman 55,{
emotion e_gg;
close;
}
- if(baseClass != Job_Thief){
+ if(baseClass != Job_Thief || BaseJob == Job_Rogue){
mes ".... Hmm.... although you're not an Assassin or Thief... I have to say I like your sense of style.";
close;
}
- if(JobLevel >= 40) goto L_Start;
- mes "Hmm? What brings you here?.... I don't think I like the way you're looking at me....?!";
- emotion e_what;
- next;
- mes "[Angry looking man]";
- mes ".... Hmm.... You're not qualified yet. To become an Assassin you will have to meet our expectations.";
- next;
- mes "[Angry looking man]";
- mes "Why don't you go train some more...... You need to have a job level of at least 40 to even hope of becoming one of us....";
- close;
+ if(JobLevel < 40){
+ mes "Hmm? What brings you here?.... I don't think I like the way you're looking at me....?!";
+ emotion e_what;
+ next;
+ mes "[Angry looking man]";
+ mes ".... Hmm.... You're not qualified yet. To become an Assassin you will have to meet our expectations.";
+ next;
+ mes "[Angry looking man]";
+ mes "Why don't you go train some more...... You need to have a job level of at least 40 to even hope of becoming one of us....";
+ close;
+ }
-L_Start:
if(ASSIN_Q == 1) goto L_Failed1;
if(ASSIN_Q == 2) goto L_Failed2;
if(ASSIN_Q == 4) goto L_Change;
diff --git a/npc/jobs/2-1/wizard.txt b/npc/jobs/2-1/wizard.txt
index ac79f48ba..8dce35e60 100644
--- a/npc/jobs/2-1/wizard.txt
+++ b/npc/jobs/2-1/wizard.txt
@@ -1,11 +1,10 @@
//===== eAthena Script =======================================
//= Wizard Job Quest
//===== By: ==================================================
-//= (Aegis) Translated by yoshiki
-//= converted by kobra_k88
+//= (Aegis) Translated by yoshiki, converted by kobra_k88
//= Further bugfixed and tested by Lupus
//===== Current Version: =====================================
-//= 2.2
+//= 2.2a
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -19,15 +18,13 @@
//= 1.2b Fixed issue with duplicating monsters thx to Bison.[kobra_k88]
//= 1.2c changed one Horong to Frilldora (now 3rd room contains 1 agressive mob.)
//= 1.2d more simplified fire room - removed agressive Desert Wolf [Lupus]
-//= 1.3 Added Baby Class support [Lupus]
-//= 1.5 Fixed possible EXP abuse [Lupus]
+//= 1.3 Added Baby Class support. 1.5 Fixed possible EXP abuse [Lupus]
//= 1.6 Added a func which prevent advanced classes passing
-//= 2nd Job Quests again. It also guides adv classes where
-//= to go. [Lupus]
+//= 2nd Job Quests again. It also guides adv classes where to go. [Lupus]
//= 1.7 Replaced 2 Hodes with 2 Horong's (according to the official guide) [Lupus]
//= 1.8 Removed callfunc Is_####_Class in favor of baseClass [Silentdragon]
//= 2.1 Changed numbers to constants. [Vicious]
-//= 2.2 Merged back JFunc [Lupus]
+//= 2.2 Merged back JFunc [Lupus] 2.2a Removed extra MES, added missing NEXT
//============================================================
@@ -58,7 +55,6 @@ gef_tower.gat,107,35,5 script Some Dog 81,{
close;
L_JobMage:
- mes "[Dog]";
mes "Ah... I know what you're about to say.... You want to become a Wizard right?";
next;
mes "[Dog]";
@@ -73,6 +69,7 @@ L_JobMage:
mes "[Dog]";
mes "~Woof~ What is it? Why are you looking at me like that?? Is this the first time you've seen a dog talk?";
emotion e_what;
+ next;
mes "[Dog]";
mes "~Woof~ I suppose it's not that common to see a talking dog..... ~Woof~..... Yeah, it is a rare site actually.....";
next;
diff --git a/npc/warps/cities/yuno.txt b/npc/warps/cities/yuno.txt
index cdc558cec..4981d9dd0 100644
--- a/npc/warps/cities/yuno.txt
+++ b/npc/warps/cities/yuno.txt
@@ -4,7 +4,7 @@
//= Nana (1.0)
//= Sara-chan (1.1)
//===== Current Version: =====================================
-//= 1.5
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 5+
//===== Description: =========================================
@@ -17,6 +17,7 @@
//= 1.5 Added Missing Juno warps [musashiden]
//= 1.6 Corrected duplicate warps [Musashiden]
//= 1.7 Yet another missing warp [Musashiden]
+//= 1.8 Added Yuno Government Buildings warps
//============================================================
//= Yuno City ================================================
@@ -199,4 +200,20 @@ w3: warp "yuno_in05",136,75; end;
}
// Yuno In05 (Destination - Escaped Random Warps) ------------------------------
yuno_in05.gat,31,167,0 warp yun76 1,1,yuno_in05.gat,50,85
-yuno_in05.gat,50,88,0 warp yun77 1,1,yuno_in02.gat,85,14 \ No newline at end of file
+yuno_in05.gat,50,88,0 warp yun77 1,1,yuno_in02.gat,85,14
+
+// Yuno Government Buildings ---------------------------------------------------
+yuno_pre.gat,52,22,0 warp yungvn01 1,1,yuno_pre.gat,37,23
+yuno_pre.gat,87,22,0 warp yungvn02 1,1,yuno_pre.gat,102,22
+yuno_pre.gat,41,23,0 warp yungvn03 1,1,yuno_pre.gat,56,22
+yuno_pre.gat,18,35,0 warp yungvn04 1,1,yuno_pre.gat,18,53
+yuno_pre.gat,98,22,0 warp yungvn05 1,1,yuno_pre.gat,83,22
+yuno_pre.gat,112,35,0 warp yungvn06 1,1,yuno_pre.gat,112,52
+yuno_pre.gat,18,48,0 warp yungvn07 1,1,yuno_pre.gat,18,31
+yuno_pre.gat,18,77,0 warp yungvn08 1,1,yuno_pre.gat,18,96
+yuno_pre.gat,37,69,0 warp yungvn09 1,1,yuno_pre.gat,64,69
+yuno_pre.gat,112,48,0 warp yungvn10 1,1,yuno_pre.gat,112,31
+yuno_pre.gat,94,69,0 warp yungvn11 1,1,yuno_pre.gat,77,69
+yuno_pre.gat,60,69,0 warp yungvn12 1,1,yuno_pre.gat,33,69
+yuno_pre.gat,81,69,0 warp yungvn13 1,1,yuno_pre.gat,98,69
+yuno_pre.gat,18,92,0 warp yungvn14 1,1,yuno_pre.gat,18,73 \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-01 21:50:30 +0000