* 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://svn.code.sf.net/p/rathena/svn/trunk@13066 54d463be-8e91-2dee-dedb-b68131a5f0ec

db/Changelog.txt

@@ -41,6 +41,12 @@
 
 =======================
 2008/08/10
+	* Rev. 13066 Rather massive item database update. [L0ne_W0lf]
+	- 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.
 	* Item 13157 changed to Gatling type (bugreport:1913) [Yommy]
 2008/07/27
 	* Rev. 13006 Added values to skill_require_db for mercenary skills. [L0ne_W0lf]

db/item_trade.txt

@@ -30,8 +30,6 @@
 2644,123,100	// The_Sign_
 7314,123,100	// The_Sign
 7025,91,100	// Lucifer's_Lament
-7527,122,100	// Life_Book
-12142,122,100	// Magic_Book
 
 // "2nd Anniversary Event" items
 // "Eye of Hellion" items
@@ -89,7 +87,7 @@
 7499,123,100	// Family_Portrait
 7500,123,100	// Elysia_Portrait
 7501,123,100	// Kyll_Hyre_Letter2
-7502,123,100	// Pieco_Memo_Of_James
+7502,123,100	// Piece_Memo_Of_James
 7503,123,100	// Man_Portrait
 7504,123,100	// Toy_Motor
 7505,123,100	// Toy_Key
@@ -117,6 +115,10 @@
 // * Friendship Quest(?) Items
 7351,123,100	// Friend's_Diary
 
+// ??? Indonesian Event
+7527,122,100	// Life_Book
+12142,122,100	// Magic_Book
+
 // "2006 USA 3rd Anniversary" related items
 7530,123,100	// Travel_Brochure_01
 7531,123,100	// Travel_Brochure_02
@@ -139,13 +141,13 @@
 // Brazillian Event items
 7547,115,100	// Soccer_Ball
 7548,115,100	// Soccer_Shoes
-7549,115,100	// Braziianl_Flag
+7549,115,100	// Brazilian_Flag
 7550,115,100	// Ticket01
 7551,115,100	// Ticket02
 7552,115,100	// Ticket03
 
 // Taiwan Besark's Day Event items
-7553,115,100	// Lotus
+7553,115,100	// Lotus_Flower
 7554,115,100	// Striped_Candle
 7555,115,100	// Green_Incense
 
@@ -163,9 +165,9 @@
 5156,91,100	// Flu_Mask_F
 
 // Indonesia Jewel Event items
-7575,115,100	// Red-coloured_Gem
-7576,115,100	// Blue-coloured_Gem
-7577,115,100	// Yellow-coloured_Gem
+7575,115,100	// Red_Jewel_
+7576,115,100	// Blue_Jewel_
+7577,115,100	// Golden_Jewel_
 
 // Rachel Quest items
 // * Aruna First (Katullanux quest)
@@ -185,12 +187,12 @@
 //7580,115,100	// Black_Marble
 
 // Taiwan 4th Anniversary Memorial items
-7583,115,100	// Evil_Heart
+7583,115,100	// Evil_Mind
 7584,115,100	// Guard's_1st_Proof
 7585,115,100	// Guard's_2nd_Proof
 7586,115,100	// Guard's_3rd_Proof
 7587,115,100	// Guard's_4th_Proof
-2673,123,100	// Warrior_Radiating_Ring
+2673,123,100	// Shining_Ring
 1533,123,100	// Warrior's_Balmung
 13020,123,100	// Warrior's_Balmung_
 
@@ -202,14 +204,13 @@
 5201,115,100	// Party_Hat_B
 
 // 2006 Indonesia Honor Ring item 
-2674,123,100	// Ring_Of_Honor
+2674,123,100	// Honor_Ring
 
 // 2006 Korean Harvest Moon Day Event item
 12199,123,100	// Rice_Scroll
 
 // 2006 Indonesia Event
-//These two items have not been implemented in eathena.
-7614,115,100	// Wrapping_Paper
+7614,115,100	// Special_Packing_Paper
 7618,115,100	// Monster_Crystal
 2676,123,100	// Hunter_Earring
 
