From 811e8066d0c91d49928af9093eda38bfc9a023c3 Mon Sep 17 00:00:00 2001 From: L0ne_W0lf Date: Sun, 10 Aug 2008 19:20:11 +0000 Subject: * Rather massive item database update. - Added a lot of items, though some are not implemented. - Updated a lot of the current prices for many items - All items now use the "Buy" column for price. * Added new skills to the skill database. (commented out) * Updated item trade database with new items. * Updated Cashshop functions. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13066 54d463be-8e91-2dee-dedb-b68131a5f0ec --- npc/Changelog.txt | 1 + npc/other/CashShop_Functions.txt | 127 ++++++++++++++++++++++++++++++++------- 2 files changed, 107 insertions(+), 21 deletions(-) (limited to 'npc') diff --git a/npc/Changelog.txt b/npc/Changelog.txt index 1357855a1..9ffdc20d8 100644 --- a/npc/Changelog.txt +++ b/npc/Changelog.txt @@ -1,6 +1,7 @@ Date Added ====== 2008/08/10 + * Rev. 13065 Updated Cashshop functions. [L0ne_W0lf] * Fixed: several typos (bugreport:2029 bugreport:2023) [Yommy] * Fixed: hugel bingo quest (bugreport:1556) [Yommy] * Fixed copy paste error in monster race (bugreport:2035) [Yommy] diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index c61f13b4f..b9eb3190d 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= L0ne_W0lf //===== Current Version: ===================================== -//= 1.0 +//= 1.1 //===== Compatible With: ===================================== //= eAthena SVN //===== Description: ========================================= @@ -15,6 +15,9 @@ //===== Additional Comments: ================================= //= 1.0 First version. [L0ne_W0lf] //= F_CashPartyCall Optimized by Trancid. +//= 1.1 Updated Dungeon Teleport Scroll. [L0ne_W0lf] +//= Added Town Teleport Scroll Function +//= Added Seige Teleport Scroll Function //============================================================ // Kafra Card @@ -77,30 +80,31 @@ function script F_CashReset { function script F_CashDungeon { switch(select("Nogg Road:Mjolnir Dead Pit:Umbala Dungeon:Payon Caves:Toy Factory:Glast Heim Prison:Louyang Dungeon:Kunlun Dungeon:Izlude Undersea Tunnel:Turtle Island:Clocktower 3F:Clocktower B3F:Glast Heim Sewers 2F:Sphinx Dungeon 4F:Pyramid Dungeon 4F:Prontera Culverts 3F:Amatsu Dungeon 1F:Somatology Laboratory 1F:Ayotaya Dungeon 2F")) { - case 1: warp "mag_dun01",0,0; end; // Nogg Road - case 2: warp "mjo_dun01",0,0; end; // Mjolnir Dead Pit - case 3: warp "um_dun01",0,0; end; // Umbala Dungeon - case 4: warp "pay_dun00",0,0; end; // Payon Caves - case 5: warp "xmas_dun01",0,0; end; // Toy Factory - case 6: warp "gl_prison",0,0; end; // Glast Heim Prison - case 7: warp "lou_dun01",0,0; end; // Louyang Dungeon - case 8: warp "gon_dun01",0,0; end; // Kunlun Dungeon - case 9: warp "iz_dun00",0,0; end; // Izlude Undersea Tunnel - case 10: warp "tur_dun01",0,0; end; // Turtle Island - case 11: warp "c_tower3",0,0; end; // Clocktower 3F - case 12: warp "alde_dun03",0,0; end; // Clocktower B3F - case 13: warp "gl_sew02",0,0; end; // Glast Heim Sewers 2F - case 14: warp "in_sphinx4",0,0; end; // Sphinx Dungeon 4F - case 15: warp "moc_pryd04",0,0; end; // Pyramid Dungeon 4F - case 16: warp "prt_sewb3",0,0; end; // Prontera Culverts 3F - case 17: warp "ama_dun01",0,0; end; // Amatsu Dungeon 1F - case 18: warp "lhz_dun01",0,0; end; // Somatology Laboratory 1F - case 19: warp "ayo_dun02",0,0; end; // Ayotaya Dungeon 2F + case 1: warp "mag_dun01",125,71; end; // Nogg Road + case 2: warp "mjo_dun02",80,297; end; // Mjolnir Dead Pit + case 3: warp "um_dun02",125,122; end; // Umbala Dungeon + case 4: warp "ein_dun01",261,262; end; // Einbroch Dungeon + case 5: warp "pay_dun03",155,150; end; // Payon Caves + case 6: warp "xmas_dun01",133,130; end; // Toy Factory + case 7: warp "gl_prison",140,15;end; // Glast Heim Prison + case 8: warp "lou_dun03",165,38; end; // Louyang Dungeon + case 9: warp "gon_dun02",251,263; end; // Kunlun Dungeon + case 10: warp "iz_dun02",350,335; end; // Izlude Undersea Tunnel + case 11: warp "tur_dun02",165,30; end; // Turtle Island + case 12: warp "alde_dun03",275,180; end; // Clocktower 3F + case 13: warp "c_tower3",34,42; end; // Clocktower B3F + case 14: warp "gl_sew02",292,295; end; // Glast Heim Sewers 2F + case 15: warp "in_sphinx4",120,120; end; // Sphinx Dungeon 4F + case 16: warp "moc_pryd04",195,4; end; // Pyramid Dungeon 4F + case 17: warp "prt_sewb3",20,175; end; // Prontera Culverts 3F + case 18: warp "ama_dun01",222,144; end; // Amatsu Dungeon 1F + case 19: warp "lhz_dun01",19,153; end; // Somatology Laboratory 1F + case 20: warp "ayo_dun02",70,240; end; // Ayotaya Dungeon 2F } return; } -// Cities Teleport Scroll +// Coloured Butterly Wings //============================================================ // - Warp player to differents Citys acording to the Scroll // - Arg(0) = type of scroll. @@ -142,3 +146,84 @@ function script F_CashCity { } return; } + +// Teleport Scrolls +//============================================================ +// - Warp player to save point or City acording to the Scroll +// - Arg(0) = type of scroll. +function script F_CashTele { + switch(getarg(0)) { + case 1: + switch(select("Savepoint:Prontera:Geffen:Al de Baran:Izlude")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "prontera",167,68; end; + case 3: warp "geffen",121,147; end; + case 4: warp "aldebaran",168,112; end; + case 5: warp "izlude",128,105; end; + } + case 2: + switch(select("Savepoint:Payon:Alberta:Morroc:Comodo")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "payon",172,101; end; + case 3: warp "alberta",117,56; end; + case 4: warp "morocc",165,255; end; + case 5: warp "comodo",193,148; end; + } + case 3: + switch(select("Savepoint:Louyang:Amatsu:Kunlun Field:Ayothaya")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "louyang",216,40; end; + case 3: warp "amatsu",197,83; end; + case 4: warp "gon_fild01",258,82; end; + case 5:warp "ayothaya",149,71; end; + } + case 4: + switch(select("Savepoint:Lutie Field:Umbala:Niflheim")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "xmas_fild01",78,68; end; + case 3: warp "umbala",100,154; end; + case 4: warp "niflheim",49,146; end; + } + case 5: + switch(select("Savepoint:Juno:Einbroch:Lighthalzen:Hugel")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "yuno",158,39; end; + case 3: warp "einbroch",240,200; end; + case 4: warp "lighthalzen",214,311; end; + case 5: warp "hugel",95,43; end; + } + case 6: + switch(select("Savepoint:Rachel:Veins")) { + case 1: warp "SavePoint",0,0; end; + case 2: warp "rachel",115,125; end; + case 3: warp "veins",205,102; end; + } + } + return; +} + +function script F_CashSeigeTele { + switch(select("Neuschwanstein (aldeg_cas01):Hohenschwangau (aldeg_cas02):Nuernberg (aldeg_cas03):Wuerzburg (aldeg_cas04):Rothenburg (aldeg_cas05):Repherion (gefg_cas01):Eeyorbriggar (gefg_cas02):Yesnelph (gefg_cas03):Bergel (gefg_cas04):Mersetzdeitz (gefg_cas05):Bright Arbor (payg_cas01):Sacred Altar (payg_cas02):Holy Shadow (payg_cas03):Scarlet Palace (payg_cas04):Bamboo Grove Hill (payg_cas05):Kriemhild (prtg_cas01):Swanhild (prtg_cas02):Fadhgridh (prtg_cas03):Skoegul (prtg_cas04):Gondul (prtg_cas05)")) { + case 1: warp "alde_gld",48,91; end; + case 2: warp "alde_gld",103,245; end; + case 3: warp "alde_gld",142,87; end; + case 4: warp "alde_gld",236,243; end; + case 5: warp "alde_gld",269,90; end; + case 6: warp "gef_fild13",217,75; end; + case 7: warp "gef_fild13",307,237; end; + case 8: warp "gef_fild13",77,297; end; + case 9: warp "gef_fild13",190,276; end; + case 10: warp "gef_fild13",312,91; end; + case 11: warp "pay_gld",121,232; end; + case 12: warp "pay_gld",297,116; end; + case 13: warp "pay_gld",318,293; end; + case 14: warp "pay_gld",140,164; end; + case 15: warp "pay_gld",202,264; end; + case 16: warp "prt_gld",141,64; end; + case 17: warp "prt_gld",240,131; end; + case 18: warp "prt_gld",153,133; end; + case 19: warp "prt_gld",126,240; end; + case 20: warp "prt_gld",195,240; end; + } + return; +} -- cgit v1.2.3-70-g09d2