From e526ee3248e8537894de240de05511127c572a84 Mon Sep 17 00:00:00 2001 From: kenpachi2k11 Date: Tue, 24 Apr 2012 19:42:07 +0000 Subject: Updated locations for colored Butterfly Wings (14582-14585) to official. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15955 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/other/CashShop_Functions.txt | 56 ++++++++++++++++++++-------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'npc/other') diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index eb8b1f19e..382e43ba0 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -129,38 +129,38 @@ function script F_CashDungeon { function script F_CashCity { switch(getarg(0)) { - // Yellow - case 1: switch(select("Prontera:Geffen:Payon:Morroc:Aldebaran:Alberta")) { - case 1: warp "prontera",0,0; end; - case 2: warp "geffen",0,0; end; - case 3: warp "payon",0,0; end; - case 4: warp "morocc",0,0; end; - case 5: warp "aldebaran",0,0; end; - case 6: warp "alberta",0,0; end; + case 1: // Yellow - Rune-Midgart + switch(select("Prontera:Geffen:Payon:Morroc:Al de Baran:Alberta")) { + case 1: warp "prontera",167,68; end; + case 2: warp "geffen",121,147; end; + case 3: warp "payon",172,101; end; + case 4: warp "morocc",165,255; end; + case 5: warp "aldebaran",168,112; end; + case 6: warp "alberta",117,56; end; } - break; - // Green - case 2: switch(select("Juno:Lighthalzen:Einbroch:Hugel")) { - case 1: warp "yuno",0,0; end; - case 2: warp "lighthalzen",0,0; end; - case 3: warp "einbroch",0,0; end; - case 4: warp "hugel",0,0; end; + break; + case 2: // Green - Schwartzvalt + switch(select("Juno:Einbroch:Lighthalzen:Hugel")) { + case 1: warp "yuno",158,39; end; + case 2: warp "einbroch",240,200; end; + case 3: warp "lighthalzen",214,311; end; + case 4: warp "hugel",95,43; end; } - break; - // Red - case 3: switch(select("Rachel:Veins")) { - case 1: warp "rachel",0,0; end; - case 2: warp "veins",0,0; end; + break; + case 3: // Red - Arunafeltz + switch(select("Rachel:Veins")) { + case 1: warp "rachel",115,125; end; + case 2: warp "veins",205,102; end; } - break; - // Blue - case 4: switch(select("Ayothaya:Amatsu:Louyang:Gonryun")) { - case 1: warp "ayothaya",0,0; end; - case 2: warp "amatsu",0,0; end; - case 3: warp "louyang",0,0; end; - case 4: warp "gonryun",0,0; end; + break; + case 4: // Blue - Islands + switch(select("Louyang:Amatsu:Kunlun Field:Ayothaya")) { + case 3: warp "louyang",216,40; end; + case 2: warp "amatsu",197,83; end; + case 4: warp "gon_fild01",258,82; end; + case 1: warp "ayothaya",149,71; end; } - break; + break; } return; } -- cgit v1.2.3-70-g09d2