@@ -259,17 +260,260 @@
 12221,91,100	// Megaphone_
 7619,91,100	// Enriched_Elunium
 7620,91,100	// Enriched_Oridecon
-7621,91,100	// Token_of_Siegfried
-//12923,73,100	// Pet_Egg_Scroll_Box
-//12924,73,100	// Pet_Egg_Scroll_Box
-//12925,91,100	// Pet_Egg_Scroll
-//12926,91,100	// Pet_Egg_Scroll
-//12929,73,100	// Pet_Egg_Scroll_Box
-//12930,73,100	// Pet_Egg_Scroll_Box
-//12931,73,100	// Pet_Egg_Scroll_Box
-//12932,91,100	// Pet_Egg_Scroll
-//12933,91,100	// Pet_Egg_Scroll
-//12934,91,100	// Pet_Egg_Scroll
+7621,91,100	// Token_Of_Siegfried
+5227,91,100	// Red_Deviruchi_Cap
+5228,91,100	// White_Deviruchi_Cap
+5229,91,100	// Gray_Deviruchi_Cap
+5230,91,100	// White_Drooping_Kitty
+5231,91,100	// Gray_Drooping_Kitty
+5232,91,100	// Pink_Drooping_Kitty
+5233,91,100	// Blue_Drooping_Kitty
+5234,91,100	// Yellow_Drooping_Kitty
+5235,91,100	// Gray_Fur_Hat
+5236,91,100	// Blue_Fur_Hat
+5237,91,100	// Pink_Fur_Hat
+5238,91,100	// Red_Wizardry_Hat
+5239,91,100	// White_Wizardry_Hat
+5240,91,100	// Gray_Wizardry_Hat
+5241,91,100	// Blue_Wizardry_Hat
+5242,91,100	// Yellow_Wizardry_Hat
+12983,73,100	// Pet_Egg_Scroll_Box6
+12984,73,100	// Pet_Egg_Scroll_Box7
+12985,73,100	// Pet_Egg_Scroll_Box8
+12986,73,100	// Pet_Egg_Scroll_Box9
+12987,73,100	// Pet_Egg_Scroll_Box10
+12988,73,100	// Pet_Egg_Scroll_Box11
+12989,91,100	// Pet_Egg_Scroll6
+12990,91,100	// Pet_Egg_Scroll7
+12991,91,100	// Pet_Egg_Scroll8
+12992,91,100	// Pet_Egg_Scroll9
+12993,91,100	// Pet_Egg_Scroll10
+12994,91,100	// Pet_Egg_Scroll11
+12923,73,100	// Pet_Egg_Scroll_Box1
+12924,73,100	// Pet_Egg_Scroll_Box2
+12925,91,100	// Pet_Egg_Scroll1
+12926,91,100	// Pet_Egg_Scroll2
+12929,73,100	// Pet_Egg_Scroll_Box3
+12930,73,100	// Pet_Egg_Scroll_Box4
+12931,73,100	// Pet_Egg_Scroll_Box5
+12932,91,100	// Pet_Egg_Scroll3
+12933,91,100	// Pet_Egg_Scroll4
+12934,91,100	// Pet_Egg_Scroll5
+12935,89,100	// Infiltrator_Box
+12936,89,100	// Muramasa_Box
+12940,89,100	// Kaiser_Knuckle_Box
+12941,89,100	// Pole_Axe_Box
+12942,89,100	// Mighty_Staff_Box
+12943,89,100	// Right_Epsilon_Box
+12944,89,100	// Balistar_Box
+12945,89,100	// Diary_Of_Great_Sage_Box
+12951,89,100	// Elven_Ears_Box
+12952,89,100	// Steel_Flower_Box
+12953,89,100	// Critical_Ring_Box
+12954,89,100	// Earring_Box
+12955,89,100	// Ring_Box
+12956,89,100	// Necklace_Box
+12957,89,100	// Glove_Box
+2686,123,100	// Elven_Ears_C
+2687,123,100	// Steel_Flower_C
+2688,123,100	// Critical_Ring_C
+2689,123,100	// Earring_C
+2690,123,100	// Ring_C
+2691,123,100	// Necklace_C
+2692,123,100	// Glove_C
+1173,123,100	// Muramasa_C
+1267,123,100	// Infiltrator_C
+1372,123,100	// Right_Epsilon_C
+1419,123,100	// Pole_Axe_C
+1563,123,100	// Diary_Of_Great_Sage_C
+1623,123,100	// Mighty_Staff_C
+1728,123,100	// Balistar_C
+1817,123,100	// Kaiser_Knuckle_C
+
+// Mercenary scrolls
+12153,115,100	// Bow_Mercenary_Scroll1
+12154,115,100	// Bow_Mercenary_Scroll2
+12155,115,100	// Bow_Mercenary_Scroll3
+12156,115,100	// Bow_Mercenary_Scroll4
+12157,115,100	// Bow_Mercenary_Scroll5
+12158,115,100	// Bow_Mercenary_Scroll6
+12159,115,100	// Bow_Mercenary_Scroll7
+12160,115,100	// Bow_Mercenary_Scroll8
+12161,115,100	// Bow_Mercenary_Scroll9
+12162,115,100	// Bow_Mercenary_Scroll10
+12163,115,100	// SwordMercenary_Scroll1
+12164,115,100	// SwordMercenary_Scroll2
+12165,115,100	// SwordMercenary_Scroll3
+12166,115,100	// SwordMercenary_Scroll4
+12167,115,100	// SwordMercenary_Scroll5
+12168,115,100	// SwordMercenary_Scroll6
+12169,115,100	// SwordMercenary_Scroll7
+12170,115,100	// SwordMercenary_Scroll8
+12171,115,100	// SwordMercenary_Scroll9
+12172,115,100	// SwordMercenary_Scroll10
+12173,115,100	// SpearMercenary_Scroll1
+12174,115,100	// SpearMercenary_Scroll2
+12175,115,100	// SpearMercenary_Scroll3
+12176,115,100	// SpearMercenary_Scroll4
+12177,115,100	// SpearMercenary_Scroll5
+12178,115,100	// SpearMercenary_Scroll6
+12179,115,100	// SpearMercenary_Scroll7
+12180,115,100	// SpearMercenary_Scroll8
+12181,115,100	// SpearMercenary_Scroll9
+12182,115,100	// SpearMercenary_Scroll10
+
+// Indonesian ???
+5368,91,100	// White_Wing
+5369,91,100	// Dark_Wing
+
+// Indonesian ???
+//5812,123,100	// ???
+
+// Indonesia 4 Annual Events
+2368,83,100	// Golden_Armor
+2427,83,100	// Golden_Shoes
+2704,83,100	// Golden_Accessory
+2705,83,100	// Golden_Accessory2
+5295,83,100	// Golden_Bandana
+7863,83,100	// GOLD_ID4
+
+// Thailand Event-Environment Day Items
+7865,115,100	// Gold_Pouch
+7866,115,100	// Certificate
+
+// "11.2 Quest items"
+// * "Thor Volcano Base" items
+7759,123,100	// Geology_Report
+
+// USA 4th Anniversary Event Items
+7875,83,100	// Pirate_Box
+5305,91,100	// Pirate_Dagger
+
+// Battle Badge
+7773,115,100	// War_Badge
+
+// Moscovia Quest Items -----
+7876,115,100	// Gold_Key
+7877,115,100	// Red_Ring
+7878,115,100	// Lusalka_Hair
+7879,115,100	// Golden_Thread
+7880,115,100	// Babayaga_Silver_Spoon
+7881,115,100	// Book_Of_Magic
+7882,115,100	// Pointed_Branch
+7883,115,100	// Reed_Pipe
+2429,115,100	// Iron_Shoes_01
+2430,115,100	// Iron_Shoes_02
+
+// Indonesian Red Bandana Hair Band
+5320,91,100	// Champion_Wreath
+
+// Malaysia/Singapore Event Items
+7884,91,100	// Jade_Plate
+7885,91,100	// Sacred_Arrow
+5805,91,100	// Victorious_Coronet
+2708,91,100	// Chinese_Handicraft
+12704,91,100	// Elixir_Of_Life
+12705,91,100	// Noble_Nameplate
+
+// Compensation Items Coupon
+7784,91,100	// Fawner_Coupon_1
+7785,91,100	// Fawner_Coupon_2
+7786,91,100	// Fawner_Coupon_3
+7787,91,100	// Fawner_Coupon_4
+7788,91,100	// Fawner_Coupon_5
+7789,91,100	// Fawner_Coupon_6
+7790,91,100	// Fawner_Coupon_7
+7791,91,100	// Fawner_Coupon_8
+
+// Fate Crow Quest Items
+7794,91,100	// Fate_Of_Crow
+
+// Russian Golden Apple Event Items
+7793,91,100	// Golden_Apple
+7800,91,100	// Golden_Apple_
+5322,91,100	// Scarf
+
+// Taiwan Medicine of Fantasy
+12259,123,100	// Miracle_Medicine
+12261,123,100	// Secret_Medicine
+
+// 2007 Summer Event Items
+7801,115,100	// Girl_Fan_Letter
+7802,115,100	// Autograph_Book
+
+// Sakray Test items
+5323,91,100	// Misstrance_Crown
+2370,91,100	// Used_Mage_Coat
+2127,91,100	// Secular_Mission
+2534,91,100	// Ruffler
+2431,91,100	// Valley_Shoes
+13029,91,100	// Prinsense_Knife
+13406,91,100	// Edger
+1536,91,100	// Good_Morning_Star
+1423,91,100	// Pole_XO
+1921,91,100	// Gun_Moon_Gom
+1975,91,100	// Queen_Is_Whip
+1566,91,100	// Diary_Of_Great_Basil
+1627,91,100	// Staffy
+1177,91,100	// Muramasn
+1272,91,100	// Scratcher
+1735,91,100	// Kkakkung
+
+// Taiwan ???
+13765,123,100	// Certificate_TW_Box
+//2713,123,100	// Accomplishment_Certificate
+
+// Satan Morroc
+7820,123,100	// Morroc_Skin
+
+// Vietnam Independence Day
+5806,91,100	// Poem_Natalie_Hat
+
+// PC-Cafe Authoritative Badge
+12262,123,100	// Inspector_Certificate_
+
+12263,91,100	// Comp_Battle_Manual
+12264,91,100	// Comp_Bubble_Gum
+12265,91,100	// Comp_Insurance
+
+// Morocc Continental Guard Certificate
+7826,123,100	// Continental_Guard_Paper
+
+// Harvest Moon Day PC Items
+12266,123,100	// Sesame_Pastry_
+12267,123,100	// Honey_Pastry_
+12268,123,100	// Rainbow_Cake_
+
+// Satan Morocc (Episode 12)
+2730,83,100	// Morroc_Seal
+2731,83,100	// Morroc_Charm_Stone
+2732,83,100	// Morroc_Ring
+
+// Philippines April Packages
+//13994,91,100	// Speed_Potion_Box(5)
+//13995,91,100	// Speed_Potion_Box(10)
+//13996,91,100	// Big_Bun_Box(100)
+//13997,91,100	// Big_Bun_Box(500)
+//13998,91,100	// Giant_Fly_Wing_Box(500)
+//13999,91,100	// Pill_Box(100)
+//14000,91,100	// Pill_Box(500)
+//14001,91,100	// Recruit_Siege_Supply_Box
+//14002,91,100	// Veteran_Siege_Supply_Box
+//14003,91,100	// Elite_Siege_Supply_Box
+//11503,91,100	// Siege_White_Potion
+//11504,91,100	// Siege_Blue_Potion
+
+// Phillipian Headgears
+//13918,91,100	// Evolved_Drooping_Cat_Box
+//13919,91,100	// Evolved_Majestic_Goat_Box
+//13920,91,100	// Evolved_Devil's_Headband_Box
+//13921,91,100	// Evolved_Pipes_Cigarettes_Box
+//13922,91,100	// Evolved_Rabbits_Headband_Box
+//13923,91,100	// Helm_Of_Darkness_Box
+//13924,91,100	// Evolved_Helmet_Of_Orc_Hero_Box
+
+// ???
+//6024,72,100	// ???
 
 // "St. Patrick's Day (2008)" Quest related items
 //7720,123,100	// Gold_Coin

