summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 07:56:11 +0000
committerMasterOfMuppets <MasterOfMuppets@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-07-20 07:56:11 +0000
commitf4914f3e5afbd7f89784d0425fa3cf089a4b52f6 (patch)
treedc3b75e7e2ae0239fab9486fdfb65548414ac3ab
parentf19655ca917331e97b6589fd950b3bf5237269cd (diff)
downloadhercules-f4914f3e5afbd7f89784d0425fa3cf089a4b52f6.tar.gz
hercules-f4914f3e5afbd7f89784d0425fa3cf089a4b52f6.tar.bz2
hercules-f4914f3e5afbd7f89784d0425fa3cf089a4b52f6.tar.xz
hercules-f4914f3e5afbd7f89784d0425fa3cf089a4b52f6.zip
Dj-Yhn optimized the Shinokas quest to only use one variable.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7757 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--npc/cities/einbech.txt18
-rw-r--r--npc/quests/quests_einbroch.txt49
2 files changed, 35 insertions, 32 deletions
diff --git a/npc/cities/einbech.txt b/npc/cities/einbech.txt
index cd9439f84..d1d5e20b4 100644
--- a/npc/cities/einbech.txt
+++ b/npc/cities/einbech.txt
@@ -407,7 +407,7 @@ einbech.gat,57,210,4 script Young Man#04 854,{
mes "that old act that way, but";
mes "it makes me wonder what";
mes "could have happened to him.";
- set ein_young_man,1;
+ set Shinokas_Quest,1;
close;
}
@@ -978,13 +978,13 @@ L_FINE:
}
einbech.gat,165,105,7 script Buender Hikeman 847,{
- if(Shinokas_Quest == 5) goto L_P2;
- if(einbech_buender == 2)goto L_BEST;
- if(einbech_buender == 1)goto L_BASTARD;
+ if(Shinokas_Quest == 9) goto L_P2;
+ if(Shinokas_Quest == 3)goto L_BEST;
+ if(Shinokas_Quest == 2)goto L_BASTARD;
mes "[Buender Hikeman]";
mes "...";
mes "......";
- if(!ein_young_man)close;
+ if(!Shinokas_Quest)close;
next;
mes "[Buender Hikeman]";
mes "...";
@@ -1145,7 +1145,7 @@ L_CONTINUE:
mes "[Buender Hikeman]";
mes "Then I learned...";
mes "You planned it all along.";
- set einbech_buender,1;
+ set Shinokas_Quest,2;
close;
L_ORE:
mes "[Buender Hikeman]";
@@ -1244,7 +1244,7 @@ L_CONTINUE2:
mes "^0000FFIt wouldn't be a good idea to^000000";
mes "^0000FFprovoke the old man anymore,^000000";
mes "^0000FFintentionally or not.^000000";
- set einbech_buender,2;
+ set Shinokas_Quest,3;
close;
L_BEST:
mes "^0000FFIt'd be best^000000";
@@ -1267,7 +1267,7 @@ L_P2:
mes "^0000FFfrom the look of discomfort^000000";
mes "^0000FFon his face, he seems to be^000000";
mes "^0000FFhaving a nightmare.^000000";
- if (einbech_buender == 3) close;
+ if (Shinokas_Quest == 10) close;
next;
mes "["+strcharinfo(0)+"]";
mes "Excuse me...";
@@ -1386,7 +1386,7 @@ L_P2:
mes "cruelty? Whoever they are,";
mes "their intentions can't be good.";
close2;
- set einbech_buender,3;
+ set Shinokas_Quest,10;
if(BaseLevel < 41)set BaseExp,BaseExp+34750;
if(BaseLevel > 40 && BaseLevel < 61)set BaseExp,BaseExp+69500;
if(BaseLevel > 60 && BaseLevel < 71)set BaseExp,BaseExp+139000;
diff --git a/npc/quests/quests_einbroch.txt b/npc/quests/quests_einbroch.txt
index d4de36fd9..6e9692dd2 100644
--- a/npc/quests/quests_einbroch.txt
+++ b/npc/quests/quests_einbroch.txt
@@ -16,14 +16,14 @@
//=================================================== Shinokas
//====================================================== Quest
ein_in01.gat,231,163,1 script Sick Old Man 849,6,6,{
- if(Shinokas_Quest == 5) goto L_Dead;
- if(ein_lab == 2) goto L_Lab2;
- if(Shinokas_Quest == 4) goto L_Lab1;
- if(EinFactory == 16 && Shinokas_Quest == 3) goto L_Factory2;
- if(Shinokas_Quest == 3) goto L_Factory3;
- if(ein_maid) goto L_Factory;
- if(Shinokas_Quest == 2) goto L_Find;
- if(!Shinokas_Quest)set Shinokas_Quest,1;
+ if(Shinokas_Quest == 9) goto L_Dead;
+ if(Shinokas_Quest == 8) goto L_Lab2;
+ if(Shinokas_Quest == 7) goto L_Lab1;
+ if(EinFactory == 16 && Shinokas_Quest == 6) goto L_Factory2;
+ if(Shinokas_Quest == 6) goto L_Factory3;
+ if(Shinokas_Quest == 5) goto L_Factory;
+ if(Shinokas_Quest == 4) goto L_Find;
+ //if(!Shinokas_Quest)set Shinokas_Quest,1;
mes "[Sick Old Man]";
mes "...!";
next;
@@ -35,7 +35,7 @@ ein_in01.gat,231,163,1 script Sick Old Man 849,6,6,{
mes "come back from";
mes "the factory...?!";
next;
- if (einbech_buender == 2) goto L_Ask;
+ if (Shinokas_Quest == 3) goto L_Ask;
mes "^3131FFYou feel really awkward";
mes "just staring at this old";
mes "man violently rolling";
@@ -268,7 +268,7 @@ L_Cont:
mes "can sympathize with my situation,";
mes "please find out if the Kapelltheine";
mes "family has any unique ores...";
- set Shinokas_Quest,2;
+ set Shinokas_Quest,4;
close;
L_Find:
@@ -313,7 +313,7 @@ L_Factory:
mes "Please go and search the";
mes "Factory for that ore as";
mes "soon as you can.";
- set Shinokas_Quest,3;
+ set Shinokas_Quest,6;
close;
L_Factory3:
@@ -416,7 +416,7 @@ while(1)
mes "can enter that kind";
mes "of place. But I'm sure";
mes "you'll figure something out.";
- set Shinokas_Quest,4;
+ set Shinokas_Quest,7;
close;
}
}
@@ -428,7 +428,7 @@ L_Lab1:
close;
OnTouch:
- if (ein_lab < 2) end;
+ if (Shinokas_Quest != 8) end;
mes "^3131FFThe open window rattles";
mes "as you enter the room and";
mes "are welcomed by a sudden";
@@ -439,7 +439,7 @@ OnTouch:
mes "rumpled on the bed,";
mes "but you can see dark red";
mes "stains in between the folds.";
- set ein_lab,3;
+ //set ein_lab,3; //wth? -Yhn
close;
L_Lab2:
@@ -520,7 +520,7 @@ L_Lab2:
mes "Shinokas!";
mes "Why, God?";
mes "Why...";
- set Shinokas_Quest,5;
+ set Shinokas_Quest,9;
close;
L_Dead:
@@ -532,7 +532,7 @@ L_Dead:
}
ein_in01.gat,32,133,6 script Maid 850,{
- if (Shinokas_Quest == 2 && ein_maid == 0) goto L_Ore;
+ if (Shinokas_Quest == 4) goto L_Ore;
mes "[Maid]";
mes "There's no end";
mes "to all these plates";
@@ -559,12 +559,12 @@ L_Ore:
mes "special or otherwise, here";
mes "in the manor. What exactly";
mes "do you need them for?";
- set ein_maid,1;
+ set Shinokas_Quest,5;
close;
}
einbroch.gat,51,52,1 script lab_warp 45,2,2{
- if(Shinokas_Quest >= 4 && ein_scientist != 1) goto L_Sec;
+ if(Shinokas_Quest == 7) goto L_Sec;
mes "^3131FFThe door is locked.";
mes "You cannot enter.";
close;
@@ -802,19 +802,19 @@ ein_in01.gat,266,26,1 script Unknown Stuff 111,{
mes "attached to a huge";
mes "machine with many cords";
mes "and folds of barbed wire";
- set ein_lab,1;
+ set ein_stuff,1;
close;
}
airplane.gat,31,77,4 script Drunken Man#03 853,{
- if (ein_lab == 2) goto L_Done;
+ if (Shinokas_Quest == 8) goto L_Done;
mes "[Drunken Man]";
mes "Okay okay...";
mes "Daddy's gonna";
mes "win some Apples";
mes "this time for sure!";
next;
- if(ein_lab == 1)
+ if(ein_stuff && ein_scientist)
{
mes "[Drunken Man]";
mes "Let's do it!";
@@ -841,7 +841,7 @@ airplane.gat,31,77,4 script Drunken Man#03 853,{
mes "Waaaaaahhhhhhhhh!";
mes "Apples! My apples!";
mes "Apples, I need more...!";
- if (countitem(512) && ein_lab==1) goto L_Apples;
+ if (countitem(512) && ein_stuff && ein_scientist) goto L_Apples;
close;
L_Apples:
@@ -1015,7 +1015,10 @@ L_Apples:
mes "must have been a piece";
mes "of ^3131FFYmir's Heart^000000. I better";
mes "tell Shinokas about this.)";
- set ein_lab,2;
+ set Shinokas_Quest,8;
+ //cleaning temp variables from the lab.
+ set ein_stuff,0;
+ set ein_scientist,0;
close;
L_Done: