summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt9
-rw-r--r--npc/cities/alberta.txt1
-rw-r--r--npc/cities/hugel.txt85
-rw-r--r--npc/guides/guides_hu.txt149
-rw-r--r--npc/guides/guides_pron.txt116
-rw-r--r--npc/merchants/alchemist.txt2
-rw-r--r--npc/merchants/clothes_dyer.txt32
-rw-r--r--npc/merchants/dye_maker.txt6
-rw-r--r--npc/merchants/grandpa_pharmacist.txt6
-rw-r--r--npc/merchants/hair_dyer.txt5
-rw-r--r--npc/merchants/hair_style.txt190
-rw-r--r--npc/merchants/icecream.txt2
-rw-r--r--npc/merchants/milk_trader.txt4
-rw-r--r--npc/merchants/quivers.txt6
-rw-r--r--npc/merchants/refine.txt20
-rw-r--r--npc/scripts_athena.conf1
-rw-r--r--npc/warps/cities/einbroch.txt4
-rw-r--r--npc/warps/cities/hugel.txt7
18 files changed, 427 insertions, 218 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index 6fff2811c..fe1018a20 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -27,6 +27,15 @@ Nexon
Date Added
======
+4/11
+ * Updated a couple shops of Hugel, plus added the firecracker shop on Hugel. [erKURITA]
+ * Added Gunslinger quest npc and shops on que_ng.gat. Same map for Ninja's
+ job quest. [erKURITA]
+ * Added warps for que_ng.gat. [erKURITA]
+ * Also added temporal locations for the npcs inside. [erKURITA]
+ * Fixed an back warp on hu_in01,15,70 (walk to the warp, then warps you back) [erKURITA]
+ * Moved and finished Hugel's guard (who happens to be a granny) [erKURITa]
+ ~ All info given by RockmanEXE :P
04/10
* Updated refiner, thx2 Coltaro [Lupus]
04/08
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt
index ae3c5898f..0522470bc 100644
--- a/npc/cities/alberta.txt
+++ b/npc/cities/alberta.txt
@@ -495,6 +495,7 @@ M_Menu:
next;
mes "^5555FF(~choo~choooo~)^000000";
next;
+ if(Zeny < 10000) goto sL_Zeny;
set Zeny, Zeny - 10000;
warp "tur_dun01.gat",154,39;
close;
diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt
index 7191713f1..fa6b5d58f 100644
--- a/npc/cities/hugel.txt
+++ b/npc/cities/hugel.txt
@@ -1,9 +1,9 @@
//===== eAthena Script =======================================
//= Hugel City
//===== By: ==================================================
-//= vicious_pucca, Poki#3
+//= vicious_pucca, Poki#3, erKURITA
//===== Current Version: =====================================
-//= 0.1
+//= 1.0
//===== Compatible With: =====================================
//= eAthena 1.0
//===== Description: =========================================
@@ -11,20 +11,90 @@
//===== Additional Comments: =================================
//= Cords and Sprites are 100% Correct, but the names are not.
//= Plus no one knows what the NPCs are talking right now :/ [Poki#3]
+//= Note: Not all the sprites were correct :P [erKURITA]
+//= 1.0 Added the first shop, firecrackers. Thanks RockmanEXE for the info [erKURITA]
+//= Added more missing npc, but again, only locations and temp names =/ [erKURITA]
+//= Started the basis of Poring Track. [erKURITA]
+//= Moved the old lady to npc\guides\guides_hu.txt, since it's Hugel's guard [erKURITA]
+//= Special thanks to RockmanEXE who provided all necesary info =3
//============================================================
+hu_in01.gat,23,311,4 script Johsh 898,{
+set @npcname$"[Josh]";
+
+mes @npcname$;
+mes "Hi ho~ I sell some awesome firecrackers, would you like to buy one?";
+mes "Only 500z and you get 5 ^FF0000firecrackers^000000!";
+select(switch("Yes Please:No thanks")) {
+ case 1:
+ if (Zeny < 500) {
+ mes @npcname$;
+ mes "Err sir, you don't have 500z zeny. I can't sell you anything";
+ close2;
+ set @npcname$,NULL;
+ end;
+ } else
+ set Zeny,Zeny-500;
+ getitem 12018,5;
+ mes @npcname$;
+ mes "Good! here you go! Have fun with them!";
+ close2;
+ set @npcname$,NULL;
+ end;
+ case 2:
+ mes @npcname$;
+ mes "Aww~~ you miss it";
+ close2;
+ set @npcname$,NULL;
+ end;
+ }
+}
+
//Should be moved later on to Bulletin Boards.txt
hugel.gat,91,152,4 script Bulletin Board 837,{end;}
+
+//= New Npcs
+hugel.gat,76,134,4 script Yahna 101,{end;}
+hugel.gat,71,137,5 script Jamira 879,{end;}
+hugel.gat,58,72,5 script Yan 86,{
+//ask for 500z to enter, poring track nš1
+end;}
+hugel.gat,62,68,1 script Yalmire 86,{
+//ask for 500z to enter, poring track nš2
+end;
+}
+hugel.gat,175,115,5 script Anhi Anh 897,{end;}
+hugel.gat,191,172,4 script Yanhe 895,{end;}
+hugel.gat,196,164,3 script Amnot 50,{end;}
+hugel.gat,203,166,0 script Star#1 111,{
+//invisible but clickeable npc
+end;
+}
+hugel.gat,209,164,0 script Star#2 111,{
+//invisible but clickeable npc
+end;
+}
+hugel.gat,216,158,0 script Shellfish 111,{
+//invisible but clickeable npc
+end;
+}
+hugel.gat,168,183,5 script Thief 118,{end;}
+hugel.gat,126,151,4 script Tanyee 90,{end;}
+hugel.gat,88,168,4 script Zondaman 874,{end;}
+hugel.gat,71,198,3 script Kampia 90,{end;}
+hugel.gat,84,125,4 script Anzian 700,{end;}
+//= End of new npcs
+
hugel.gat,102,161,3 script Young Sailor 100,{end;}
-hugel.gat,85,139,3 script Yoko 893,{end;}
+hugel.gat,85,139,3 script Yoko 86,{end;}
hugel.gat,100,102,3 script Grandpa Hohi 866,{end;}
hugel.gat,85,93,3 script Grandpa Hiho 866,{end;}
hugel.gat,85,165,5 script Cudy 896,{end;}
hugel.gat,107,67,3 script Kiddy the Kid 706,{end;}
-hugel.gat,98,57,3 script Old Lady 863,{end;}
-hugel.gat,71,82,3 script Hon Kiki 900,{end;}
-hugel.gat,56,103,2 script Sarko 709,{end;}
+
+hugel.gat,71,83,4 script Hon Kiki 900,{end;}
+hugel.gat,56,103,4 script Sarko 709,{end;}
hugel.gat,68,99,2 script Billy the Bull 889,{end;}
hugel.gat,169,112,5 script Sani 892,{end;}
hu_in01.gat,26,77,4 script Bokie 50,{end;}
@@ -35,6 +105,7 @@ hu_in01.gat,19,161,2 script Matilda 803,{end;}
hu_in01.gat,18,167,4 script Gin 86,{end;}
hu_in01.gat,381,304,5 script Soldier 105,{end;}
hu_in01.gat,111,386,4 script Jino 86,{end;}
-hu_in01.gat,23,311,4 script Johsh 868,{end;}
+//Johsh was here!
hu_in01.gat,246,107,2 script Receptionist 53,{end;}
hu_in01.gat,256,40,2 script Garud 897,{end;}
+
diff --git a/npc/guides/guides_hu.txt b/npc/guides/guides_hu.txt
new file mode 100644
index 000000000..666787d0a
--- /dev/null
+++ b/npc/guides/guides_hu.txt
@@ -0,0 +1,149 @@
+//===== eAthena Script =======================================
+//= Guard of Hugel City
+//===== By: ==================================================
+//= erKURITA
+//===== Current Version: =====================================
+//= 1.0
+//===== Compatible With: =====================================
+//= eAthena 1.0
+//===== Description: =========================================
+//= Guard/Guide NPC of City of Hugel.
+//===== Additional Comments: =================================
+//= 1.0 Started the script. [erKURITA]
+//============================================================
+hugel.gat,98,57,3 script Old Lady 863,{
+
+ mes "[Old Lady]";
+ mes "Welcome to Hugel, the Power Source City.";
+ next;
+ mes "[Old Lady]";
+ mes "I am here to help you find your way. Please feel free to speak to me anytime you need help.";
+M_Menu:
+ next;
+ menu "View Buildings",-, "Notice",M_2, "Cancel",M_End;
+
+ mes "[Old Lady]";
+ mes "Do you want me to leave indications on the Mini-Map?";
+ next;
+ menu "No Thanks",-,"Yes Please",sM_1b;
+
+ set @COMPASS_CHECK,0;
+ goto L_Cont;
+
+ sM_1b:
+ set @COMPASS_CHECK,1;
+
+ L_Cont:
+ mes "[Old Lady]";
+ mes "Please choose a building to view.";
+ next;
+ sM_Menu:
+ menu "Church",-,
+ "Hotel",M_1_2,
+ "Pub",M_1_3,
+ "Airship",M_1_4,
+ "Weapon/Armor Shop",M_1_5,
+ "Grocery/Tool shop",M_1_6,
+ "Firecrackers Shop",M_1_7,
+ "Hunter Guild",M_1_8a,
+ "^000066Poring Track 1^000000",M_1_9,
+ "^000066Poring Track 2^000000",M_1_10,
+ "^000066Bingo House^000000",M_1_11,
+ "Wipe all indications from mini-map",M_1_8,
+ "Cancel", M_End;
+
+ mes "[Old Lady]";
+ mes "'The 'Church' here in Hugel will grant your wedding's day a lot of happiness.";
+ mes "It's located at the east of Hugel, south of the Airship";
+ viewpoint 1,157,112,1,0xFF5555;
+ goto sL_Wipe;
+ M_1_2:
+ mes "[Old Lady]";
+ mes "The 'Hotel' is a few steps close here. Just go north through this road.";
+ mes "It is a good place to rest and replenish your hp and sp.";
+ viewpoint 1,101,78,2,0x44FF44;
+ goto sL_Wipe;
+ M_1_3:
+ mes "[Old Lady]";
+ mes "The 'Pub' is east of here, go and pass by for some rest! It is a great place to meet people and have fun.";
+ viewpoint 1,126,65,3,0x5555FF;
+ goto sL_Wipe;
+ M_1_4:
+ mes "[Old Lady]";
+ mes "Head over to the 'Airship' to fly to other cities.";
+ viewpoint 1,189,166,4,0xFF00FF;
+ goto sL_Wipe;
+ M_1_5:
+ mes "[Old Lady]";
+ mes "The 'Weapon/Armor shop' is the place to go when you need something to defend yourself from the other monsters";
+ viewpoint 1,72,155,5,0xFF00FF;
+ goto sL_Wipe;
+ M_1_6:
+ mes "[Old Lady]";
+ mes "The 'Grocery/Tool shop' is the place to go when you need to stock up on things like potions and fly-wings.";
+ viewpoint 1,92,164,6,0xF0C40F;
+ goto sL_Wipe;
+ M_1_7:
+ mes "[Old Lady]";
+ mes "The 'Firecracker shop' will provide you with some flashy fireworks to lit up your night";
+ viewpoint 1,94,104,7,0xFF8000;
+ goto sL_Wipe;
+ M_1_8a:
+ mes "[Old Lady]";
+ mes "The 'Hunter Guild' is located at the northeast of Hugel. Sharpen your eyes!";
+ viewpoint 1,208,225,7,0xFF8000;
+ goto sL_Wipe;
+
+ m_1-9:
+ mes "[Old Lady]";
+ mes "The '^000066Poring Track Nš1^000000' is new and exciting entertaintment, make sure to check it!";
+ viewpoint 1,58,72,7,0xFF8000;
+ goto sL_Wipe;
+ m_1-10:
+ mes "[Old Lady]";
+ mes "The '^000066Poring Track Nš2^000000' is new and exciting entertaintment, make sure to check it!";
+ viewpoint 1,62,68,7,0xFF8000;
+ goto sL_Wipe;
+ m_1-11:
+ mes "[Old Lady]";
+ mes "The 'Bingo House' is located at the northwest of Hugel. Lay your bet ladies and gentlements!";
+ viewpoint 1,57,207,7,0xFF8000;
+ M_1_8:
+ set @COMPASS_CHECK, 2;
+
+ sL_Wipe:
+ if(@COMPASS_CHECK != 2) next; // avoids a double 'next' when 'wipe indications' is chosen
+ if(@COMPASS_CHECK == 1) goto sM_Menu;
+ viewpoint 2,157,112,1,0xFF5555;
+ viewpoint 2,101,78,2,0x44FF44;
+ viewpoint 2,126,65,3,0x5555FF;
+ viewpoint 2,189,166,4,0xFF00FF;
+ viewpoint 2,72,155,5,0xFF00FF;
+ viewpoint 2,92,164,6,0xF0C40F;
+ viewpoint 2,94,104,7,0xFF8000;
+ viewpoint 2,208,225,7,0xFF8000;
+ viewpoint 2,58,72,7,0xFF8000;
+ viewpoint 2,62,68,7,0xFF8000;
+ viewpoint 2,57,207,7,0xFF8000;
+ if (@COMPASS_CHECK == 0) goto sM_Menu;
+ mes "[Old Lady]";
+ mes "All indications have been removed";
+ close;
+
+ M_2:
+ mes "[Old Lady]";
+ mes "We upgraded the Location Guide to the Newest Digital Style. We hope you like this gorgeous new system.";
+ next;
+ mes "[Old Lady]";
+ mes "Don't forget to refer to the Mini-Map on the Upper-Right corner of your screen.";
+ next;
+ mes "[Old Lady]";
+ mes "If you can't see the Mini-Map, just hit ^0000ff'ctrl+tab'^000000 or Click the ^0000ff'map'^000000 button in the Basic Information Window";
+ mes "Remeber to use the ^ff0000+,-^000000 buttons to adjust the map to your liking.";
+ goto M_Menu;
+
+ M_End:
+ mes "[Old Lady]";
+ mes "Have a nice day, deary~";
+ close;
+} \ No newline at end of file
diff --git a/npc/guides/guides_pron.txt b/npc/guides/guides_pron.txt
index 51df55259..edf592b2b 100644
--- a/npc/guides/guides_pron.txt
+++ b/npc/guides/guides_pron.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= kobra_k88
//===== Current Version: =====================================
-//= 1.3
+//= 1.4
//===== Compatible With: =====================================
//= eAthena 0.5.2 +
//===== Description: =========================================
@@ -14,29 +14,22 @@
//= 1.2 Optimized, updated common guide names [Lupus]
//= 1.3 Updated the guide according to how it is on iRO, thanks [MasterOfMuppets]
//= to Muad_Dib
+//= 1.4 Fitted the many lines into 1 or 2, and corrected some typos [erKURITA]
//============================================================
prontera.gat,154,187,4 script Guide::Prt_Guide 105,{
cutin "prt_soldier",2;
mes "[Prontera Guide]";
- mes "Welcome to Prontera,";
- mes "the beautiful capital of the";
- mes "Run-Midgard Kingdom. If";
- mes "you have questions or need";
- mes "help find something in the";
- mes "city, don't hesitate to ask.";
+ mes "Welcome to Prontera, the beautiful capital of the Run-Midgard Kingdom.";
+ mes " If you have questions or need help find something in the city, don't hesitate to ask.";
L_MENU:
next;
menu "City Guide",L_CITY,"Remove Marks from Mini-Map",L_REMOVE,"Notice",L_NOTICE,"Cancel",L_END;
L_CITY:
mes "[Prontera Guide]";
- mes "Please select";
- mes "a location from";
- mes "the following menu.";
- mes "Would you like me";
- mes "to mark locations";
- mes "on your Mini-Map?";
+ mes "Please select a location from the following menu.";
+ mes "Would you like me to mark locations on your Mini-Map?";
next;
menu "Yes.",L_YES,"No.",L_NO;
L_NO:
@@ -48,120 +41,81 @@ L_CONT:
L_MENU_2:
menu "Swordman Association",L_SWORD,"^0000FFSanctuary^000000",L_SANCTUARY,"Prontera Chivalry",L_CHIVALRY,"Weapon Shop",L_WEAPON,"Tool Shop",L_TOOL,"Inn",L_INN,"Trading Post",L_TRADING,"Pub",L_PUB,"Library",L_LIBRARY,"Job Agency",L_JOB,"Prontera Castle",L_CASTLE,"City Hall",L_HALL,"Cancel",-;
mes "[Prontera Guide]";
- mes "Pleas ask me to Remove";
- mes "Marks from Mini-Map if you";
- mes "no longer wish to have the";
- mes "location marks displayed";
- mes "on your Mini-Map.";
+ mes "Pleas ask me to Remove marks from Mini-Map if you no longer wish to have the location marks displayed on your Mini-Map.";
goto L_MENU;
L_SWORD:
mes "[Prontera Guide]";
- mes "The Swordman Association,";
- mes "which handles Job Changes";
- mes "to the Swordman class, has";
- mes "moved to Izlude. This facility";
- mes "is just an empty building now.";
+ mes "The Swordman Association, which handles Job Changes to the Swordman class, has moved to Izlude.";
+ mes "This facility is just an empty building now.";
viewpoint 1,237,41,1,0x00FF00;
next;
goto L_WIPE;
L_SANCTUARY:
mes "[Prontera Guide]";
- mes "The Prontera Sanctuary";
- mes "handles Job Changes to";
- mes "the Acolyte class, and can";
- mes "be found in the northeast";
- mes "corner of Prontera.";
+ mes "The Prontera Sanctuary handles Job Changes to the Acolyte class, and can be found in the northeast corner of Prontera.";
viewpoint 1,236,316,2,0xFF0000;
next;
goto L_WIPE;
L_CHIVALRY:
mes "[Prontera Guide]";
- mes "The Prontera Chivalry,";
- mes "which is responsible for";
- mes "the safety of our capital, is";
- mes "in Prontera's northwest corner.";
+ mes "The Prontera Chivalry, which is responsible for the safety of our capital, is in Prontera's northwest corner.";
viewpoint 1,46,345,3,0x00FF00;
next;
goto L_WIPE;
L_WEAPON:
mes "[Prontera Guide]";
- mes "The Weapon Shop";
- mes "is located northeast";
- mes "of the central fountain.";
+ mes "The Weapon Shop is located northeast of the central fountain.";
viewpoint 1,175,220,4,0xFF00FF;
next;
goto L_WIPE;
L_TOOL:
mes "[Prontera Guide]";
- mes "The Tool Shop";
- mes "is located northwest";
- mes "of the central fountain.";
+ mes "The Tool Shop is located northwest of the central fountain.";
viewpoint 1,134,221,5,0xFF00FF;
next;
goto L_WIPE;
L_INN:
mes "[Prontera Guide]";
- mes "The Inns in Prontera are";
- mes "located both to the east";
- mes "and west of Prontera's";
- mes "central fountain area.";
+ mes "The Inns in Prontera are located both to the east and west of Prontera's central fountain area.";
viewpoint 1,204,214,6,0xFF00FF;
viewpoint 1,107,192,7,0xFF00FF;
next;
goto L_WIPE;
L_TRADING:
mes "[Prontera Guide]";
- mes "The Trading Post";
- mes "can be found southeast";
- mes "from the central fountain.";
+ mes "The Trading Post can be found southeast from the central fountain.";
viewpoint 1,179,184,8,0x00FF00;
next;
goto L_WIPE;
L_PUB:
mes "[Prontera Guide]";
- mes "The Pub is located";
- mes "southeast of the fountain,";
- mes "behind the Trading Post.";
+ mes "The Pub is located southeast of the fountain, behind the Trading Post.";
viewpoint 1,208,154,9,0x00FF00;
next;
goto L_WIPE;
L_LIBRARY:
mes "[Prontera Guide]";
- mes "If you head north from";
- mes "the central fountain, you'll";
- mes "find an empty area in which";
- mes "both branches of the Prontera";
- mes "Library can be accessed if you";
- mes "head towards the east or west.";
+ mes "If you head north from the central fountain, you'll find an empty area in which both branches of the Prontera Library can be accessed if you head towards the east or west.";
viewpoint 1,120,267,10,0x00FF00;
viewpoint 1,192,267,11,0x00FF00;
next;
goto L_WIPE;
L_JOB:
mes "[Prontera Guide]";
- mes "The Job Agency is";
- mes "just southwest of the";
- mes "central fountain area.";
+ mes "The Job Agency is just southwest of the central fountain area.";
viewpoint 1,133,183,12,0x00FF00;
next;
goto L_WIPE;
L_CASTLE:
mes "[Prontera Guide]";
- mes "The Prontera Castle is";
- mes "located at the northern";
- mes "sector of this city. You can";
- mes "go to fields that are north";
- mes "of Prontera by going through";
- mes "the castle's rear exit.";
+ mes "The Prontera Castle is located at the northern sector of this city.";
+ mes " You can go to fields that are north of Prontera by going through the castle's rear exit.";
viewpoint 1,156,360,13,0x00FF00;
next;
goto L_WIPE;
L_HALL:
mes "[Prontera Guide]";
- mes "The City Hall";
- mes "is located in the";
- mes "southwest corner";
- mes "in our city of Prontera.";
+ mes "The City Hall is located in the southwest corner in our city of Prontera.";
viewpoint 1,75,91,14,0x00FF00;
next;
goto L_WIPE;
@@ -200,35 +154,19 @@ L_REMOVE:
goto L_MENU;
L_NOTICE:
mes "[Prontera Guide]";
- mes "Advances in sorcery and";
- mes "technology have allowed";
- mes "us to update our information";
- mes "system, enabling up to mark";
- mes "locations on your Mini-Map";
- mes "for easier navigation.";
+ mes "Advances in sorcery and technology have allowed us to update our information system, enabling up to mark locations on your Mini-Map for easier navigation.";
next;
mes "[Prontera Guide]";
- mes "Your Mini-Map is located";
- mes "in the upper right corner";
- mes "of the screen. If you can't";
- mes "see it, press the Ctrl + Tab";
- mes "keys or click the 'Map' button";
- mes "in your Basic Information Window.";
+ mes "Your Mini-Map is located in the upper right corner of the screen.";
+ mes "If you can't see it, press the Ctrl + Tab keys or click the 'Map' button in your Basic Information Window.";
next;
mes "[Prontera Guide]";
- mes "On your Mini-Map,";
- mes "click on the '+' and '-'";
- mes "symbols to zoom in and";
- mes "out of your Mini-Map. We";
- mes "hope you enjoy your travels";
- mes "here in the city of Prontera.";
+ mes "On your Mini-Map, click on the '+' and '-' symbols to zoom in and out of your Mini-Map.";
+ mes "We hope you enjoy your travels here in the city of Prontera.";
goto L_MENU;
L_END:
mes "[Prontera Guide]";
- mes "Well, adventurer...";
- mes "I hope your journeys";
- mes "through Rune-Midgard";
- mes "are both fun and save.";
+ mes "Well, adventurer... I hope your journeys through Rune-Midgard are both fun and safe.";
cutin "prt_soldier",255;
close;
}
diff --git a/npc/merchants/alchemist.txt b/npc/merchants/alchemist.txt
index 046e7c308..a3085aa4f 100644
--- a/npc/merchants/alchemist.txt
+++ b/npc/merchants/alchemist.txt
@@ -107,8 +107,8 @@ alde_alche.gat,24,188,3 script Gever AI Sharp 740,{
mes "[Gever AI Sharp]";
if(Zeny < @price) goto sL_NoZeny;
if (checkweight(@itemid,1) == 0) goto sL_OverW;
- getitem @itemid,1;
set Zeny,Zeny-@price;
+ getitem @itemid,1;
L_Bye:
mes "Thank you for buying!";
mes "Come again.";
diff --git a/npc/merchants/clothes_dyer.txt b/npc/merchants/clothes_dyer.txt
index a63dd2b71..e0cff38e3 100644
--- a/npc/merchants/clothes_dyer.txt
+++ b/npc/merchants/clothes_dyer.txt
@@ -277,73 +277,73 @@ L_Dye_Orange:
mes "[Dyer Ginedin Rephere]";
if(countitem(980) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes orange.";
- setlook 7,@orange;
delitem 980,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes orange.";
+ setlook 7,@orange;
close;
L_Dye_Violet:
mes "[Dyer Ginedin Rephere]";
if(countitem(981) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes Violet.";
- setlook 7,@violet;
delitem 981,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes Violet.";
+ setlook 7,@violet;
close;
L_Dye_Red:
mes "[Dyer Ginedin Rephere]";
if(countitem(975) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes red.";
- setlook 7,@red;
delitem 975,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes red.";
+ setlook 7,@red;
close;
L_Dye_Black:
mes "[Dyer Ginedin Rephere]";
if(countitem(983) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes black.";
- setlook 7,@black;
delitem 983,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes black.";
+ setlook 7,@black;
close;
L_Dye_Green:
mes "[Dyer Ginedin Rephere]";
if(countitem(979) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes green.";
- setlook 7,@green;
delitem 979,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes green.";
+ setlook 7,@green;
close;
L_Dye_Blue:
mes "[Dyer Ginedin Rephere]";
if(countitem(978) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes blue.";
- setlook 7,@blue;
delitem 978,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes blue.";
+ setlook 7,@blue;
close;
L_Dye_White:
mes "[Dyer Ginedin Rephere]";
if(countitem(982) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes white.";
- setlook 7,@white;
delitem 982,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes white.";
+ setlook 7,@white;
close;
L_Dye_Yellow:
mes "[Dyer Ginedin Rephere]";
if(countitem(976) < 1) goto sL_NoDye;
if(Zeny < 10000) goto sL_Zeny;
- mes "Ok. I will dye you clothes yellow.";
- setlook 7,@yellow;
delitem 976,1;
set Zeny, Zeny - 10000;
+ mes "Ok. I will dye you clothes yellow.";
+ setlook 7,@yellow;
close;
sL_Sorry:
diff --git a/npc/merchants/dye_maker.txt b/npc/merchants/dye_maker.txt
index eb258c688..ecfdce186 100644
--- a/npc/merchants/dye_maker.txt
+++ b/npc/merchants/dye_maker.txt
@@ -98,13 +98,13 @@ morocc_in.gat,146,99,2 script Dye Maker JavaDullihan 122,{
mes "[Dye Maker JavaDullihan]";
if((countitem(507) < 30) || (countitem(973) < 1) || (countitem(713) < 1)) goto sl_LowItems;
if(Zeny < 3000) goto sl_LowZeny;
- mes "Missing text.";
- mes "Under development";
+ set Zeny, Zeny - 3000;
delitem 507,30;
delitem 973,1;
delitem 713,1;
- set Zeny, Zeny - 3000;
getitem 975,1;
+ mes "Missing text.";
+ mes "Under development";
close;
sM_Lemon:
diff --git a/npc/merchants/grandpa_pharmacist.txt b/npc/merchants/grandpa_pharmacist.txt
index bad02c3f1..666eefd84 100644
--- a/npc/merchants/grandpa_pharmacist.txt
+++ b/npc/merchants/grandpa_pharmacist.txt
@@ -131,13 +131,13 @@ sF_Make:
if(Zeny < (getarg(2)*@amount)) goto L_NdZeny;
L_End:
- mes "[Grampa Pharmacist]";
- mes "Here are your " +getarg(4)+ " potions.";
+ set Zeny, Zeny - (getarg(2)*@amount);
delitem getarg(0), (@amount*@herbnum);
if(getarg(1) != 0) delitem getarg(1), (@amount*@herbnum);
delitem 713, @amount;
- set Zeny, Zeny - (getarg(2)*@amount);
getitem getarg(3), @amount;
+ mes "[Grampa Pharmacist]";
+ mes "Here are your " +getarg(4)+ " potions.";
close;
L_NdBottle:
diff --git a/npc/merchants/hair_dyer.txt b/npc/merchants/hair_dyer.txt
index 61bda6f1b..f684138a2 100644
--- a/npc/merchants/hair_dyer.txt
+++ b/npc/merchants/hair_dyer.txt
@@ -41,10 +41,11 @@ prt_in.gat,243,168,4 script HairDyer Jovovich 91,{
mes "[HairDyer Jovovich]";
if(countitem(975) < 1) goto sL_NoDye;
if(Zeny < 1000) goto sL_Zeny;
+ set Zeny, Zeny - 1000;
+ delitem 975,1;
mes "Ok. I will dye you hair red.";
setlook 6,8;
- delitem 975,1;
- set Zeny, Zeny - 1000;
+
close;
sM_b:
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index d5b85af9c..c2dada38e 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -417,7 +417,8 @@ mhair1:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,1;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -425,7 +426,7 @@ mhair1:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,1;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (1) style.";
@@ -458,7 +459,8 @@ mhair2:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,2;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -466,7 +468,7 @@ mhair2:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,2;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (2) style.";
@@ -499,7 +501,8 @@ mhair3:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,3;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -507,7 +510,7 @@ mhair3:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,3;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (3) style.";
@@ -540,7 +543,8 @@ mhair4:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,4;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -548,7 +552,7 @@ mhair4:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,4;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (4) style.";
@@ -581,7 +585,8 @@ mhair5:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,5;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -589,7 +594,7 @@ mhair5:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,5;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (5) style.";
@@ -622,7 +627,8 @@ mhair6:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,6;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -630,7 +636,7 @@ mhair6:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,6;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (6) style.";
@@ -663,7 +669,8 @@ mhair7:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,7;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -671,7 +678,7 @@ mhair7:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,7;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (7) style.";
@@ -704,7 +711,8 @@ mhair8:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,8;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -712,7 +720,7 @@ mhair8:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,8;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (8) style.";
@@ -745,7 +753,8 @@ mhair9:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,9;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -753,7 +762,7 @@ mhair9:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,9;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (9) style.";
@@ -786,7 +795,8 @@ mhair10:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,10;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -794,7 +804,7 @@ mhair10:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,10;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (10) style.";
@@ -827,7 +837,8 @@ mhair11:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,11;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -835,7 +846,7 @@ mhair11:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,11;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (11) style.";
@@ -868,7 +879,8 @@ mhair12:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,12;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -876,7 +888,7 @@ mhair12:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,12;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (12) style.";
@@ -909,7 +921,8 @@ mhair13:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,13;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -917,7 +930,7 @@ mhair13:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,13;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (13) style.";
@@ -950,7 +963,8 @@ mhair14:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,14;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -958,7 +972,7 @@ mhair14:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,14;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (14) style.";
@@ -991,7 +1005,8 @@ mhair15:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,15;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -999,7 +1014,7 @@ mhair15:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,15;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (15) style.";
@@ -1032,7 +1047,8 @@ mhair16:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,16;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1040,7 +1056,7 @@ mhair16:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,16;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (16) style.";
@@ -1073,7 +1089,8 @@ mhair17:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,17;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1081,7 +1098,7 @@ mhair17:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,17;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (17) style.";
@@ -1114,7 +1131,8 @@ mhair18:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,18;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1122,7 +1140,7 @@ mhair18:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,18;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (18) style.";
@@ -1155,7 +1173,8 @@ mhair19:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,19;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1163,7 +1182,7 @@ mhair19:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,19;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (19) style.";
@@ -1220,7 +1239,8 @@ fhair1:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,1;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1228,7 +1248,7 @@ fhair1:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,1;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (1) style.";
@@ -1261,7 +1281,8 @@ fhair2:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,2;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1269,7 +1290,7 @@ fhair2:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,2;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (2) style.";
@@ -1302,7 +1323,8 @@ fhair3:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,3;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1310,7 +1332,7 @@ fhair3:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,3;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (3) style.";
@@ -1343,7 +1365,8 @@ fhair4:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,4;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1351,7 +1374,7 @@ fhair4:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,4;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (4) style.";
@@ -1384,7 +1407,8 @@ fhair5:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,5;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1392,7 +1416,7 @@ fhair5:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,5;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (5) style.";
@@ -1425,7 +1449,8 @@ fhair6:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,6;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1433,7 +1458,7 @@ fhair6:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,6;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (6) style.";
@@ -1466,7 +1491,8 @@ fhair7:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,7;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1474,7 +1500,7 @@ fhair7:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,7;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (7) style.";
@@ -1507,7 +1533,8 @@ fhair8:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,8;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1515,7 +1542,7 @@ fhair8:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,8;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (8) style.";
@@ -1548,7 +1575,8 @@ fhair9:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,9;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1556,7 +1584,7 @@ fhair9:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,9;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (9) style.";
@@ -1589,7 +1617,8 @@ fhair10:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,10;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1597,7 +1626,7 @@ fhair10:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,10;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (10) style.";
@@ -1630,7 +1659,8 @@ fhair11:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,11;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1638,7 +1668,7 @@ fhair11:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,11;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (11) style.";
@@ -1671,7 +1701,8 @@ fhair12:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,12;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1679,7 +1710,7 @@ fhair12:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,12;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (12) style.";
@@ -1712,7 +1743,8 @@ fhair13:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,13;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1720,7 +1752,7 @@ fhair13:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,13;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (13) style.";
@@ -1753,7 +1785,8 @@ fhair14:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,14;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1761,7 +1794,7 @@ fhair14:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,14;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (14) style.";
@@ -1794,7 +1827,8 @@ fhair15:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,15;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1802,7 +1836,7 @@ fhair15:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,15;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (15) style.";
@@ -1835,7 +1869,8 @@ fhair16:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,16;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1843,7 +1878,7 @@ fhair16:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,16;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (16) style.";
@@ -1876,7 +1911,8 @@ fhair17:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,17;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1884,7 +1920,7 @@ fhair17:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,17;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (17) style.";
@@ -1917,7 +1953,8 @@ fhair18:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,18;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1925,7 +1962,7 @@ fhair18:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,18;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (18) style.";
@@ -1958,7 +1995,8 @@ fhair19:
mes "- Klit klit Klit klit -";
mes "- Snap snap Snap snap -";
next;
- setlook 1,19;
+ if ((countitem(973) < 3) || (countitem(974) < 3) || (countitem(901) <100) || (countitem(1094) <100) || (countitem(1020) <100) || (countitem(1060) <100) || (countitem(7152) <100) ||(Zeny < 99800)) goto NOItem;
+ set Zeny,Zeny-99800;
delitem 973,3;
delitem 974,3;
delitem 901,100;
@@ -1966,7 +2004,7 @@ fhair19:
delitem 1020,100;
delitem 1060,100;
delitem 7152,100;
- set Zeny,Zeny-99800;
+ setlook 1,19;
mes "[Veronica]";
mes "Wow~ it came out very well~~";
mes "I hope you like this (19) style.";
diff --git a/npc/merchants/icecream.txt b/npc/merchants/icecream.txt
index 27c94d74b..9dcaa6425 100644
--- a/npc/merchants/icecream.txt
+++ b/npc/merchants/icecream.txt
@@ -33,8 +33,8 @@ alberta.gat,120,45,2 script Ice Cream Maker::IceCreamer 85,{
if(@input<1) goto L_inpC;
if(@input>5) goto L_inpM;
if(Zeny< @input*100) goto L_NoZ;
- getitem 536,@input;
set Zeny,Zeny-100*@input;
+ getitem 536,@input;
mes "Here you go " +@input+ " Ice Cream for you.";
close;
diff --git a/npc/merchants/milk_trader.txt b/npc/merchants/milk_trader.txt
index f81c6f90f..42be03f63 100644
--- a/npc/merchants/milk_trader.txt
+++ b/npc/merchants/milk_trader.txt
@@ -39,9 +39,9 @@ prontera.gat,71,131,7 script Milk Trader 86,{
if(zeny < (@amount*20)) goto L_NoZeny;
L_Milk:
- getitem 519, @amount;
- delitem 713, @amount;
set zeny, zeny - (@amount*20);
+ delitem 713, @amount;
+ getitem 519, @amount;
M_End:
mes "[Milk Trader]";
diff --git a/npc/merchants/quivers.txt b/npc/merchants/quivers.txt
index d29224742..730b7327b 100644
--- a/npc/merchants/quivers.txt
+++ b/npc/merchants/quivers.txt
@@ -112,12 +112,12 @@ sF_Make:
if(Zeny < (getarg(1)*@amount)) goto L_NdZeny;
L_End:
+ set Zeny, Zeny - (getarg(1)*@amount);
+ delitem getarg(0), (@amount*@arrownum);
+ getitem getarg(2), @amount;
mes "[Inventor Jaax]";
mes "There you go~!";
mes "Here are your " +getarg(3)+ ".";
- delitem getarg(0), (@amount*@arrownum);
- set Zeny, Zeny - (getarg(1)*@amount);
- getitem getarg(2), @amount;
close;
L_NdArrows:
diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 712bc1aa1..ecef1519d 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -57,25 +57,25 @@ geffen_in.gat,110,172,2 script Christopher#1::Chris 63,{
sM_Anvil:
if(Zeny < 30000) goto L_NoZeny;
- mes "[Christopher Guillenrow]";
- mes "This is the cheapest one but it's very efficient.";
set Zeny, Zeny - 30000;
getitem 986,1;
+ mes "[Christopher Guillenrow]";
+ mes "This is the cheapest one but it's very efficient.";
next;
goto L_Thanks;
sM_OriAnvil:
if(Zeny < 120000) goto L_NoZeny;
- mes "[Christopher Guillenrow]";
- mes "Ah! Ye have a good eye for anvils. This here is the proper anvil for a Blacksmith.";
set Zeny, Zeny - 120000;
getitem 987,1;
+ mes "[Christopher Guillenrow]";
+ mes "Ah! Ye have a good eye for anvils. This here is the proper anvil for a Blacksmith.";
next;
goto L_Thanks;
sM_GolAnvil:
if(Zeny < 300000) goto L_NoZeny;
+ set Zeny, Zeny - 300000;
mes "[Christopher Guillenrow]";
mes "This is the best anvil in my workshop! With this ye'll be the best Blasksmith in no time.";
- set Zeny, Zeny - 300000;
getitem 988,1;
next;
goto L_Thanks;
@@ -381,8 +381,8 @@ L_refinenormal:
L_Sub:
if ((countitem(@material) < 1) || (Zeny < @price)) goto Lcancel2;
- delitem @material,1;
set Zeny,Zeny-@price;
+ delitem @material,1;
Lrefine:
if (getequipisequiped(@part) == 0) goto LNoItem; // hacker has removed the item (not changed, why?)
@@ -458,8 +458,8 @@ Lsafe:
next;
menu "Yes",-,"No...",Lcancel;
if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;
- delitem @material,@refinecnt;
set Zeny,Zeny - @fullprice;
+ delitem @material,@refinecnt;
goto L_refinesafe;
Lnosafe:
@@ -477,8 +477,8 @@ Lnosafe:
menu "Yes...",-,"No...",Lcancel;
if(@refinecheck > @safe) goto Lwarn;
if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;
- delitem @material,@refinecnt;
set Zeny,Zeny - @fullprice;
+ delitem @material,@refinecnt;
goto L_refinenumber;
end;
@@ -489,8 +489,8 @@ Lnosafe:
next;
menu "Yes",-,"No...",Lcancel1;
if((countitem(@material) < @refinecnt) || (Zeny < @fullprice)) goto Lcancel2;
- delitem @material,@refinecnt;
set Zeny,Zeny - @fullprice;
+ delitem @material,@refinecnt;
goto L_refinenumber;
Lcancel3:
@@ -618,8 +618,8 @@ CONTINUE:
if (@ammount > 999) goto L_ABOVE;
if (zeny < @value * @ammount) goto L_NOZENY;
if (checkweight(@itemid,@ammount) == 0) goto L_WEIGHT;
- getitem @itemid,@ammount;
set Zeny,Zeny-@value*@ammount;
+ getitem @itemid,@ammount;
mes "[" + @name$ + "]";
mes "Here you go.";
close;
diff --git a/npc/scripts_athena.conf b/npc/scripts_athena.conf
index eb1e249d0..64b8c3c3c 100644
--- a/npc/scripts_athena.conf
+++ b/npc/scripts_athena.conf
@@ -116,6 +116,7 @@ npc: npc/guides/guides_pron.txt
npc: npc/guides/guides_yun.txt
npc: npc/guides/guides_umb.txt
npc: npc/guides/guides_nif.txt
+npc: npc/guides/guides_hu.txt
// --------------------------------------------------------------
// --------------------------- Kafras ---------------------------
npc: npc/kafras/functions_kafras.txt
diff --git a/npc/warps/cities/einbroch.txt b/npc/warps/cities/einbroch.txt
index 8cff4e1c2..9cf07b7ed 100644
--- a/npc/warps/cities/einbroch.txt
+++ b/npc/warps/cities/einbroch.txt
@@ -1,9 +1,9 @@
//===== Athena Script ========================================
//= Einbroch Warp Script
//===== By: ==================================================
-//= Sara-chan (1.3), SSUNNY@YOUNG(1.7)
+//= Sara-chan (1.3), SSUNNY@YOUNG(1.7), erKURITA (1.8)
//===== Current Version: =====================================
-//= 1.7
+//= 1.8
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 8+
//===== Description: =========================================
diff --git a/npc/warps/cities/hugel.txt b/npc/warps/cities/hugel.txt
index 329fbffb6..65bd184f5 100644
--- a/npc/warps/cities/hugel.txt
+++ b/npc/warps/cities/hugel.txt
@@ -3,7 +3,7 @@
//===== By: ==================================================
//= Sara-chan (1.1)
//===== Current Version: =====================================
-//= 1.3a
+//= 1.4
//===== Compatible With: =====================================
//= Any Athena Version; RO Episode 10+
//===== Description: =========================================
@@ -14,6 +14,7 @@
//= 1.2 fixed hugel10 [Lupus]
//= 1.3 Rewrote all warps to relate houses, and fixed it to kRO. [Er_Maqui]
//= 1.3a Replaced all spaces with TABs [Lupus]
+//= 1.4 Fixed an back warp on hu_in01,15,70 (walk to the warp, then warps you back) [erKURITA]
//============================================================
//= Hugel City ================================================
@@ -66,10 +67,10 @@ hu_in01.gat,231,107,0 warp hugel32 1,1,hugel.gat,99,77
hu_in01.gat,268,123,0 warp hugel33 1,1,hu_in01.gat,265,36
hu_in01.gat,265,42,0 warp hugel34 1,1,hu_in01.gat,265,123
-//House
+//Library
hugel.gat,52,90,0 warp hugel35 1,1,hu_in01.gat,33,90
hu_in01.gat,37,90,0 warp hugel36 1,1,hugel.gat,54,96
-hu_in01.gat,15,70,0 warp hugel37 1,1,hu_in01.gat,15,28
+hu_in01.gat,15,70,0 warp hugel37 1,1,hu_in01.gat,15,27
hu_in01.gat,15,29,0 warp hugel38 1,1,hu_in01.gat,16,74
hu_in01.gat,15,108,0 warp hugel39 1,1,hu_in01.gat,15,155
hu_in01.gat,15,151,0 warp hugel40 1,1,hu_in01.gat,16,104
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-20 10:06:42 +0000