db/skill_db.txt

@@ -117,7 +117,7 @@
 73,9,6,16,0,0x1,0,10,1,yes,0,0,0,magic,0,	PR_KYRIE,Kyrie Eleison
 74,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,		PR_MAGNIFICAT,Magnificat
 75,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,		PR_GLORIA,Gloria
-76,5,6,1,0,0x1,0:0:0:0:0:0:0:0:0:0:-1,10,0,yes,0,0,0,magic,0,	PR_LEXDIVINA,Lex Divina
+76,5,6,1,0,0x1,0,10,0,yes,0,0,0,magic,0,	PR_LEXDIVINA,Lex Divina
 77,5,6,1,6,0x28,0,10,1,yes,0,0,0,magic,0,	PR_TURNUNDEAD,Turn Undead
 78,9,6,1,0,0x1,0,1,0,yes,0,0,0,magic,0,		PR_LEXAETERNA,Lex Aeterna
 79,9,8,2,6,0,0,10,1:2:3:4:5:6:7:8:9:10,yes,0,0,0,magic,0,	PR_MAGNUS,Magnus Exorcismus
@@ -587,6 +587,7 @@
 543,0,6,4,0,0x1,0,5,1,yes,0,0,0,none,0,		NJ_NEN,Soul
 544,-5,6,1,0,0x40,0,10,1,no,0,0,0,weapon,0,	NJ_ISSEN,Final Strike
 
