updated arena warp, removed scrolls shop

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10703 54d463be-8e91-2dee-dedb-b68131a5f0ec

4 files changed, 42 insertions, 81 deletions

diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index f36dabedb..d9b8b4177 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
 Date		Added
 ======
 2007/06/05
+	* Updated Arena warp, thanks to diedlikeahero [Lupus]
+	- removed old temp shop scrolls_arrows [Lupus]
 	* Fixed Grand Peco breeder [Playtester]
 	* Optimized, commonized and got rid of extra @vars: ammo_boxes.txt,ammo_dealer.txt,kunai_maker.txt [Lupus]
 	* Fixed a bug in Thanatos Tower quest. [SinSloth]
diff --git a/npc/merchants/hair_style.txt b/npc/merchants/hair_style.txt
index 0937891e9..80774654e 100644
--- a/npc/merchants/hair_style.txt
+++ b/npc/merchants/hair_style.txt
@@ -10,11 +10,7 @@
 //= Allows you to change your hairstyle.
 //===== Additional Comments: =================================
 //= 07/06/05 : Added 1st Version. [Muad_Dib]
-//= Converted to eAthena format by Dr.Evil
-//= Change NPC coords according to 
-//= http://www.nattsumi.com/roquest/miscellaneousquest.html
-//= Fixed typos [Nexon]
-//= TODO: Fix exploits V_V [Lupus]
+//= Converted to eAthena format by Dr.Evil Fixed typos [Nexon]
 //= 1.1 Removed Duplicates [Silent]
 //============================================================
 
@@ -754,16 +750,16 @@ mhair9:
 	mes "- Klit klit Klit klit -";
 	mes "- Snap snap Snap snap -";
 	next;
-		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;
-		delitem 1094,100;
-		delitem 1020,100;
-		delitem 1060,100;
-		delitem 7152,100;
-		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;
+	delitem 1094,100;
+	delitem 1020,100;
+	delitem 1060,100;
+	delitem 7152,100;
+	setlook 1,9;
 	mes "[Veronica]";
 	mes "Wow~ it came out very well~~";
 	mes "I hope you like this (9) style.";
@@ -771,21 +767,21 @@ mhair9:
 	mes "you are welcome welcome to vi tis me anytime~ HoHoHo";
 	close;
 M_NO9:
-		cutin "",255;
+	cutin "",255;
 	mes "[Veronica]";
 	mes "Well~ choose again please~";
 	mes "There should be a style you like.";
 	mes "Just remember the number you like the most and tell me.";
 	close;
 mhair10:
-		cutin "hair_m_10",4;
+	cutin "hair_m_10",4;
 	mes "[Veronica]";
 	mes "This is the (10) style.";
 	mes "I will change your Hair with this Again.";
 	mes "Is that OK for you??";
 	next;
 	menu "Yeah~ I'd love to.",-,"No..I don't like it..",M_NO10;
-		cutin "",255;
+	cutin "",255;
 	mes "[Veronica]";
 	mes "Now it begins~. Hold still~";
 	mes "If you move, you will have very bad style.";
@@ -796,16 +792,16 @@ mhair10:
 	mes "- Klit klit Klit klit -";
 	mes "- Snap snap Snap snap -";
 	next;
-		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;
-		delitem 1094,100;
-		delitem 1020,100;
-		delitem 1060,100;
-		delitem 7152,100;
-		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;
+	delitem 1094,100;
+	delitem 1020,100;
+	delitem 1060,100;
+	delitem 7152,100;
+	setlook 1,10;
 	mes "[Veronica]";
 	mes "Wow~ it came out very well~~";
 	mes "I hope you like this (10) style.";
@@ -838,16 +834,16 @@ mhair11:
 	mes "- Klit klit Klit klit -";
 	mes "- Snap snap Snap snap -";
 	next;
-		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;
-		delitem 1094,100;
-		delitem 1020,100;
-		delitem 1060,100;
-		delitem 7152,100;
-		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;
+	delitem 1094,100;
+	delitem 1020,100;
+	delitem 1060,100;
+	delitem 7152,100;
+	setlook 1,11;
 	mes "[Veronica]";
 	mes "Wow~ it came out very well~~";
 	mes "I hope you like this (11) style.";
@@ -855,21 +851,21 @@ mhair11:
 	mes "you are welcome welcome to vi tis me anytime~ HoHoHo";
 	close;
 M_NO11:
-		cutin "",255;
+	cutin "",255;
 	mes "[Veronica]";
 	mes "Well~ choose again please~";
 	mes "There should be a style you like.";
 	mes "Just remember the number you like the most and tell me.";
 	close;
 mhair12:
