summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/quests/quests_13_2.txt2
-rw-r--r--npc/re/jobs/3-1/guillotine_cross.txt8
2 files changed, 4 insertions, 6 deletions
diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt
index 8ae078dfb..f2c64d2d8 100644
--- a/npc/quests/quests_13_2.txt
+++ b/npc/quests/quests_13_2.txt
@@ -4832,10 +4832,10 @@ man_in01,372,221,5 script Scientist#lifeguard 449,{
delitem 6077,.@stone_chk; //Rough_Mineral
delitem 6078,.@stoneelse_chk; //Stone_Fragments
delitem 6076,1; //Portable_Toolbox
- set ep13_2_tre,100;
getitem 6080,2; //Manuk_Coin
getexp 0,70000;
changequest 2179+(ep13_2_tre-2),2182;
+ set ep13_2_tre,100;
close;
}
else {
diff --git a/npc/re/jobs/3-1/guillotine_cross.txt b/npc/re/jobs/3-1/guillotine_cross.txt
index 8fe6512ac..4f350460a 100644
--- a/npc/re/jobs/3-1/guillotine_cross.txt
+++ b/npc/re/jobs/3-1/guillotine_cross.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Muad_Dib
//===== Current Version: =====================================
-//= 1.0b
+//= 1.1
//===== Compatible With: =====================================
//= rAthena SVN r16945+
//===== Description: =========================================
@@ -13,6 +13,7 @@
//= 1.0 Adapted from original script. [Euphy]
//= 1.0a Added 'npcskill' command. [Euphy]
//= 1.0b Moved warps to separate file. [Euphy]
+//= 1.1 Fixed some minor bugs. [Euphy]
//============================================================
que_job01,75,96,3 script Guild Member#3rdgc01 997,{
@@ -720,7 +721,6 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{
close;
}
} else if (Class == Job_Guillotine_Cross || Class == Job_Guillotine_Cross_T || Class == Job_Baby_Cross) {
- mes "[Daora]";
if (Sex) {
mes "Oh~ you're good-looking~!";
mes "It's worthwhile to open a pub~";
@@ -780,12 +780,10 @@ job3_guil01,82,95,3 script Daora#3rdgc02 940,{
}
} else {
if (Sex == 1) {
- mes "[Daora]";
mes "Oh~ you're good-looking!";
mes "So, what do you want?";
}
else {
- mes "[Daora]";
mes "Hum...you're a girl.";
mes "Ok pick up whatever you want.";
}
@@ -2681,8 +2679,8 @@ ve_fild05,327,308,3 script Girl#3rdgc14 466,{
switch(select("I got it.:I'll be ready.")) {
case 1:
if ($@3rdgc_room02 == 0) {
- set job_3rd_gc, 17;
erasequest ((job_3rd_gc == 17)?7110:7109);
+ set job_3rd_gc, 17;
setquest 7110;
set $@3rdgc_room02, 1;
warp "job3_guil03",22,70;