+// Additional NPC Skills (Episode 11.3)
 653,0,8,4,0,0x6,5:7:9:11:13:5:7:9:11:13,10,3,no,0,0x2,0,magic,0,	NPC_EARTHQUAKE,Earthquake
 654,9,6,1,3,0,5,10,1,no,0,0x2,14,weapon,0,	NPC_FIREBREATH,Fire Breath
 655,9,6,1,1,0,5,10,1,no,0,0x2,14,weapon,0,	NPC_ICEBREATH,Ice Breath
@@ -619,6 +620,24 @@
 // Cash Shop Skill
 681,0,0,0,0,0,0,10,0,no,0,0x1,0,none,0,		ALL_INCCARRY,Increase Weight Limit R
 
+// Additional NPC skill (Episode 12)
+//682,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_TALK,Talk
+//683,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_HELLPOWER,Hell Power
+//684,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_WIDEHELLDIGNITY,Hell Dignity
+//685,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_INVINCIBLE,Incinvible
+//686,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_INVINCIBLEOFF,Invincible off
+//687,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		NPC_ALLHEAL,Full Heal
+
+// Additional Skill (??)
+//688,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		GM_SANDMAN,GM Sandman
+//689,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		CASH_BLESSING,Blessing
+//690,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		CASH_INCAGI,Increase Agi
+//691,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		CASH_ASSUMPTIO,Assumpito
+//692,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_CATCRY,Cat Cry
+//693,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_PARTYFLEE,Party Flee
+//694,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_ANGEL_PROTECT,Angel's Protection
+//695,0,0,0,0,0,0,9,0,no,0,0,0,none,0,		ALL_SUMMERNIGHTDREAM,Summer Night Dream
+
 1001,9,6,1,-1,0,0,1,1,no,0,0x1,0,weapon,0,	KN_CHARGEATK,Charge Attack
 1002,0,6,4,0,0x1,0,1,0,no,0,0x1,0,weapon,2,	CR_SHRINK,Shrink
 1003,0,0,0,0,0,0,1,0,no,0,0x1,0,weapon,0,	AS_SONICACCEL,Sonic Acceleration