-		cutin "hair_m_12",4;
+	cutin "hair_m_12",4;
 	mes "[Veronica]";
 	mes "This is the (12) style.";
 	mes "I will change your Hair with this Again.";
 	mes "Is that OK for you??";
 	next;
 	menu "Yeah~ I'd love to.",-,"No..I don't like it..",M_NO12;
-		cutin "",255;
+	cutin "",255;
 	mes "[Veronica]";
 	mes "Now it begins~. Hold still~";
 	mes "If you move, you will have very bad style.";
diff --git a/npc/merchants/scrolls_arrows.txt b/npc/merchants/scrolls_arrows.txt
deleted file mode 100644
index afb939c3a..000000000
--- a/npc/merchants/scrolls_arrows.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-//===== eAthena Script ======================================= 
-//= Magic Scrolls & Arrows + Arrow Quivers
-//===== By: ================================================== 
-//= Lupus
-//===== Current Version: ===================================== 
-//= 1.4
-//===== Compatible With: ===================================== 
-//= eAthena 7.15 +
-//===== Description: ========================================= 
-//=
-//===== Additional Comments: ================================= 
-//= Some shops that sells Magic Scrolls, Arrow Quivers
-//= Temp shops, made in kRO to test some effects (they stay next to Geffen Tower entrance)
-//= Note: Coords and prices aren't right yet
-//= 	  I made Scrolls cost 2x more in Prontera (uncomment extra shops if u want)
-//=
-//= Correct coords and Sprites if you have more info
-//= 1.1 Added Arrow Quivers (removed rare arrows from the shops)
-//= 1.2 Removed Horse Crest from this temp shop. Because this item has been added to Sohee/Grtst General drops [Lupus]
-//= TODO: Arrows shop should be transformed to Quivers Maker NPC
-//= 1.3 Removed Quivers Shop due to Quiver Maker NPC Jaax [Lupus]
-//= 1.4 Due to added Magic Scrolls drops... removed the temp shop [Lupus]
-//============================================================ 
-
-
-//=======================================================
-// All Magic Scrolls + Crest of the Horse
-//=======================================================
-// don't lower the price
-geffen,125,91,2	shop	Magic Scrolls	735, 686:650, 687:1300, 688:500, 689:1000, 690:500, 691:1000, 692:500, 693:1000, 694:500, 695:1000, 696:500, 697:1000, 698:350, 699:700, 700:350, 12000:700, 12001:1000, 12002:2000, 12003:100
-//prt_in,121,65,3	shop	Magic Scrolls	735, 686:1300, 687:2600, 688:1000, 689:2000, 690:1000, 691:2000, 692:1000, 693:2000, 694:1000, 695:2000, 696:1000, 697:2000, 698:700, 699:1400, 700:700, 12000:1700, 12001:2000, 12002:4000, 12003:110
-
-//=======================================================
-// Arrows
-//=======================================================
-//payon_in03,159,10,4	shop	Arrow Quivers	727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
-//geffen,123,107,4	shop	Arrow Quivers	727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
-//prt_in,163,141,5	shop	Arrow Quivers	727, 12004:-1, 12005:-1, 12006:-1, 12007:-1, 12008:-1, 12009:-1, 12010:-1, 12011:-1, 12012:-1, 12013:-1, 12014:-1, 12015:-1, 1750:-1, 1770:-1, 1753:-1, 1765:-1, 1751:-1, 1752:-1, 1751:-1, 1755:-1, 1756:-1, 1754:-1, 1767:-1, 1757:-1, 1762:-1
diff --git a/npc/warps/other/arena.txt b/npc/warps/other/arena.txt
index 9c271294d..610a8e377 100644
--- a/npc/warps/other/arena.txt
+++ b/npc/warps/other/arena.txt
@@ -4,16 +4,17 @@
 //===== By: ==================================================
 //= SinSloth
 //===== Current Version: =====================================
-//= 1.0
+//= 1.1
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
 //= Warp Points related to Izlude Arena && Control Panel(to come)
 //===== Additional Comments: =================================
 //= 1.0 First version, done by SinSloth. [MasterOfMuppets]
+//= 1.1 updated welcome_arena warp coords (was 128,126) [Lupus]
 //============================================================
 
-izlude,128,126,0	warp	welcome_arena	1,1,arena_room,100,30
+izlude,128,226,0	warp	welcome_arena	1,1,arena_room,100,30
 arena_room,99,24,0	warp	bye_arena	2,2,izlude,128,220
 arena_room,84,103,0	warp	arn_room_11_1	1,1,arena_room,63,130
 arena_room,63,126,0	warp	arn_room_11_2	1,1,arena_room,87,100