@@ -657,43 +676,43 @@
 8016,4,6,4,-1,0xD2,4,3,1,no,0,0,0,misc,0,        HVAN_EXPLOSION,Bio Explosion
 
 // Mercenary Skill Place holders
-//8201,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MS_BASH,Bash
-//8202,0,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MS_MAGNUM,Magnum_Break
-//8203,0,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MS_BOWLINGBASH,Bowling_Bash
-//8204,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	MS_PARRYING,Parry
-//8205,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MS_REFLECTSHIELD,Shield_Reflect
-//8206,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	MS_BERSERK,Frenzy
-//8207,-9,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MA_DOUBLE,Double_Strafe
-//8208,-9,0,0,0,0x2,0,10,0,no,0,0,0,weapon,0,	MA_SHOWER,Arrow_Shower
-//8209,0,0,0,0,0x1,0,5,0,no,0,0,0,misc,0,	MA_SKIDTRAP,Skid_Trap
-//8210,0,0,0,0,0x40,0,5,0,no,0,0,0,misc,0,	MA_LANDMINE,Land_Mine
-//8211,0,0,0,0,0x3,0,5,0,no,0,0,0,misc,0,	MA_SANDMAN,Sandman
-//8212,0,0,0,0,0x42,0,5,0,no,0,0,0,weapon,0,	MA_FREEZINGTRAP,Freezing_Trap
-//8213,0,0,0,0,0x1,0,1,0,no,0,0,0,misc,0,	MA_REMOVETRAP,Remove_Trap
-//8214,0,0,0,0,0x2,0,1,0,no,0,0,0,weapon,0,	MA_CHARGEARROW,Arrow_Repel
-//8215,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
-//8216,0,0,0,0,0,0,10,0,no,0,0,0,weapon,0,	ML_PIERCE,Pierce
-//8217,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	ML_BRANDISH,Brandish_Spear
-//8218,5,0,0,0,0x20,0,5,0,no,0,0,0,weapon,0,	ML_SPIRALPIERCE,Spiral_Pierce
-//8219,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	ML_DEFENDER,Defending_Aura
-//8220,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	ML_AUTOGUARD,Guard
-//8221,0,0,0,0,0x1,0,10,0,no,0,0,0,none,0,	ML_DEVOTION,Sacrifice
-//8222,0,0,0,0,0x3,0,5,0,no,0,0,0,magic,0,	MER_MAGNIFICAT,Magnificat
-//8223,0,0,0,0,0x1,0,10,0,no,0,0,0,weapon,0,	MER_QUICKEN,Two-Hand_Quicken
-//8224,0,0,0,0,0x3,0,1,0,no,0,0,0,magic,0,	MER_SIGHT,Sight
+//8201,-1,6,1,-1,0,0,10,1,no,0,0,0,weapon,0,	MS_BASH,Bash
+//8202,0,6,4,3,0x2,2,10,1,no,0,0,0,weapon,2,	MS_MAGNUM,Magnum_Break
+//8203,-2,6,1,-1,0x2,1,10,1,no,33,0,0,weapon,1,	MS_BOWLINGBASH,Bowling_Bash
+//8204,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	MS_PARRYING,Parry
+//8205,0,6,4,0,0,0,10,1,no,0,0,0,weapon,0,	MS_REFLECTSHIELD,Shield_Reflect
+//8206,0,6,4,0,0x1,0,1,1,no,0,0,0,weapon,0,	MS_BERSERK,Frenzy
+//8207,-9,8,1,-1,0,0,10,2,no,0,0,0,weapon,0,	MA_DOUBLE,Double_Strafe
+//8208,-9,6,2,-1,0x2,2,10,1,no,0,0,0,weapon,2,	MA_SHOWER,Arrow_Shower
+//8209,3,6,2,0,0x1,0,5,1,no,0,0x80,0,misc,6:7:8:9:10,	MA_SKIDTRAP,Skid_Trap
+//8210,3,6,2,2,0x40,0,5,1,no,0,0x80,0,misc,0,	MA_LANDMINE,Land_Mine
+//8211,3,6,2,0,0x3,2,5,1,no,0,0x80,0,misc,0,	MA_SANDMAN,Sandman
+//8212,3,6,2,1,0x42,1,5,1,no,0,0x80,0,weapon,0,	MA_FREEZINGTRAP,Freezing_Trap
+//8213,2,6,32,0,0x1,0,1,1,no,0,0,0,misc,0,	MA_REMOVETRAP,Remove_Trap
+//8214,-9,6,1,-1,0x2,0,1,1,no,0,0x1,0,weapon,6,	MA_CHARGEARROW,Arrow_Repel
+//8215,4,8,1,-1,0,2,5,1,yes,0,0,14,weapon,0,	MA_SHARPSHOOTING,Focused_Arrow_Strike
+//8216,-2,8,1,-1,0,0,10,3,no,0,0,0,weapon,0,	ML_PIERCE,Pierce
+//8217,-2,6,1,-1,0x1,0,10,1,no,33,0,0,weapon,3,	ML_BRANDISH,Brandish_Spear
+//8218,5,8,1,-1,0x20,0,5,5,no,0,0,0,weapon,0,	ML_SPIRALPIERCE,Spiral_Pierce
+//8219,0,6,4,0,0x1,0,5,1,no,0,0,0,weapon,0,	ML_DEFENDER,Defending_Aura
+//8220,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	ML_AUTOGUARD,Guard
+//8221,7:8:9:10:11,6,16,0,0x1,0,5,1,yes,0,0x600,0,none,0,	ML_DEVOTION,Sacrifice
+//8222,0,6,4,0,0x3,-1,5,1,yes,0,0,0,magic,0,	MER_MAGNIFICAT,Magnificat
+//8223,0,6,4,0,0x1,0,10,1,no,0,0,0,weapon,0,	MER_QUICKEN,Two-Hand_Quicken
+//8224,0,6,4,3,0x3,3,1,1,yes,0,0,0,magic,0,	MER_SIGHT,Sight
 //8225,0,0,0,0,0x1,0,5,0,no,0,0,0,weapon,0,	MER_CRASH,Crash
 //8226,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_REGAIN,Regain
 //8227,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_TENDER,Tender
 //8228,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_BENEDICTION,Benediction
 //8229,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_RECUPERATE,Recuperate
 //8230,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_MENTALCURE,Mental_Cure
-//8231,0,0,0,0,0,0,1,0,no,0,0,0,magic,0,	MER_COMPRESS,Compress
-//8232,0,0,0,0,0,0,10,0,no,0,0,0,none,0,	MER_PROVOKE,Provoke
-//8233,0,0,0,0,0x1,0,1,0,no,0,0,0,weapon,0,	MER_AUTOBERSERK,Berserk
-//8234,0,0,0,0,0x1,0,10,0,no,0,0,0,magic,0,	MER_DECAGI,Decrease_AGI
+//8231,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_COMPRESS,Compress
+//8232,9,6,1,0,1,0,10,1,no,0,0,0,none,0,	MER_PROVOKE,Provoke
+//8233,0,6,4,0,0x1,0,1,1,no,0,0x1,0,weapon,0,	MER_AUTOBERSERK,Berserk
+//8234,9,6,1,0,0x1,0,10,1,yes,0,0,0,magic,0,	MER_DECAGI,Decrease_AGI
 //8235,0,0,0,0,0,0,1,0,no,0,0,0,none,0,		MER_SCAPEGOAT,Scapegoat
-//8236,0,0,0,0,0x1,0,10,0,no,0,0,0,magic,0,	MER_LEXDIVINA,Lex_Divina
-//8237,0,0,0,0,0x1,0,1,0,no,0,0,0,magic,0,	MER_ESTIMATION,Sense
+//8236,5,6,1,0,0x1,0,10,0,yes,0,0,0,magic,0,	MER_LEXDIVINA,Lex_Divina
+//8237,9,6,1,0,0x1,0,1,1,yes,0,0,0,magic,0,	MER_ESTIMATION,Sense
 
 10000,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_APPROVAL,Official Guild Approval
 10001,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_KAFRACONTRACT,Kafra Contract
@@ -710,3 +729,4 @@
 10012,0,0,4,0,0x3,15,1,0,yes,0,0x10,0,none,0,    GD_RESTORE,Restoration
 10013,0,0,4,0,0x3,0,1,0,yes,0,0x10,0,none,0,     GD_EMERGENCYCALL,Urgent Call
 10014,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_DEVELOPMENT,Permanent Development
+//10015,0,0,0,0,0,0,1,0,no,0,0x10,0,none,0,        GD_ITEMEMERGENCYCALL,Unknown Skill

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]

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;
+}