diff options
| author | Haru <haru@dotalux.com> | 2016-11-18 07:13:21 +0100 |
|---|---|---|
| committer | Haru <haru@dotalux.com> | 2016-11-20 18:10:45 +0100 |
| commit | e384a7f2166026dc1c8cdfe49fc2fc105197ea02 (patch) | |
| tree | 45853183b6760e267e8783bc0a50cba1199f54c9 | |
| parent | 0a4fdb4404900fb03726b98ecbe379f2d5da6bd0 (diff) | |
| download | hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.gz hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.bz2 hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.tar.xz hercules-e384a7f2166026dc1c8cdfe49fc2fc105197ea02.zip | |
Replaced some unsupported symbols in AegisNames (step 2)
This removes the remaining unsupported symbols (despite they being
official names) in AegisNames: The apostrophe (`'`) sign is suppressed.
The full replacement rules (cumulative with the step 1 commit) are thus:
- Any apostrophe is suppressed.
- Any non-`[A-Za-z0-9_]` character is replaced with an underscore (`_`).
- If the replaced symbol is at a word boundary (beginning or end of the
string, or next to another underscore), it is suppressed instead.
- If the replacement causes an AegisName conflict, underscores are
appended appropriately.
Signed-off-by: Haru <haru@dotalux.com>
78 files changed, 1084 insertions, 1084 deletions
diff --git a/db/item_db2.conf b/db/item_db2.conf index 8098b4155..e6b467b58 100644 --- a/db/item_db2.conf +++ b/db/item_db2.conf @@ -148,7 +148,7 @@ item_db: ( /* { Id: 1998 - AegisName: "Jeramiah's_Jur" + AegisName: "Jeramiahs_Jur" Name: "Jeramiah's Jur" Type: 3 Sell: 10 @@ -158,7 +158,7 @@ item_db: ( /* { Id: 1999 - AegisName: "Zed's_Staff" + AegisName: "Zeds_Staff" Name: "Zed's Staff" Type: 3 Sell: 10 @@ -221,7 +221,7 @@ item_db: ( /* { Id: 5136 - AegisName: "Santa's_Hat_" + AegisName: "Santas_Hat_" Name: "Louise's Santa Hat" Type: 5 Buy: 20 @@ -504,7 +504,7 @@ item_db: ( /* { Id: 14466 - AegisName: "Valentine's_Emblem_Box" + AegisName: "Valentines_Emblem_Box" Name: "Valentine's Emblem Box" Type: 2 Buy: 10 @@ -542,7 +542,7 @@ item_db: ( /* { Id: 5817 - AegisName: "Valentine's_Emblem" + AegisName: "Valentines_Emblem" Name: "Valentine's Emblem" Type: 5 Buy: 10 diff --git a/db/mob_db2.conf b/db/mob_db2.conf index f7b8bd9af..8d3e67904 100644 --- a/db/mob_db2.conf +++ b/db/mob_db2.conf @@ -560,9 +560,9 @@ mob_db: ( MvpExp: 0 Drops: { Rat_Tail: 9000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Feather: 800 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Ora_Ora: 2 RicePouch: 2500 Tarou_Card: 1 @@ -609,7 +609,7 @@ mob_db: ( MvpExp: 0 Drops: { Claw_Of_Rat: 4656 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Blue_Jewel: 80 Glass_Bead: 110 Lemon: 250 @@ -982,7 +982,7 @@ mob_db: ( Branch_Of_Dead_Tree: 500 Buche_De_Noel: 500 Fire_Cracker_Xmas: 500 - Santa's_Hat_: 500 + Santas_Hat_: 500 Red_Bag: 500 Sweet_Candy_Striper: 500 Santa_Beard: 500 diff --git a/db/pre-re/item_chain.conf b/db/pre-re/item_chain.conf index 892686271..a2e4efff4 100644 --- a/db/pre-re/item_chain.conf +++ b/db/pre-re/item_chain.conf @@ -91,7 +91,7 @@ ITMCHAIN_HEAL: { Novice_Potion: 50 Nice_Sweet_Potato: 50 Candy: 100 - ID528: 200 //Monster's_Feed + Monsters_Feed: 200 Popped_Rice: 600 } diff --git a/db/pre-re/item_db.conf b/db/pre-re/item_db.conf index 7dfe7ed14..ed400e270 100644 --- a/db/pre-re/item_db.conf +++ b/db/pre-re/item_db.conf @@ -387,7 +387,7 @@ item_db: ( }, { Id: 528 - AegisName: "Monster's_Feed" + AegisName: "Monsters_Feed" Name: "Monster's Feed" Type: 0 Buy: 60 @@ -510,7 +510,7 @@ item_db: ( }, { Id: 540 - AegisName: "Falcon's_Feed" + AegisName: "Falcons_Feed" Name: "Falcon Food" Type: 0 Buy: 2000 @@ -519,7 +519,7 @@ item_db: ( }, { Id: 541 - AegisName: "Pecopeco's_Feed" + AegisName: "Pecopecos_Feed" Name: "PecoPeco Food" Type: 0 Buy: 3000 @@ -981,7 +981,7 @@ item_db: ( }, { Id: 586 - AegisName: "Mother's_Cake" + AegisName: "Mothers_Cake" Name: "Mother's Cake" Type: 0 Buy: 20 @@ -2759,7 +2759,7 @@ item_db: ( }, { Id: 904 - AegisName: "Scorpion's_Tail" + AegisName: "Scorpions_Tail" Name: "Scorpion Tail" Type: 3 Buy: 124 @@ -2894,7 +2894,7 @@ item_db: ( }, { Id: 919 - AegisName: "Animal's_Skin" + AegisName: "Animals_Skin" Name: "Animal Skin" Type: 3 Buy: 36 @@ -3065,7 +3065,7 @@ item_db: ( }, { Id: 940 - AegisName: "Grasshopper's_Leg" + AegisName: "Grasshoppers_Leg" Name: "Grasshopper's Leg" Type: 3 Buy: 36 @@ -3119,7 +3119,7 @@ item_db: ( }, { Id: 946 - AegisName: "Snail's_Shell" + AegisName: "Snails_Shell" Name: "Snail's Shell" Type: 3 Buy: 64 @@ -3137,7 +3137,7 @@ item_db: ( }, { Id: 948 - AegisName: "Bear's_Foot" + AegisName: "Bears_Foot" Name: "Bear's Footskin" Type: 3 Buy: 174 @@ -3730,7 +3730,7 @@ item_db: ( }, { Id: 1015 - AegisName: "Thin_N'_Long_Tongue" + AegisName: "Thin_N_Long_Tongue" Name: "Tongue" Type: 3 Buy: 528 @@ -3847,7 +3847,7 @@ item_db: ( }, { Id: 1028 - AegisName: "Wild_Boar's_Mane" + AegisName: "Wild_Boars_Mane" Name: "Mane" Type: 3 Buy: 196 @@ -3856,7 +3856,7 @@ item_db: ( }, { Id: 1029 - AegisName: "Tiger's_Skin" + AegisName: "Tigers_Skin" Name: "Tiger Skin" Type: 3 Buy: 548 @@ -3955,7 +3955,7 @@ item_db: ( }, { Id: 1040 - AegisName: "Elder_Pixie's_Beard" + AegisName: "Elder_Pixies_Beard" Name: "Elder Pixie's Moustache" Type: 3 Buy: 232 @@ -4323,7 +4323,7 @@ item_db: ( }, { Id: 1084 - AegisName: "Kapra's_Pass" + AegisName: "Kapras_Pass" Name: "Kafra Pass" Type: 3 Weight: 10 @@ -7788,7 +7788,7 @@ item_db: ( }, { Id: 1229 - AegisName: "Mama's_Knife" + AegisName: "Mamas_Knife" Name: "Kitchen Knife" Type: 4 Buy: 20 @@ -8395,7 +8395,7 @@ item_db: ( }, { Id: 1249 - AegisName: "Fisherman's_Dagger" + AegisName: "Fishermans_Dagger" Name: "Fisherman's Dagger" Type: 4 Buy: 10000 @@ -12061,7 +12061,7 @@ item_db: ( }, { Id: 1469 - AegisName: "Longinus's_Spear" + AegisName: "Longinuss_Spear" Name: "Longinus's Spear" Type: 4 Buy: 20 @@ -14083,7 +14083,7 @@ item_db: ( }, { Id: 1558 - AegisName: "Girl's_Diary" + AegisName: "Girls_Diary" Name: "Girl's Diary" Type: 4 Buy: 1500 @@ -15345,7 +15345,7 @@ item_db: ( }, { Id: 1621 - AegisName: "Hypnotist's_Staff" + AegisName: "Hypnotists_Staff" Name: "Hypnotist's Staff" Type: 4 Buy: 43000 @@ -15367,7 +15367,7 @@ item_db: ( }, { Id: 1622 - AegisName: "Hypnotist's_Staff_" + AegisName: "Hypnotists_Staff_" Name: "Hypnotist's Staff" Type: 4 Buy: 20 @@ -16176,7 +16176,7 @@ item_db: ( }, { Id: 1646 - AegisName: "La'cryma_Stick" + AegisName: "Lacryma_Stick" Name: "La'cryma Stick" Type: 4 Buy: 20 @@ -19541,7 +19541,7 @@ item_db: ( }, { Id: 1970 - AegisName: "Queen's_Whip" + AegisName: "Queens_Whip" Name: "Queen's Whip" Type: 4 Buy: 20 @@ -19675,7 +19675,7 @@ item_db: ( }, { Id: 1976 - AegisName: "Queen's_Whip_" + AegisName: "Queens_Whip_" Name: "Queen's Whip" Type: 4 Buy: 20 @@ -20390,7 +20390,7 @@ item_db: ( }, { Id: 2115 - AegisName: "Valkyrja's_Shield" + AegisName: "Valkyrjas_Shield" Name: "Valkyrja's Shield" Type: 5 Buy: 30000 @@ -20414,7 +20414,7 @@ item_db: ( }, { Id: 2116 - AegisName: "Angel's_Safeguard" + AegisName: "Angels_Safeguard" Name: "Angelic Guard" Type: 5 Buy: 10000 @@ -20872,7 +20872,7 @@ item_db: ( }, { Id: 2137 - AegisName: "Valkyrja's_Shield_C" + AegisName: "Valkyrjas_Shield_C" Name: "Neo Valkyrja's Shield" Type: 5 Def: 5 @@ -21025,7 +21025,7 @@ item_db: ( }, { Id: 2205 - AegisName: "Diver's_Goggles" + AegisName: "Divers_Goggles" Name: "Diver Goggles" Type: 5 Buy: 3500 @@ -21521,7 +21521,7 @@ item_db: ( }, { Id: 2236 - AegisName: "Santa's_Hat" + AegisName: "Santas_Hat" Name: "Santa Hat" Type: 5 Buy: 20 @@ -21620,7 +21620,7 @@ item_db: ( }, { Id: 2244 - AegisName: "Big_Sis'_Ribbon" + AegisName: "Big_Sis_Ribbon" Name: "Big Ribbon" Type: 5 Buy: 15000 @@ -21668,7 +21668,7 @@ item_db: ( }, { Id: 2247 - AegisName: "Oldman's_Romance" + AegisName: "Oldmans_Romance" Name: "Romantic Gent" Type: 5 Buy: 15000 @@ -22540,7 +22540,7 @@ item_db: ( }, { Id: 2306 - AegisName: "Adventurere's_Suit_" + AegisName: "Adventureres_Suit_" Name: "Adventurer's Suit" Type: 5 Buy: 1000 @@ -23376,7 +23376,7 @@ item_db: ( }, { Id: 2353 - AegisName: "Odin's_Blessing" + AegisName: "Odins_Blessing" Name: "Odin's Blessing" Type: 5 Buy: 30000 @@ -23392,7 +23392,7 @@ item_db: ( }, { Id: 2354 - AegisName: "Goibne's_Armor" + AegisName: "Goibnes_Armor" Name: "Goibne's Armor" Type: 5 Buy: 50000 @@ -23411,7 +23411,7 @@ item_db: ( }, { Id: 2355 - AegisName: "Angel's_Protection" + AegisName: "Angels_Protection" Name: "Angelic Protection" Type: 5 Buy: 10000 @@ -24343,7 +24343,7 @@ item_db: ( }, { Id: 2393 - AegisName: "N_Adventurer's_Suit" + AegisName: "N_Adventurers_Suit" Name: "Novice Adventurer's Suit" Type: 5 Def: 8 @@ -24785,7 +24785,7 @@ item_db: ( }, { Id: 2418 - AegisName: "Vidar's_Boots" + AegisName: "Vidars_Boots" Name: "Vidar's Boots" Type: 5 Buy: 30000 @@ -24804,7 +24804,7 @@ item_db: ( }, { Id: 2419 - AegisName: "Goibne's_Combat_Boots" + AegisName: "Goibnes_Combat_Boots" Name: "Goibne's Greaves" Type: 5 Buy: 30000 @@ -24824,7 +24824,7 @@ item_db: ( }, { Id: 2420 - AegisName: "Angel's_Arrival" + AegisName: "Angels_Arrival" Name: "Angel's Reincarnation" Type: 5 Buy: 10000 @@ -25684,7 +25684,7 @@ item_db: ( }, { Id: 2511 - AegisName: "Skeleton's_Cape" + AegisName: "Skeletons_Cape" Name: "Skeleton Manteau" Type: 5 Buy: 5000 @@ -25799,7 +25799,7 @@ item_db: ( }, { Id: 2517 - AegisName: "Vali's_Manteau" + AegisName: "Valis_Manteau" Name: "Vali's Manteau" Type: 5 Buy: 30000 @@ -25815,7 +25815,7 @@ item_db: ( }, { Id: 2518 - AegisName: "Morpheus's_Shawl" + AegisName: "Morpheuss_Shawl" Name: "Morpheus's Shawl" Type: 5 Buy: 30000 @@ -25834,7 +25834,7 @@ item_db: ( }, { Id: 2519 - AegisName: "Morrigane's_Manteau" + AegisName: "Morriganes_Manteau" Name: "Morrigane's Manteau" Type: 5 Buy: 30000 @@ -25853,7 +25853,7 @@ item_db: ( }, { Id: 2520 - AegisName: "Goibne's_Shoulder_Arms" + AegisName: "Goibnes_Shoulder_Arms" Name: "Goibne's Spaulders" Type: 5 Buy: 30000 @@ -25873,7 +25873,7 @@ item_db: ( }, { Id: 2521 - AegisName: "Angel's_Warmth" + AegisName: "Angels_Warmth" Name: "Angelic Cardigan" Type: 5 Buy: 10000 @@ -26512,7 +26512,7 @@ item_db: ( }, { Id: 2550 - AegisName: "Fisher's_Muffler" + AegisName: "Fishers_Muffler" Name: "Fisher's Muffler" Type: 5 Buy: 20 @@ -26870,7 +26870,7 @@ item_db: ( }, { Id: 2618 - AegisName: "Matyr's_Flea_Guard" + AegisName: "Matyrs_Flea_Guard" Name: "Matyr's Leash" Type: 5 Buy: 2 @@ -27291,7 +27291,7 @@ item_db: ( }, { Id: 2642 - AegisName: "Serin's_Gold_Ring" + AegisName: "Serins_Gold_Ring" Name: "Serin's Gold Ring" Type: 5 Buy: 20 @@ -27310,7 +27310,7 @@ item_db: ( }, { Id: 2643 - AegisName: "Serin's_Gold_Ring_" + AegisName: "Serins_Gold_Ring_" Name: "Serin's Gold Ring" Type: 5 Buy: 45000 @@ -27394,7 +27394,7 @@ item_db: ( }, { Id: 2648 - AegisName: "Morpheus's_Ring" + AegisName: "Morpheuss_Ring" Name: "Morpheus's Ring" Type: 5 Buy: 30000 @@ -27413,7 +27413,7 @@ item_db: ( }, { Id: 2649 - AegisName: "Morpheus's_Armlet" + AegisName: "Morpheuss_Armlet" Name: "Morpheus's Bracelet" Type: 5 Buy: 30000 @@ -27432,7 +27432,7 @@ item_db: ( }, { Id: 2650 - AegisName: "Morrigane's_Belt" + AegisName: "Morriganes_Belt" Name: "Morrigane's Belt" Type: 5 Buy: 30000 @@ -27451,7 +27451,7 @@ item_db: ( }, { Id: 2651 - AegisName: "Morrigane's_Pendant" + AegisName: "Morriganes_Pendant" Name: "Morrigane's Pendant" Type: 5 Buy: 30000 @@ -27496,7 +27496,7 @@ item_db: ( }, { Id: 2654 - AegisName: "Shinobi's_Sash" + AegisName: "Shinobis_Sash" Name: "Shinobi Sash" Type: 5 Buy: 20000 @@ -27807,7 +27807,7 @@ item_db: ( }, { Id: 2668 - AegisName: "Women's_Glory" + AegisName: "Womens_Glory" Name: "Woman Glory" Type: 5 Weight: 500 @@ -30196,7 +30196,7 @@ item_db: ( }, { Id: 2781 - AegisName: "Aumdura's_Grace" + AegisName: "Aumduras_Grace" Name: "Aumdura's Benefit" Type: 5 Weight: 100 @@ -37557,7 +37557,7 @@ item_db: ( }, { Id: 5016 - AegisName: "Boy's_Cap" + AegisName: "Boys_Cap" Name: "Boy's Cap" Type: 5 Buy: 20 @@ -38032,7 +38032,7 @@ item_db: ( }, { Id: 5044 - AegisName: "Devil's_Wing" + AegisName: "Devils_Wing" Name: "Evil Wing Ears" Type: 5 Buy: 20 @@ -38375,7 +38375,7 @@ item_db: ( }, { Id: 5068 - AegisName: "Ear_Of_Devil's_Wing" + AegisName: "Ear_Of_Devils_Wing" Name: "Evil Wing Ears" Type: 5 Buy: 20 @@ -38476,7 +38476,7 @@ item_db: ( }, { Id: 5074 - AegisName: "Ear_Of_Angel's_Wing" + AegisName: "Ear_Of_Angels_Wing" Name: "Angel Wing Ears" Type: 5 Buy: 20 @@ -39240,7 +39240,7 @@ item_db: ( }, { Id: 5126 - AegisName: "Morpheus's_Hood" + AegisName: "Morpheuss_Hood" Name: "Morpheus's Hood" Type: 5 Buy: 30000 @@ -39257,7 +39257,7 @@ item_db: ( }, { Id: 5127 - AegisName: "Morrigane's_Helm" + AegisName: "Morriganes_Helm" Name: "Morrigane's Helm" Type: 5 Buy: 30000 @@ -39277,7 +39277,7 @@ item_db: ( }, { Id: 5128 - AegisName: "Goibne's_Helmet" + AegisName: "Goibnes_Helmet" Name: "Goibne's Helm" Type: 5 Buy: 30000 @@ -39437,7 +39437,7 @@ item_db: ( }, { Id: 5136 - AegisName: "Santa's_Hat_" + AegisName: "Santas_Hat_" Name: "Antonio's Santa Hat" Type: 5 Buy: 20 @@ -42636,7 +42636,7 @@ item_db: ( }, { Id: 5307 - AegisName: "Carmen_Miranda's_Hat" + AegisName: "Carmen_Mirandas_Hat" Name: "Carmen Miranda's Hat" Type: 5 Buy: 20 @@ -43379,7 +43379,7 @@ item_db: ( }, { Id: 5348 - AegisName: "Big_Sis'_Ribbon_" + AegisName: "Big_Sis_Ribbon_" Name: "Big Ribbon" Type: 5 Buy: 15000 @@ -43396,7 +43396,7 @@ item_db: ( }, { Id: 5349 - AegisName: "Boy's_Cap_" + AegisName: "Boys_Cap_" Name: "Boy's Cap" Type: 5 Buy: 20 @@ -44803,7 +44803,7 @@ item_db: ( }, { Id: 5421 - AegisName: "Ifrit's_Ear" + AegisName: "Ifrits_Ear" Name: "Ears Of Ifrit" Type: 5 Buy: 20 @@ -45056,7 +45056,7 @@ item_db: ( }, { Id: 5436 - AegisName: "Bride's_Corolla" + AegisName: "Brides_Corolla" Name: "Bride's Corolla" Type: 5 Buy: 20 @@ -45857,7 +45857,7 @@ item_db: ( }, { Id: 5479 - AegisName: "Shaman's_Hair_Ornament" + AegisName: "Shamans_Hair_Ornament" Name: "Shaman's Hair Decoration" Type: 5 Buy: 20 @@ -46072,7 +46072,7 @@ item_db: ( }, { Id: 5492 - AegisName: "Boy's_Cap_I" + AegisName: "Boys_Cap_I" Name: "Student Cap" Type: 5 Def: 5 @@ -46287,7 +46287,7 @@ item_db: ( }, { Id: 5501 - AegisName: "Pirate's_Pride" + AegisName: "Pirates_Pride" Name: "Pirate's Pride" Type: 5 Weight: 100 @@ -46310,7 +46310,7 @@ item_db: ( }, { Id: 5502 - AegisName: "Necromencer's_Hood" + AegisName: "Necromencers_Hood" Name: "Necromancer's Hood" Type: 5 Weight: 500 @@ -46822,7 +46822,7 @@ item_db: ( }, { Id: 5529 - AegisName: "Evil's_Bone_Hat" + AegisName: "Evils_Bone_Hat" Name: "Satanic Bone Helm" Type: 5 Buy: 20 @@ -47766,7 +47766,7 @@ item_db: ( }, { Id: 5579 - AegisName: "Wanderer's_Sakkat" + AegisName: "Wanderers_Sakkat" Name: "Wanderer's Sakkat" Type: 5 Buy: 20 @@ -48018,7 +48018,7 @@ item_db: ( */ { Id: 5592 - AegisName: "Sigrun's_Wing" + AegisName: "Sigruns_Wing" Name: "Sigrun's Wings" Type: 5 Buy: 20 @@ -53112,7 +53112,7 @@ item_db: ( }, { Id: 6070 - AegisName: "Shaman's_Old_Paper" + AegisName: "Shamans_Old_Paper" Name: "Shaman's Document" Type: 3 Weight: 10 @@ -53160,7 +53160,7 @@ item_db: ( }, { Id: 6073 - AegisName: "Dragon's_Mane" + AegisName: "Dragons_Mane" Name: "Dragon's Mane" Type: 3 BuyingStore: true @@ -53176,7 +53176,7 @@ item_db: ( }, { Id: 6074 - AegisName: "Bazett's_Order" + AegisName: "Bazetts_Order" Name: "Bazett's Order" Type: 3 Trade: { @@ -53758,7 +53758,7 @@ item_db: ( }, { Id: 6124 - AegisName: "Wolf's_Flute" + AegisName: "Wolfs_Flute" Name: "Wolf Flute" Type: 3 Buy: 10 @@ -56612,7 +56612,7 @@ item_db: ( }, { Id: 7017 - AegisName: "Executioner's_Mitten" + AegisName: "Executioners_Mitten" Name: "Executioner's Mitten" Type: 3 Buy: 4500 @@ -56630,7 +56630,7 @@ item_db: ( }, { Id: 7019 - AegisName: "Loki's_Whispers" + AegisName: "Lokis_Whispers" Name: "Loki's Whispers" Type: 3 Buy: 20 @@ -56639,7 +56639,7 @@ item_db: ( }, { Id: 7020 - AegisName: "Mother's_Nightmare" + AegisName: "Mothers_Nightmare" Name: "Mother's Nightmare" Type: 3 Buy: 20 @@ -56684,7 +56684,7 @@ item_db: ( }, { Id: 7025 - AegisName: "Lucifer's_Lament" + AegisName: "Lucifers_Lament" Name: "Lucifer's Lament" Type: 3 Buy: 30000 @@ -56876,7 +56876,7 @@ item_db: ( }, { Id: 7047 - AegisName: "Alice's_Apron" + AegisName: "Alices_Apron" Name: "Alice's Apron" Type: 3 Buy: 2424 @@ -57396,7 +57396,7 @@ item_db: ( }, { Id: 7106 - AegisName: "Goat's_Horn" + AegisName: "Goats_Horn" Name: "Antelope Horn" Type: 3 Buy: 672 @@ -57405,7 +57405,7 @@ item_db: ( }, { Id: 7107 - AegisName: "Gaoat's_Skin" + AegisName: "Gaoats_Skin" Name: "Antelope Skin" Type: 3 Buy: 756 @@ -57468,7 +57468,7 @@ item_db: ( }, { Id: 7114 - AegisName: "Tutankhamen's_Mask" + AegisName: "Tutankhamens_Mask" Name: "Masque of Tutankhamen" Type: 3 Buy: 10 @@ -57477,7 +57477,7 @@ item_db: ( }, { Id: 7115 - AegisName: "Harpy's_Feather" + AegisName: "Harpys_Feather" Name: "Harpy Feather" Type: 3 Buy: 1142 @@ -57486,7 +57486,7 @@ item_db: ( }, { Id: 7116 - AegisName: "Harpy's_Claw" + AegisName: "Harpys_Claw" Name: "Harpy Talon" Type: 3 Buy: 1210 @@ -57549,7 +57549,7 @@ item_db: ( }, { Id: 7123 - AegisName: "Dragon's_Skin" + AegisName: "Dragons_Skin" Name: "Dragon Skin" Type: 3 Buy: 1025 @@ -57567,7 +57567,7 @@ item_db: ( }, { Id: 7125 - AegisName: "Scropion's_Nipper" + AegisName: "Scropions_Nipper" Name: "Scorpion Claw" Type: 3 Buy: 706 @@ -57828,7 +57828,7 @@ item_db: ( }, { Id: 7155 - AegisName: "Poison_Toad's_Skin" + AegisName: "Poison_Toads_Skin" Name: "Poisonous Toad Skin" Type: 3 Buy: 280 @@ -57864,7 +57864,7 @@ item_db: ( }, { Id: 7159 - AegisName: "Tengu's_Nose" + AegisName: "Tengus_Nose" Name: "Tengu Nose" Type: 3 Buy: 400 @@ -57873,7 +57873,7 @@ item_db: ( }, { Id: 7160 - AegisName: "Lord's_Passable_Ticket" + AegisName: "Lords_Passable_Ticket" Name: "Feudal Lord Permit" Type: 3 Buy: 1 @@ -57882,7 +57882,7 @@ item_db: ( }, { Id: 7161 - AegisName: "Black_Bear's_Skin" + AegisName: "Black_Bears_Skin" Name: "Black Bear Skin" Type: 3 Buy: 384 @@ -58020,7 +58020,7 @@ item_db: ( }, { Id: 7177 - AegisName: "Part_Of_Star's_Sob" + AegisName: "Part_Of_Stars_Sob" Name: "Crumb of Sobbing Starlight" Type: 3 Trade: { @@ -58036,7 +58036,7 @@ item_db: ( }, { Id: 7178 - AegisName: "Star's_Sob" + AegisName: "Stars_Sob" Name: "Sobbing Starlight" Type: 3 Trade: { @@ -58308,7 +58308,7 @@ item_db: ( }, { Id: 7209 - AegisName: "Dullahan's_Helm" + AegisName: "Dullahans_Helm" Name: "Helm of Dullahan" Type: 3 Buy: 1350 @@ -59089,7 +59089,7 @@ item_db: ( }, { Id: 7304 - AegisName: "Witch's_Spell_Book" + AegisName: "Witchs_Spell_Book" Name: "Witch's Spell Scroll" Type: 3 Trade: { @@ -59153,7 +59153,7 @@ item_db: ( }, { Id: 7308 - AegisName: "Witch's_Potion" + AegisName: "Witchs_Potion" Name: "Witch's Tonic" Type: 3 Trade: { @@ -59624,7 +59624,7 @@ item_db: ( }, { Id: 7351 - AegisName: "Friend's_Diary" + AegisName: "Friends_Diary" Name: "Friend's Diary" Type: 3 Buy: 20 @@ -60597,7 +60597,7 @@ item_db: ( }, { Id: 7458 - AegisName: "Baphomet's_Horn" + AegisName: "Baphomets_Horn" Name: "Fortune Horn" Type: 3 Buy: 2 @@ -61295,7 +61295,7 @@ item_db: ( }, { Id: 7518 - AegisName: "Women's_Medal" + AegisName: "Womens_Medal" Name: "Women's Medal" Type: 3 Weight: 10 @@ -62221,7 +62221,7 @@ item_db: ( }, { Id: 7594 - AegisName: "Sonia's_Letter" + AegisName: "Sonias_Letter" Name: "Sonia's Letter" Type: 3 Buy: 20 @@ -64745,7 +64745,7 @@ item_db: ( }, { Id: 7920 - AegisName: "Hero's_Arsenal" + AegisName: "Heros_Arsenal" Name: "He's Arsenal" Type: 3 }, @@ -64818,7 +64818,7 @@ item_db: ( }, { Id: 7930 - AegisName: "Cowking's_Nose_Ring" + AegisName: "Cowkings_Nose_Ring" Name: "Devil's Cattle Ring" Type: 3 Weight: 1000 @@ -66161,7 +66161,7 @@ item_db: ( }, { Id: 10006 - AegisName: "Queen's_Hair_Ornament" + AegisName: "Queens_Hair_Ornament" Name: "Queen's Hair Ornament" Type: 8 Buy: 20 @@ -66343,7 +66343,7 @@ item_db: ( }, { Id: 10032 - AegisName: "Queen's_Coronet" + AegisName: "Queens_Coronet" Name: "Queen's Coronet" Type: 8 Buy: 20 @@ -68898,7 +68898,7 @@ item_db: ( }, { Id: 12136 - AegisName: "Women's_Bundle" + AegisName: "Womens_Bundle" Name: "Women's Bundle" Type: 2 Weight: 100 @@ -71839,7 +71839,7 @@ item_db: ( }, { Id: 12342 - AegisName: "Manuk's_Opportunity" + AegisName: "Manuks_Opportunity" Name: "Manuk's Opportunity" Type: 2 Weight: 50 @@ -71860,7 +71860,7 @@ item_db: ( }, { Id: 12343 - AegisName: "Manuk's_Courage" + AegisName: "Manuks_Courage" Name: "Manuk's Courage" Type: 2 Weight: 50 @@ -71881,7 +71881,7 @@ item_db: ( }, { Id: 12344 - AegisName: "Pinguicula's_fruit_Jam" + AegisName: "Pinguiculas_fruit_Jam" Name: "Pinguicula's Fruit Jam" Type: 2 Weight: 50 @@ -71902,7 +71902,7 @@ item_db: ( }, { Id: 12345 - AegisName: "Luciola's_Honey_Jam" + AegisName: "Luciolas_Honey_Jam" Name: "Luciola's Honey Jam" Type: 2 Weight: 50 @@ -71952,7 +71952,7 @@ item_db: ( }, { Id: 12348 - AegisName: "Manuk's_Faith" + AegisName: "Manuks_Faith" Name: "Manuk's Faith" Type: 2 Weight: 50 @@ -71973,7 +71973,7 @@ item_db: ( }, { Id: 12349 - AegisName: "Cornus'_Tears" + AegisName: "Cornus_Tears" Name: "Cornus' Tears" Type: 2 Weight: 50 @@ -72265,7 +72265,7 @@ item_db: ( }, { Id: 12370 - AegisName: "Gril's_Naivety" + AegisName: "Grils_Naivety" Name: "Girl's Naivety" Type: 2 Trade: { @@ -72311,7 +72311,7 @@ item_db: ( }, { Id: 12373 - AegisName: "Boy's_Naivety" + AegisName: "Boys_Naivety" Name: "Boy's Pure Heart" Type: 2 Buy: 20 @@ -72396,7 +72396,7 @@ item_db: ( }, { Id: 12379 - AegisName: "Pope's_Cookie" + AegisName: "Popes_Cookie" Name: "Pope Cookie" Type: 2 Buy: 10 @@ -81524,7 +81524,7 @@ item_db: ( }, { Id: 13420 - AegisName: "Honglyun's_Sword" + AegisName: "Honglyuns_Sword" Name: "Honglyun's Sword" Type: 4 Buy: 20 @@ -92651,7 +92651,7 @@ item_db: ( /* { Id: 14285 - AegisName: "Valkyrja's_Shield_C_Box" + AegisName: "Valkyrjas_Shield_C_Box" Name: "Balkiriah Shield Box" Type: 18 Buy: 20 @@ -92826,7 +92826,7 @@ item_db: ( }, { Id: 14301 - AegisName: "Ifrit's_Ear_Box" + AegisName: "Ifrits_Ear_Box" Name: "Ears Of Ifrit Box" Type: 18 Buy: 20 @@ -92998,7 +92998,7 @@ item_db: ( }, { Id: 14351 - AegisName: "Tyr's_Blessing20_Box" + AegisName: "Tyrs_Blessing20_Box" Name: "Tyr's Blessing 20 Box" Type: 18 Buy: 20 @@ -93008,11 +93008,11 @@ item_db: ( noselltonpc: true nogstorage: true } - Script: <" getitem Tyr's_Blessing,20; "> + Script: <" getitem Tyrs_Blessing,20; "> }, { Id: 14352 - AegisName: "Tyr's_Blessing50_Box" + AegisName: "Tyrs_Blessing50_Box" Name: "Tyr's Blessing 50 Box" Type: 18 Buy: 20 @@ -93022,7 +93022,7 @@ item_db: ( noselltonpc: true nogstorage: true } - Script: <" getitem Tyr's_Blessing,50; "> + Script: <" getitem Tyrs_Blessing,50; "> }, { Id: 14359 @@ -93234,7 +93234,7 @@ item_db: ( }, { Id: 14447 - AegisName: "Pirate's_Pride_Box" + AegisName: "Pirates_Pride_Box" Name: "Pirate's Pride Box" Type: 18 Buy: 20 @@ -93250,7 +93250,7 @@ item_db: ( }, { Id: 14448 - AegisName: "Necromencer's_Hood_Box" + AegisName: "Necromencers_Hood_Box" Name: "Necromancer's Hood Box" Type: 18 Buy: 20 @@ -94620,7 +94620,7 @@ item_db: ( }, { Id: 14601 - AegisName: "Tyr's_Blessing" + AegisName: "Tyrs_Blessing" Name: "Tyr's Blessing" Type: 2 Weight: 10 @@ -94812,7 +94812,7 @@ item_db: ( }, { Id: 15001 - AegisName: "Odin's_Blessing_I" + AegisName: "Odins_Blessing_I" Name: "Odin's Blessing" Type: 5 Def: 10 @@ -95018,7 +95018,7 @@ item_db: ( }, { Id: 16135 - AegisName: "Evil's_Bone_Hat_Box" + AegisName: "Evils_Bone_Hat_Box" Name: "Satanic Bone Helm Box" Type: 18 Buy: 20 @@ -95111,7 +95111,7 @@ item_db: ( */ /* Id: 16250 - AegisName: "Valkyrie's_Gift_Bo" + AegisName: "Valkyries_Gift_Bo" }, */ /* diff --git a/db/pre-re/item_group.conf b/db/pre-re/item_group.conf index 0f41879ef..d2d9c61d8 100644 --- a/db/pre-re/item_group.conf +++ b/db/pre-re/item_group.conf @@ -412,7 +412,7 @@ Gift_Box: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - ("Girl's_Diary",2), + ("Girls_Diary",2), "Emperium", "Steel", "Old_Blue_Box", @@ -490,7 +490,7 @@ Gift_Box_1: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Gift_Box_2: ( "Star_Crumb", @@ -561,7 +561,7 @@ Gift_Box_2: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - ("Girl's_Diary",2), + ("Girls_Diary",2), "Emperium", "Steel", "Old_Blue_Box", @@ -639,7 +639,7 @@ Gift_Box_3: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Gift_Box_4: ( "Star_Crumb", @@ -710,7 +710,7 @@ Gift_Box_4: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Old_Blue_Box: ( ("Guard_",3), @@ -727,7 +727,7 @@ Old_Blue_Box: ( ("Leather_Jacket",3), ("Leather_Jacket_",3), ("Adventure_Suit",3), - ("Adventurere's_Suit_",3), + ("Adventureres_Suit_",3), ("Mantle",3), ("Mantle_",3), ("Coat",3), @@ -793,7 +793,7 @@ Old_Blue_Box: ( ("Flower_Ring",3), ("Diamond_Ring",3), ("Mitten_Of_Presbyter",3), - ("Matyr's_Flea_Guard",3), + ("Matyrs_Flea_Guard",3), ("Belt",3), ("Novice_Armlet",3), ("Katana",3), @@ -919,7 +919,7 @@ Old_Blue_Box: ( ("Book_Of_Mother_Earth",3), ("Book_Of_Blazing_Sun",3), ("Book_Of_Gust_Of_Wind",3), - ("Girl's_Diary",3), + ("Girls_Diary",3), ("Rod",3), ("Rod_",3), ("Wand",3), @@ -969,7 +969,7 @@ Old_Blue_Box: ( ("Whip_",3), ("Sunglasses",3), ("Glasses",3), - ("Diver's_Goggles",3), + ("Divers_Goggles",3), ("Wedding_Veil",3), ("Fancy_Flower",3), ("Ribbon",3), @@ -995,15 +995,15 @@ Old_Blue_Box: ( ("Gemmed_Sallet_",3), ("Circlet",3), ("Circlet_",3), - ("Santa's_Hat",3), + ("Santas_Hat",3), ("One_Eyed_Glass",3), ("Granpa_Beard",3), ("Luxury_Sunglasses",3), ("Spinning_Eyes",3), - ("Big_Sis'_Ribbon",3), + ("Big_Sis_Ribbon",3), ("Sweet_Gents",3), ("Golden_Gear",3), - ("Oldman's_Romance",3), + ("Oldmans_Romance",3), ("Western_Grace",3), ("Fillet",3), ("Holy_Bonnet",3), @@ -1061,7 +1061,7 @@ Old_Blue_Box: ( ("Transparent_Headgear",3), ("Pacifier",3), ("Wig",3), - ("Queen's_Hair_Ornament",3), + ("Queens_Hair_Ornament",3), ("Silk_Ribbon",3), ("Punisher",3), ("Wild_Flower",3), @@ -1131,7 +1131,7 @@ Old_Blue_Box: ( ("Danggie",12), ("Tree_Root",12), ("Reptile_Tongue",12), - ("Scorpion's_Tail",12), + ("Scorpions_Tail",12), ("Stem",12), ("Pointed_Scale",12), ("Resin",12), @@ -1146,7 +1146,7 @@ Old_Blue_Box: ( ("Feather_Of_Birds",12), ("Talon",12), ("Sticky_Webfoot",12), - ("Animal's_Skin",12), + ("Animals_Skin",12), ("Claw_Of_Wolves",12), ("Mushroom_Spore",12), ("Orcish_Cuspid",12), @@ -1165,15 +1165,15 @@ Old_Blue_Box: ( ("Posionous_Canine",12), ("Sticky_Mucus",12), ("Bee_Sting",12), - ("Grasshopper's_Leg",12), + ("Grasshoppers_Leg",12), ("Nose_Ring",12), ("Yoyo_Tail",12), ("Solid_Shell",12), ("Horseshoe",12), ("Raccoon_Leaf",12), - ("Snail's_Shell",12), + ("Snails_Shell",12), ("Horn",12), - ("Bear's_Foot",12), + ("Bears_Foot",12), ("Feather",12), ("Heart_Of_Mermaid",12), ("Fin",12), @@ -1236,7 +1236,7 @@ Old_Blue_Box: ( ("Lizard_Scruff",12), ("Colorful_Shell",12), ("Jaws_Of_Ant",12), - ("Thin_N'_Long_Tongue",12), + ("Thin_N_Long_Tongue",12), ("Rat_Tail",12), ("Moustache_Of_Mole",12), ("Nail_Of_Mole",12), @@ -1249,8 +1249,8 @@ Old_Blue_Box: ( ("Spiderweb",12), ("Acorn",12), ("Porcupine_Spike",12), - ("Wild_Boar's_Mane",12), - ("Tiger's_Skin",12), + ("Wild_Boars_Mane",12), + ("Tigers_Skin",12), ("Limb_Of_Mantis",12), ("Blossom_Of_Maneater",12), ("Root_Of_Maneater",12), @@ -1260,7 +1260,7 @@ Old_Blue_Box: ( ("Dragon_Train",12), ("Petite_DiablOfs_Horn",12), ("Petite_DiablOfs_Wing",12), - ("Elder_Pixie's_Beard",12), + ("Elder_Pixies_Beard",12), ("Lantern",12), ("Short_Leg",12), ("Nail_Of_Orc",12), @@ -1326,7 +1326,7 @@ Old_Blue_Box: ( ("Fang_Of_Garm",12), ("Yarn",12), ("Fine_Grit",12), - ("Alice's_Apron",12), + ("Alices_Apron",12), ("Talon_Of_Griffin",12), ("Stone",12), ("Cyfar",12), @@ -1353,26 +1353,26 @@ Old_Blue_Box: ( ("Old_Magic_Circle",12), ("Sharp_Leaf",12), ("Peco_Wing_Feather",12), - ("Goat's_Horn",12), - ("Gaoat's_Skin",12), + ("Goats_Horn",12), + ("Gaoats_Skin",12), ("Boroken_Shiled_Piece",12), ("Shine_Spear_Blade",12), ("Vroken_Sword",12), ("Smooth_Paper",12), ("Fright_Paper_Blade",12), ("Broken_Pharaoh_Symbol",12), - ("Tutankhamen's_Mask",12), - ("Harpy's_Feather",12), - ("Harpy's_Claw",12), + ("Tutankhamens_Mask",12), + ("Harpys_Feather",12), + ("Harpys_Claw",12), ("Rent_Spell_Book",12), ("Rent_Scroll",12), ("Spawns",12), ("Burning_Horse_Shoe",12), ("Honey_Jar",12), ("Hot_Hair",12), - ("Dragon's_Skin",12), + ("Dragons_Skin",12), ("Sand_Lump",12), - ("Scropion's_Nipper",12), + ("Scropions_Nipper",12), ("Large_Jellopy",12), ("Medicine_Bowl",12), ("Fire_Bottle",12), @@ -1386,12 +1386,12 @@ Old_Blue_Box: ( ("Glossy_Hair",12), ("Old_Japaness_Clothes",12), ("Poison_Powder",12), - ("Poison_Toad's_Skin",12), + ("Poison_Toads_Skin",12), ("Broken_Shuriken",12), ("Black_Mask",12), ("Broken_Wine_Vessel",12), - ("Tengu's_Nose",12), - ("Black_Bear's_Skin",12), + ("Tengus_Nose",12), + ("Black_Bears_Skin",12), ("Cloud_Piece",12), ("Sharp_Feeler",12), ("Hard_Peach",12), @@ -1426,7 +1426,7 @@ Old_Blue_Box: ( ("Black_Kitty_Doll",12), ("Old_Manteau",12), ("Rusty_Cleaver",12), - ("Dullahan's_Helm",12), + ("Dullahans_Helm",12), ("Dullahan_Armor",12), ("Rojerta_Piece",12), ("Hanging_Doll",12), @@ -1496,7 +1496,7 @@ Old_Blue_Box: ( ("Holy_Water",12), ("Panacea",12), ("Royal_Jelly",12), - ("Monster's_Feed",12), + ("Monsters_Feed",12), ("Candy",12), ("Candy_Striper",12), ("Apple_Juice",12), @@ -1590,7 +1590,7 @@ Old_Blue_Box: ( "Cinquedea", "Kindling_Dagger", "Obsidian_Dagger", - "Fisherman's_Dagger", + "Fishermans_Dagger", "Jujube_Dagger", "Dragon_Killer", "Ginnungagap", @@ -1602,8 +1602,8 @@ Old_Blue_Box: ( "Nail_Of_Loki", "Bloody_Roar", "Unholy_Touch", - "Hypnotist's_Staff", - "Hypnotist's_Staff_", + "Hypnotists_Staff", + "Hypnotists_Staff_", "Staff_Of_Wing", "Luna_Bow", "Dragon_Wing", @@ -1622,7 +1622,7 @@ Old_Blue_Box: ( "Coward", "Coward_", "Windhawk", - "Queen's_Whip", + "Queens_Whip", "Oriental_Lute", "Diary_Of_Great_Sage", "Hardback", @@ -1645,7 +1645,7 @@ Old_Blue_Box: ( "Banana_Hat", "Wing_Of_Eagle", "Cursed_Lucky_Brooch", - "Shinobi's_Sash", + "Shinobis_Sash", "Hyper_Changer", "Dark_Crystal_Fragment", "Long_Limb", @@ -1699,7 +1699,7 @@ Old_Blue_Box: ( "Thorny_Buckler", "Orleans_Gown", "Strong_Shield", - "Angel's_Arrival", + "Angels_Arrival", "Magni_Cap", "Censor_Bar", "Inverse_Scale", @@ -1744,7 +1744,7 @@ Old_Violet_Box: ( ("Novice_Guard",7), ("Cotton_Shirt_",7), ("Leather_Jacket_",7), - ("Adventurere's_Suit_",7), + ("Adventureres_Suit_",7), ("Mantle_",7), ("Coat_",7), ("Mink_Coat",7), @@ -1791,7 +1791,7 @@ Old_Violet_Box: ( ("Flower_Ring",7), ("Diamond_Ring",7), ("Mitten_Of_Presbyter",7), - ("Matyr's_Flea_Guard",7), + ("Matyrs_Flea_Guard",7), ("Belt",7), ("Novice_Armlet",7), ("Katana_",7), @@ -1865,7 +1865,7 @@ Old_Violet_Box: ( ("Book_Of_Mother_Earth",7), ("Book_Of_Blazing_Sun",7), ("Book_Of_Gust_Of_Wind",7), - ("Girl's_Diary",7), + ("Girls_Diary",7), ("Rod_",7), ("Wand_",7), ("Staff_",7), @@ -1893,7 +1893,7 @@ Old_Violet_Box: ( ("Whip_",7), ("Sunglasses",7), ("Glasses",7), - ("Diver's_Goggles",7), + ("Divers_Goggles",7), ("Wedding_Veil",7), ("Fancy_Flower",7), ("Ribbon",7), @@ -1919,15 +1919,15 @@ Old_Violet_Box: ( ("Gemmed_Sallet_",7), ("Circlet",7), ("Circlet_",7), - ("Santa's_Hat",7), + ("Santas_Hat",7), ("One_Eyed_Glass",7), ("Granpa_Beard",7), ("Luxury_Sunglasses",7), ("Spinning_Eyes",7), - ("Big_Sis'_Ribbon",7), + ("Big_Sis_Ribbon",7), ("Sweet_Gents",7), ("Golden_Gear",7), - ("Oldman's_Romance",7), + ("Oldmans_Romance",7), ("Western_Grace",7), ("Fillet",7), ("Holy_Bonnet",7), @@ -1985,7 +1985,7 @@ Old_Violet_Box: ( ("Transparent_Headgear",7), ("Pacifier",7), ("Wig",7), - ("Queen's_Hair_Ornament",7), + ("Queens_Hair_Ornament",7), ("Silk_Ribbon",7), ("Punisher",7), ("Wild_Flower",7), @@ -2055,7 +2055,7 @@ Old_Violet_Box: ( ("Danggie",14), ("Tree_Root",14), ("Reptile_Tongue",14), - ("Scorpion's_Tail",14), + ("Scorpions_Tail",14), ("Stem",14), ("Pointed_Scale",14), ("Resin",14), @@ -2070,7 +2070,7 @@ Old_Violet_Box: ( ("Feather_Of_Birds",14), ("Talon",14), ("Sticky_Webfoot",14), - ("Animal's_Skin",14), + ("Animals_Skin",14), ("Claw_Of_Wolves",14), ("Mushroom_Spore",14), ("Orcish_Cuspid",14), @@ -2089,15 +2089,15 @@ Old_Violet_Box: ( ("Posionous_Canine",14), ("Sticky_Mucus",14), ("Bee_Sting",14), - ("Grasshopper's_Leg",14), + ("Grasshoppers_Leg",14), ("Nose_Ring",14), ("Yoyo_Tail",14), ("Solid_Shell",14), ("Horseshoe",14), ("Raccoon_Leaf",14), - ("Snail's_Shell",14), + ("Snails_Shell",14), ("Horn",14), - ("Bear's_Foot",14), + ("Bears_Foot",14), ("Feather",14), ("Heart_Of_Mermaid",14), ("Fin",14), @@ -2160,7 +2160,7 @@ Old_Violet_Box: ( ("Lizard_Scruff",14), ("Colorful_Shell",14), ("Jaws_Of_Ant",14), - ("Thin_N'_Long_Tongue",14), + ("Thin_N_Long_Tongue",14), ("Rat_Tail",14), ("Moustache_Of_Mole",14), ("Nail_Of_Mole",14), @@ -2173,8 +2173,8 @@ Old_Violet_Box: ( ("Spiderweb",14), ("Acorn",14), ("Porcupine_Spike",14), - ("Wild_Boar's_Mane",14), - ("Tiger's_Skin",14), + ("Wild_Boars_Mane",14), + ("Tigers_Skin",14), ("Limb_Of_Mantis",14), ("Blossom_Of_Maneater",14), ("Root_Of_Maneater",14), @@ -2184,7 +2184,7 @@ Old_Violet_Box: ( ("Dragon_Train",14), ("Petite_DiablOfs_Horn",14), ("Petite_DiablOfs_Wing",14), - ("Elder_Pixie's_Beard",14), + ("Elder_Pixies_Beard",14), ("Lantern",14), ("Short_Leg",14), ("Nail_Of_Orc",14), @@ -2250,7 +2250,7 @@ Old_Violet_Box: ( ("Fang_Of_Garm",14), ("Yarn",14), ("Fine_Grit",14), - ("Alice's_Apron",14), + ("Alices_Apron",14), ("Talon_Of_Griffin",14), ("Stone",14), ("Cyfar",14), @@ -2277,26 +2277,26 @@ Old_Violet_Box: ( ("Old_Magic_Circle",14), ("Sharp_Leaf",14), ("Peco_Wing_Feather",14), - ("Goat's_Horn",14), - ("Gaoat's_Skin",14), + ("Goats_Horn",14), + ("Gaoats_Skin",14), ("Boroken_Shiled_Piece",14), ("Shine_Spear_Blade",14), ("Vroken_Sword",14), ("Smooth_Paper",14), ("Fright_Paper_Blade",14), ("Broken_Pharaoh_Symbol",14), - ("Tutankhamen's_Mask",14), - ("Harpy's_Feather",14), - ("Harpy's_Claw",14), + ("Tutankhamens_Mask",14), + ("Harpys_Feather",14), + ("Harpys_Claw",14), ("Rent_Spell_Book",14), ("Rent_Scroll",14), ("Spawns",14), ("Burning_Horse_Shoe",14), ("Honey_Jar",14), ("Hot_Hair",14), - ("Dragon's_Skin",14), + ("Dragons_Skin",14), ("Sand_Lump",14), - ("Scropion's_Nipper",14), + ("Scropions_Nipper",14), ("Large_Jellopy",14), ("Medicine_Bowl",14), ("Fire_Bottle",14), @@ -2310,12 +2310,12 @@ Old_Violet_Box: ( ("Glossy_Hair",14), ("Old_Japaness_Clothes",14), ("Poison_Powder",14), - ("Poison_Toad's_Skin",14), + ("Poison_Toads_Skin",14), ("Broken_Shuriken",14), ("Black_Mask",14), ("Broken_Wine_Vessel",14), - ("Tengu's_Nose",14), - ("Black_Bear's_Skin",14), + ("Tengus_Nose",14), + ("Black_Bears_Skin",14), ("Cloud_Piece",14), ("Sharp_Feeler",14), ("Hard_Peach",14), @@ -2350,7 +2350,7 @@ Old_Violet_Box: ( ("Black_Kitty_Doll",14), ("Old_Manteau",14), ("Rusty_Cleaver",14), - ("Dullahan's_Helm",14), + ("Dullahans_Helm",14), ("Dullahan_Armor",14), ("Rojerta_Piece",14), ("Hanging_Doll",14), @@ -2420,7 +2420,7 @@ Old_Violet_Box: ( ("Holy_Water",14), ("Panacea",14), ("Royal_Jelly",14), - ("Monster's_Feed",14), + ("Monsters_Feed",14), ("Candy",14), ("Candy_Striper",14), ("Apple_Juice",14), @@ -2532,7 +2532,7 @@ Old_Violet_Box: ( "Nail_Of_Loki", "Bloody_Roar", "Unholy_Touch", - "Hypnotist's_Staff_", + "Hypnotists_Staff_", "Staff_Of_Wing", "Luna_Bow", "Dragon_Wing", @@ -2550,7 +2550,7 @@ Old_Violet_Box: ( "Legacy_Of_Dragon", "Coward_", "Windhawk", - "Queen's_Whip", + "Queens_Whip", "Oriental_Lute", "Diary_Of_Great_Sage", "Hardback", @@ -2566,7 +2566,7 @@ Old_Violet_Box: ( "Banana_Hat", "Wing_Of_Eagle", "Cursed_Lucky_Brooch", - "Shinobi's_Sash", + "Shinobis_Sash", "Bloody_Iron_Ball", "Hyper_Changer", "Cookbook06", @@ -2707,7 +2707,7 @@ Set_Of_Taiming_Item: ( "Transparent_Headgear", "Pacifier", "Wig", - "Queen's_Hair_Ornament", + "Queens_Hair_Ornament", "Silk_Ribbon", "Punisher", "Wild_Flower", @@ -2737,7 +2737,7 @@ Accessory_Box: ( ("Thimble_Of_Archer",10), ("Rosary",14), ("Ring",10), - ("Matyr's_Flea_Guard",11), + ("Matyrs_Flea_Guard",11), ("Belt",10), ("Brooch",12), ("Nile_Rose_",10), @@ -2760,7 +2760,7 @@ Accessory_Box: ( ("Red_Silk_Seal",2), "Orleans_Glove", "Spiritual_Ring", - "Shinobi's_Sash", + "Shinobis_Sash", "Hyper_Changer", ("Lesser_Elemental_Ring",9), "Expert_Ring", @@ -3100,8 +3100,8 @@ Giftbox_China: ( "Helm_", "Gemmed_Sallet_", "Circlet_", - "Santa's_Hat", - "Big_Sis'_Ribbon", + "Santas_Hat", + "Big_Sis_Ribbon", "Coronet", "Fillet", "Snowy_Horn", @@ -3130,7 +3130,7 @@ Giftbox_China: ( "Viking_Helm", "Cotton_Shirt_", "Leather_Jacket_", - "Adventurere's_Suit_", + "Adventureres_Suit_", "Mantle_", "Coat_", "Mink_Coat", @@ -3328,7 +3328,7 @@ Xmas_Gift: ( ("HandMade_Chocolate",18), ("HandMade_Chocolate_",18), ("Chocolate_Drink",18), - ("Santa's_Hat_",12), + ("Santas_Hat_",12), ("Fire_Cracker_Xmas",4), ) Pierre_Treasurebox: ( @@ -3903,7 +3903,7 @@ Mysterious_Egg: ( High_Weapon_Box: ( ("Mail_Breaker",5), ("Weeder_Knife",5), - ("Mama's_Knife",5), + ("Mamas_Knife",5), ("Assasin_Dagger",5), ("Exercise",5), ("Azoth",5), @@ -3959,7 +3959,7 @@ High_Weapon_Box: ( ("Crescent_Scythe",5), ("Bill_Guisarme",5), ("Zephyrus",5), - ("Longinus's_Spear",5), + ("Longinuss_Spear",5), ("Brionac",5), ("Hell_Fire",5), ("Gae_Bolg",5), @@ -3986,7 +3986,7 @@ High_Weapon_Box: ( ("Red_Square_Bag",5), //unknown/unsupported - ("16010",5), ("Book_Of_The_Apocalypse",5), - ("Girl's_Diary",5), + ("Girls_Diary",5), ("Legacy_Of_Dragon",5), ("Hardback",5), ("Bible_Of_Battlefield",5), @@ -4009,9 +4009,9 @@ High_Weapon_Box: ( ("Bladed_Whip",5), ("Electric_Eel",5), ("Sea_Witch_Foot",5), - ("Queen's_Whip",5), + ("Queens_Whip",5), ("Carrot_Whip",5), - ("Queen's_Whip_",5), + ("Queens_Whip_",5), ("Stem_Of_Nepenthes",5), "Thorn_Staff", "Eraser", @@ -4523,7 +4523,7 @@ Old_Card_Album_: ( High_Weapon_Box_: ( ("Mail_Breaker",5), ("Weeder_Knife",5), - ("Mama's_Knife",5), + ("Mamas_Knife",5), ("Assasin_Dagger",5), ("Exercise",5), ("Azoth",5), @@ -4579,7 +4579,7 @@ High_Weapon_Box_: ( ("Crescent_Scythe",5), ("Bill_Guisarme",5), ("Zephyrus",5), - ("Longinus's_Spear",5), + ("Longinuss_Spear",5), ("Brionac",5), ("Hell_Fire",5), ("Gae_Bolg",5), @@ -4606,7 +4606,7 @@ High_Weapon_Box_: ( ("Red_Square_Bag",5), //unknown/unsupported - ("16010",5), ("Book_Of_The_Apocalypse",5), - ("Girl's_Diary",5), + ("Girls_Diary",5), ("Legacy_Of_Dragon",5), ("Hardback",5), ("Bible_Of_Battlefield",5), @@ -4629,9 +4629,9 @@ High_Weapon_Box_: ( ("Bladed_Whip",5), ("Electric_Eel",5), ("Sea_Witch_Foot",5), - ("Queen's_Whip",5), + ("Queens_Whip",5), ("Carrot_Whip",5), - ("Queen's_Whip_",5), + ("Queens_Whip_",5), ("Stem_Of_Nepenthes",5), "Thorn_Staff", "Eraser", diff --git a/db/pre-re/item_packages.conf b/db/pre-re/item_packages.conf index 0f0502c05..8e421be53 100644 --- a/db/pre-re/item_packages.conf +++ b/db/pre-re/item_packages.conf @@ -7861,7 +7861,7 @@ BR_Independence_Scroll: { Named: true Rate: 100 } - Carmen_Miranda's_Hat: { + Carmen_Mirandas_Hat: { Random: 1 Named: true Rate: 30 diff --git a/db/pre-re/mob_db.conf b/db/pre-re/mob_db.conf index fecbf9bb7..82501748d 100644 --- a/db/pre-re/mob_db.conf +++ b/db/pre-re/mob_db.conf @@ -136,7 +136,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 70 - Scorpion's_Tail: 5500 + Scorpions_Tail: 5500 Elunium_Stone: 57 Solid_Shell: 210 Fine_Grit: 100 @@ -680,8 +680,8 @@ mob_db: ( Claw_Of_Wolves: 9000 Mantle_: 10 Meat: 650 - Monster's_Feed: 1050 - Animal's_Skin: 5500 + Monsters_Feed: 1050 + Animals_Skin: 5500 Strawberry: 600 Wolf_Card: 1 } @@ -1110,7 +1110,7 @@ mob_db: ( Cobold_Hair: 4000 Oridecon: 500 Elunium: 500 - Executioner's_Mitten: 800 + Executioners_Mitten: 800 Guh_Moon_Goh_: 300 } },*/ @@ -1304,7 +1304,7 @@ mob_db: ( Amulet: 20 Ninja_Suit: 1 Adventure_Suit: 100 - Girl's_Diary: 5 + Girls_Diary: 5 Munak_Card: 1 } }, @@ -2562,7 +2562,7 @@ mob_db: ( DamageMotion: 540 MvpExp: 0 Drops: { - Grasshopper's_Leg: 9000 + Grasshoppers_Leg: 9000 Guitar_Of_Vast_Land: 10 Green_Feeler: 4 Javelin_: 80 @@ -2759,7 +2759,7 @@ mob_db: ( MvpExp: 0 Drops: { Raccoon_Leaf: 5500 - Animal's_Skin: 5500 + Animals_Skin: 5500 Sweet_Potato: 800 Cat_Hairband: 1 Raccoondog_Doll: 2 @@ -2858,7 +2858,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 60 - Grasshopper's_Leg: 6500 + Grasshoppers_Leg: 6500 Scell: 400 Elunium_Stone: 49 Singing_Plant: 20 @@ -2963,9 +2963,9 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 9000 + Bears_Foot: 9000 Poo_Poo_Hat: 5 - Animal's_Skin: 5000 + Animals_Skin: 5000 Stuffed_Doll: 80 Sweet_Potato: 1500 Honey: 450 @@ -3065,7 +3065,7 @@ mob_db: ( Candy_Striper: 1000 Red_Herb: 1000 Apple: 1000 - Santa's_Hat: 100 + Santas_Hat: 100 Apple: 7 Poring__Card: 1 } @@ -3441,7 +3441,7 @@ mob_db: ( Crystal_Blue: 30 Worm_Peelings: 5500 Garlet: 400 - Monster's_Feed: 500 + Monsters_Feed: 500 Red_Herb: 650 Insect_Feeler: 450 Earthworm_The_Dude: 20 @@ -4288,11 +4288,11 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Oldman's_Romance: 50 - Grasshopper's_Leg: 8000 + Oldmans_Romance: 50 + Grasshoppers_Leg: 8000 Azure_Jewel: 1000 Grasshopper_Doll: 1500 - Angel's_Arrival: 1000 + Angels_Arrival: 1000 Center_Potion: 700 Guitar_Of_Gentle_Breeze: 10 Vocal_Card: 1 @@ -4342,7 +4342,7 @@ mob_db: ( DamageMotion: 432 MvpExp: 0 Drops: { - Big_Sis'_Ribbon: 50 + Big_Sis_Ribbon: 50 Honey: 2000 Bluish_Green_Jewel: 1000 Glass_Bead: 1500 @@ -4399,7 +4399,7 @@ mob_db: ( Snowy_Horn: 200 Unripe_Apple: 50 Scarlet_Jewel: 1000 - Angel's_Safeguard: 1000 + Angels_Safeguard: 1000 Apple: 8000 Apple: 8000 Apple_Juice: 4000 @@ -4508,7 +4508,7 @@ mob_db: ( Claw_Of_Wolves: 8000 Golden_Jewel: 1500 Star_Dust_Blade: 100 - Angel's_Warmth: 1000 + Angels_Warmth: 1000 Red_Jewel: 10 Monster_Juice: 50 Vagabond_Wolf_Card: 1 @@ -4564,7 +4564,7 @@ mob_db: ( Glass_Bead: 1500 Four_Leaf_Clover: 30 Rainbow_Carrot: 50 - Angel's_Protection: 1000 + Angels_Protection: 1000 Eclipse_Card: 1 } }, @@ -4607,7 +4607,7 @@ mob_db: ( MvpExp: 0 Drops: { Crystal_Blue: 50 - Snail's_Shell: 9000 + Snails_Shell: 9000 Garlet: 1200 Shell: 3000 Solid_Shell: 2 @@ -5060,7 +5060,7 @@ mob_db: ( Drops: { Porcupine_Spike: 9000 Coat_: 5 - Animal's_Skin: 5500 + Animals_Skin: 5500 Glaive_: 10 Spear_: 15 Pike_: 20 @@ -5107,7 +5107,7 @@ mob_db: ( Acorn: 9000 Hood_: 20 Fluff: 3000 - Animal's_Skin: 2500 + Animals_Skin: 2500 Sweet_Potato: 500 Sandals_: 25 Strawberry: 600 @@ -5254,8 +5254,8 @@ mob_db: ( MvpExp: 0 Drops: { Phracon: 85 - Animal's_Skin: 5500 - Adventurere's_Suit_: 80 + Animals_Skin: 5500 + Adventureres_Suit_: 80 Meat: 600 Cotton_Shirt: 200 Asura_: 5 @@ -5657,7 +5657,7 @@ mob_db: ( DamageMotion: 432 MvpExp: 12512 MvpDrops: { - Tiger's_Skin: 5000 + Tigers_Skin: 5000 Tiger_Footskin: 1000 Flame_Heart: 3000 } @@ -5961,7 +5961,7 @@ mob_db: ( Drops: { Great_Nature: 30 Coal: 150 - Elder_Pixie's_Beard: 5500 + Elder_Pixies_Beard: 5500 Elven_Ears: 1 Cap_: 10 Sparkling_Dust: 100 @@ -7189,9 +7189,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Matyr's_Flea_Guard: 10 - Monster's_Feed: 5000 - Animal's_Skin: 5500 + Matyrs_Flea_Guard: 10 + Monsters_Feed: 5000 + Animals_Skin: 5500 Pet_Food: 400 Elunium_Stone: 100 Grape: 200 @@ -7247,11 +7247,11 @@ mob_db: ( Old_Violet_Box: 2000 } Drops: { - Queen's_Hair_Ornament: 500 + Queens_Hair_Ornament: 500 Safety_Ring: 200 Tiara: 200 Armlet_Of_Obedience: 500 - Mother's_Nightmare: 10 + Mothers_Nightmare: 10 Elunium: 3500 Dea_Staff: 100 Maya_Card: 1 @@ -7765,7 +7765,7 @@ mob_db: ( } Drops: { Broken_Pharaoh_Symbol: 5820 - Tutankhamen's_Mask: 2500 + Tutankhamens_Mask: 2500 Solar_Sword: 100 Holy_Robe: 150 Gemmed_Crown: 500 @@ -7869,7 +7869,7 @@ mob_db: ( Star_Crumb: 4000 } Drops: { - Thin_N'_Long_Tongue: 9700 + Thin_N_Long_Tongue: 9700 Forturn_Sword: 500 Sucsamad: 150 Jaws_Of_Ant: 5000 @@ -8171,7 +8171,7 @@ mob_db: ( Fine_Sand: 350 Sparkling_Dust: 200 Katar_Of_Thornbush: 1 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Sand_Man_Card: 1 } }, @@ -8212,7 +8212,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 9000 + Wild_Boars_Mane: 9000 Grape: 300 Animal_Blood: 2 Eagle_Eyes: 1 @@ -8258,7 +8258,7 @@ mob_db: ( DamageMotion: 576 MvpExp: 0 Drops: { - Animal's_Skin: 9000 + Animals_Skin: 9000 Axe_: 100 Meat: 500 Arrow: 1000 @@ -8310,7 +8310,7 @@ mob_db: ( Flame_Heart: 45 Tweezer: 4850 Hammer_Of_Blacksmith: 15 - Scorpion's_Tail: 5000 + Scorpions_Tail: 5000 Solid_Shell: 3000 White_Herb: 700 Scorpion_King_Card: 1 @@ -8647,9 +8647,9 @@ mob_db: ( MvpExp: 0 Drops: { Rat_Tail: 9000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Feather: 800 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Ora_Ora: 2 Tarou_Card: 1 } @@ -9859,12 +9859,12 @@ mob_db: ( DamageMotion: 768 MvpExp: 0 Drops: { - Executioner's_Mitten: 5 + Executioners_Mitten: 5 White_Herb: 1800 Rose_Quartz: 1500 Tights_: 8 Earring_: 1 - Queen's_Whip: 100 + Queens_Whip: 100 Masquerade: 3 Zherlthsh_Card: 1 } @@ -9910,8 +9910,8 @@ mob_db: ( DamageMotion: 540 MvpExp: 0 Drops: { - Thin_N'_Long_Tongue: 3880 - Executioner's_Mitten: 3 + Thin_N_Long_Tongue: 3880 + Executioners_Mitten: 3 White_Herb: 1800 Crystal_Jewel_: 30 Frozen_Heart: 10 @@ -9960,8 +9960,8 @@ mob_db: ( DamageMotion: 600 MvpExp: 0 Drops: { - Thin_N'_Long_Tongue: 3880 - Executioner's_Mitten: 4 + Thin_N_Long_Tongue: 3880 + Executioners_Mitten: 4 White_Herb: 1800 Oridecon: 150 Electric_Wire: 100 @@ -10012,7 +10012,7 @@ mob_db: ( DamageMotion: 240 MvpExp: 0 Drops: { - Loki's_Whispers: 1 + Lokis_Whispers: 1 Biotite: 1500 Slayer_: 70 Bastard_Sword_: 40 @@ -10330,7 +10330,7 @@ mob_db: ( MvpExp: 0 Drops: { Claw_Of_Rat: 4656 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Blue_Jewel: 80 Glass_Bead: 110 Lemon: 250 @@ -10840,7 +10840,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 6000 + Wild_Boars_Mane: 6000 Grape: 150 Animal_Blood: 3 Eagle_Eyes: 2 @@ -11476,7 +11476,7 @@ mob_db: ( Yoyo_Tail: 6000 Cacao: 500 Yellow_Herb: 130 - Animal's_Skin: 5500 + Animals_Skin: 5500 Monkey_Doll: 7 Strawberry: 500 Orange: 1000 @@ -11906,7 +11906,7 @@ mob_db: ( White_Herb: 800 Feather: 1000 Panda_Cap: 1 - Bear's_Foot: 5000 + Bears_Foot: 5000 White_Jewel: 30 Elunium_Stone: 90 Sasquatch_Card: 1 @@ -12000,7 +12000,7 @@ mob_db: ( Gift_Box: 10 Dirk_: 10 Buckler_: 5 - Santa's_Hat: 10 + Santas_Hat: 10 Goblin_Card: 1 } }, @@ -12094,7 +12094,7 @@ mob_db: ( Piece_Of_Cake: 1000 Candy: 5500 Candy_Striper: 5500 - Santa's_Hat: 250 + Santas_Hat: 250 Antonio_Card: 1 } }, @@ -12814,8 +12814,8 @@ mob_db: ( Fruit_Shell: 120 Arrow_Of_Shadow: 3000 Rotten_Fish: 35 - Monster's_Feed: 600 - Big_Sis'_Ribbon: 2 + Monsters_Feed: 600 + Big_Sis_Ribbon: 2 Wild_Rose_Card: 1 } }, @@ -13508,7 +13508,7 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Alice's_Apron: 2500 + Alices_Apron: 2500 Old_Broom: 40 Chrystal_Pumps: 3 Rouge: 30 @@ -14166,7 +14166,7 @@ mob_db: ( Oridecon_Stone: 300 Gold: 100 Oridecon: 150 - Queen's_Hair_Ornament: 1 + Queens_Hair_Ornament: 1 Cookbook10: 2 Maya_Puple_Card: 1 } @@ -15057,7 +15057,7 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 4550 + Bears_Foot: 4550 Poo_Poo_Hat: 8 Stuffed_Doll: 120 Honey: 500 @@ -15319,7 +15319,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 3500 + Wild_Boars_Mane: 3500 Grape: 290 Animal_Blood: 6 Eagle_Eyes: 1 @@ -18110,7 +18110,7 @@ mob_db: ( Drops: { Fruit_Of_Mastela: 1500 Chrystal_Pumps: 3 - Boy's_Naivety: 1 + Boys_Naivety: 1 Diamond_Ring: 250 Horn_Of_Succubus: 1 Staff_Of_Soul: 1 @@ -18205,8 +18205,8 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Goat's_Horn: 4559 - Gaoat's_Skin: 2500 + Goats_Horn: 4559 + Gaoats_Skin: 2500 Empty_Bottle: 5000 Red_Herb: 500 Blue_Herb: 1000 @@ -18417,8 +18417,8 @@ mob_db: ( DamageMotion: 470 MvpExp: 0 Drops: { - Harpy's_Feather: 4850 - Harpy's_Claw: 2500 + Harpys_Feather: 4850 + Harpys_Claw: 2500 Yellow_Herb: 1500 Yellow_Herb: 800 Izidor: 20 @@ -18661,8 +18661,8 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 5000 - Animal's_Skin: 5000 + Bears_Foot: 5000 + Animals_Skin: 5000 Nice_Sweet_Potato: 2500 Grizzly_Card: 1 } @@ -18804,7 +18804,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Dragon's_Skin: 4074 + Dragons_Skin: 4074 Dragon_Canine: 5335 Dragon_Train: 3880 Dragon_Scale: 3589 @@ -18851,7 +18851,7 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Dragon's_Skin: 4074 + Dragons_Skin: 4074 Dragon_Canine: 5335 Dragon_Train: 3880 Dragon_Scale: 3589 @@ -18903,7 +18903,7 @@ mob_db: ( Great_Nature: 2500 Oridecon_Stone: 300 Damascus_: 5 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Fine_Sand: 1200 Sleeper_Card: 1 } @@ -18948,8 +18948,8 @@ mob_db: ( DamageMotion: 576 MvpExp: 0 Drops: { - Scropion's_Nipper: 4365 - Scorpion's_Tail: 5500 + Scropions_Nipper: 4365 + Scorpions_Tail: 5500 Red_Gemstone: 150 Panacea: 2500 Flame_Heart: 850 @@ -19636,7 +19636,7 @@ mob_db: ( Broken_Shuriken: 5335 Ninja_Suit: 2 Cyfar: 2200 - Shinobi's_Sash: 100 + Shinobis_Sash: 100 Thief_Clothes_: 1 Black_Mask: 2000 Murasame_: 5 @@ -19680,7 +19680,7 @@ mob_db: ( DamageMotion: 864 MvpExp: 0 Drops: { - Poison_Toad's_Skin: 5500 + Poison_Toads_Skin: 5500 Poison_Powder: 2400 Gold_Ring: 4 Green_Herb: 540 @@ -19829,7 +19829,7 @@ mob_db: ( DamageMotion: 672 MvpExp: 0 Drops: { - Tengu's_Nose: 3500 + Tengus_Nose: 3500 Broken_Wine_Vessel: 5500 Huuma_Giant_Wheel: 5 Fruit_Of_Mastela: 150 @@ -20366,7 +20366,7 @@ mob_db: ( DamageMotion: 420 MvpExp: 0 Drops: { - Black_Bear's_Skin: 4462 + Black_Bears_Skin: 4462 Mystery_Iron_Bit: 3500 Royal_Jelly: 400 Honey: 900 @@ -24004,7 +24004,7 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Dullahan's_Helm: 3200 + Dullahans_Helm: 3200 Dullahan_Armor: 4850 An_Eye_Of_Dullahan: 1 Manteau: 13 @@ -24057,7 +24057,7 @@ mob_db: ( Striped_Socks: 3000 Bat_Cage: 5044 Elunium: 100 - Loki's_Whispers: 1 + Lokis_Whispers: 1 Lunatic_Brooch: 5 Loli_Ruri_Card: 1 } @@ -24158,7 +24158,7 @@ mob_db: ( Rusty_Cleaver: 2000 Mr_Scream: 50 Oridecon: 100 - Mama's_Knife: 3 + Mamas_Knife: 3 Ginnungagap: 1 Bloody_Murderer_Card: 1 } @@ -29421,7 +29421,7 @@ mob_db: ( MvpExp: 0 Drops: { Meat: 1000 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Hill_Wind_Card: 1 } }, @@ -29928,7 +29928,7 @@ mob_db: ( Drops: { Armlet_Of_Prisoner: 3000 Old_Blue_Box: 50 - La'cryma_Stick: 1 + Lacryma_Stick: 1 Survival_Rod2_: 5 Guard_: 30 Pair_Of_Red_Ribbon: 1 @@ -30277,7 +30277,7 @@ mob_db: ( Full_Plate_Armor_: 3500 Grave_: 9000 Brionac: 3500 - Longinus's_Spear: 3000 + Longinuss_Spear: 3000 Dragon_Slayer: 2500 Skewer: 1500 B_Seyren_Card: 1 @@ -30677,7 +30677,7 @@ mob_db: ( Drops: { Armlet_Of_Prisoner: 2000 Forturn_Sword: 1 - Adventurere's_Suit_: 40 + Adventureres_Suit_: 40 Gladius_: 10 Chain_Mail_: 2 Ring_Of_Rogue: 2 @@ -31955,9 +31955,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Harpy's_Feather: 4000 - Harpy's_Claw: 3000 - Monster's_Feed: 1000 + Harpys_Feather: 4000 + Harpys_Claw: 3000 + Monsters_Feed: 1000 Blue_Herb: 10 Hill_Wind_Card: 1 } @@ -32295,7 +32295,7 @@ mob_db: ( Reptile_Tongue: 1000 Leaflet_Of_Hinal: 1000 Green_Herb: 1000 - Monster's_Feed: 2000 + Monsters_Feed: 2000 Aloebera: 10 Green_Herb: 1 Green_Iguana_Card: 1 @@ -32831,7 +32831,7 @@ mob_db: ( Bookclip_In_Memory: 300 Legend_Of_Kafra01: 50 Bloody_Page: 500 - Vidar's_Boots: 10 + Vidars_Boots: 10 Cookbook08: 2 Cookbook09: 1 Deathword_Card: 1 @@ -33152,7 +33152,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Blue: 10000 Old_Card_Album: 10 - Goibne's_Shoulder_Arms: 1000 + Goibnes_Shoulder_Arms: 1000 Tha_Odium_Card: 1 } }, @@ -33206,7 +33206,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Red: 10000 Old_Card_Album: 10 - Goibne's_Combat_Boots: 1000 + Goibnes_Combat_Boots: 1000 Tha_Despero_Card: 1 } }, @@ -33260,7 +33260,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Purple: 10000 Old_Card_Album: 10 - Goibne's_Armor: 1000 + Goibnes_Armor: 1000 Tha_Maero_Card: 1 } }, @@ -33314,7 +33314,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Green: 10000 Old_Card_Album: 10 - Goibne's_Helmet: 1000 + Goibnes_Helmet: 1000 Tha_Dolor_Card: 1 } }, @@ -33369,7 +33369,7 @@ mob_db: ( } Drops: { Treasure_Box: 1000 - Morrigane's_Manteau: 1000 + Morriganes_Manteau: 1000 Piece_Of_Bone_Armor: 5000 Full_Plate_Armor_: 5000 Grave_: 5000 @@ -33666,7 +33666,7 @@ mob_db: ( Drops: { Strawberry: 2200 Dragon_Canine: 1000 - Dragon's_Skin: 1000 + Dragons_Skin: 1000 Dragon_Scale: 2000 Dragonball_Red: 800 Flame_Heart: 20 @@ -33915,8 +33915,8 @@ mob_db: ( Crystal_Jewel__: 2000 } Drops: { - Morpheus's_Armlet: 1000 - Morpheus's_Ring: 1000 + Morpheuss_Armlet: 1000 + Morpheuss_Ring: 1000 Treasure_Box: 5000 Scale_Of_Red_Dragon: 3589 Int_Dish10: 1000 @@ -33970,11 +33970,11 @@ mob_db: ( DamageMotion: 432 MvpExp: 0 Drops: { - Dragon's_Skin: 4000 + Dragons_Skin: 4000 Dragon_Canine: 4000 Tri_Headed_Dragon_Head: 3880 - Morpheus's_Hood: 500 - Morrigane's_Helm: 500 + Morpheuss_Hood: 500 + Morriganes_Helm: 500 Vit_Dish10: 300 Fricca_Circlet: 500 Hydro_Card: 1 @@ -34553,11 +34553,11 @@ mob_db: ( Drops: { Pocket_Watch: 3000 Old_Violet_Box: 3000 - Morrigane's_Pendant: 1000 + Morriganes_Pendant: 1000 Glittering_Clothes: 1000 Survival_Rod_: 500 Counter_Dagger: 500 - Morrigane's_Belt: 1000 + Morriganes_Belt: 1000 Kiel_Card: 1 } }, @@ -34608,7 +34608,7 @@ mob_db: ( Screw: 500 Drill_Katar: 5 Elunium: 10 - Vali's_Manteau: 20 + Valis_Manteau: 20 Alicel_Card: 1 } }, @@ -34701,9 +34701,9 @@ mob_db: ( MvpExp: 0 Drops: { Brigan: 4000 - Morpheus's_Shawl: 10 + Morpheuss_Shawl: 10 Rosary_: 10 - Alice's_Apron: 5 + Alices_Apron: 5 Imperial_Cooking_Kits: 50 Sway_Apron: 1 Orleans_Server: 5 @@ -35460,7 +35460,7 @@ mob_db: ( Divine_Cross: 25 Rune_Of_Darkness: 1000 Silk_Robe_: 100 - Odin's_Blessing: 100 + Odins_Blessing: 100 Skeggiold_Card: 1 } }, @@ -35514,7 +35514,7 @@ mob_db: ( Divine_Cross: 25 Rune_Of_Darkness: 1000 Silk_Robe_: 100 - Odin's_Blessing: 100 + Odins_Blessing: 100 Skeggiold_Card: 1 } }, @@ -35945,7 +35945,7 @@ mob_db: ( Drops: { Valhalla_Flower: 500 Old_Violet_Box: 100 - Valkyrja's_Shield: 500 + Valkyrjas_Shield: 500 } }, { @@ -36777,7 +36777,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Wind_Of_Verdure: 50 Combo_Battle_Glove: 2 Roween_Card: 1 @@ -36825,7 +36825,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Rough_Wind: 10 Ulfhedinn: 5 Galion_Card: 1 @@ -39390,7 +39390,7 @@ mob_db: ( Drops: { Great_Nature: 30 Coal: 150 - Elder_Pixie's_Beard: 5500 + Elder_Pixies_Beard: 5500 Elven_Ears: 1 Ribbon: 10 Thorny_Buckler: 3 @@ -40391,7 +40391,7 @@ mob_db: ( Acorn: 9000 Hood_: 20 Fluff: 3000 - Animal's_Skin: 2500 + Animals_Skin: 2500 Sweet_Potato: 500 Sandals_: 25 Sweet_Bean: 600 @@ -40682,12 +40682,12 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Monster's_Feed: 5000 + Monsters_Feed: 5000 Tooth_Blade: 10 Wild_Beast_Claw: 10 Skel_Bone: 4500 Well_Dried_Bone: 20 - Animal's_Skin: 5500 + Animals_Skin: 5500 Pet_Food: 400 Hell_Poodle_Card: 1 } @@ -47081,7 +47081,7 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Cowking's_Nose_Ring: 10000 + Cowkings_Nose_Ring: 10000 } }, { @@ -47231,8 +47231,8 @@ mob_db: ( DamageMotion: 504 MvpExp: 0 Drops: { - Dragon's_Mane: 3000 - Dragon's_Skin: 100 + Dragons_Mane: 3000 + Dragons_Skin: 100 Dragon_Canine: 100 Dragon_Train: 1000 Dragon_Scale: 1000 @@ -48022,7 +48022,7 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Pope's_Cookie: 5000 + Popes_Cookie: 5000 } }, { @@ -48070,7 +48070,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Pope's_Cookie: 5000 + Popes_Cookie: 5000 } }, /*{ @@ -49561,7 +49561,7 @@ mob_db: ( Tooth_Of_Ancient_Fish: 500 Lip_Of_Ancient_Fish: 500 Mistic_Frozen: 5 - Fisherman's_Dagger: 5 + Fishermans_Dagger: 5 Scalpel: 1 } }, @@ -49657,7 +49657,7 @@ mob_db: ( Drops: { Leopard_Skin: 3000 Leopard_Talon: 2000 - Animal's_Skin: 1000 + Animals_Skin: 1000 Oridecon_Stone: 40 Claw_: 1 } diff --git a/db/pre-re/mob_race2_db.txt b/db/pre-re/mob_race2_db.txt index 05f5e421a..410301699 100644 --- a/db/pre-re/mob_race2_db.txt +++ b/db/pre-re/mob_race2_db.txt @@ -13,5 +13,5 @@ 4,1040,1278,1366,1497,2024 // Guardians 5,1285,1286,1287 -// Ninja Classes (Pirate's_Pride) +// Ninja Classes (Pirates_Pride) 6,1315,1364,1401,1560 diff --git a/db/pre-re/skill_db.conf b/db/pre-re/skill_db.conf index 9a9b64038..95683a9e0 100644 --- a/db/pre-re/skill_db.conf +++ b/db/pre-re/skill_db.conf @@ -21328,7 +21328,7 @@ skill_db: ( Requirements: { SPCost: 5 Items: { - Wolf's_Flute: 0 + Wolfs_Flute: 0 } } }, @@ -37240,4 +37240,4 @@ skill_db: ( } NumberOfHits: 0 }, -)
\ No newline at end of file +) diff --git a/db/re/item_chain.conf b/db/re/item_chain.conf index 892686271..a2e4efff4 100644 --- a/db/re/item_chain.conf +++ b/db/re/item_chain.conf @@ -91,7 +91,7 @@ ITMCHAIN_HEAL: { Novice_Potion: 50 Nice_Sweet_Potato: 50 Candy: 100 - ID528: 200 //Monster's_Feed + Monsters_Feed: 200 Popped_Rice: 600 } diff --git a/db/re/item_db.conf b/db/re/item_db.conf index 2af024f36..cac13166d 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -388,7 +388,7 @@ item_db: ( }, { Id: 528 - AegisName: "Monster's_Feed" + AegisName: "Monsters_Feed" Name: "Monster's Feed" Type: 0 Buy: 60 @@ -511,7 +511,7 @@ item_db: ( }, { Id: 540 - AegisName: "Falcon's_Feed" + AegisName: "Falcons_Feed" Name: "Falcon Food" Type: 0 Buy: 2000 @@ -520,7 +520,7 @@ item_db: ( }, { Id: 541 - AegisName: "Pecopeco's_Feed" + AegisName: "Pecopecos_Feed" Name: "PecoPeco Food" Type: 0 Buy: 3000 @@ -981,7 +981,7 @@ item_db: ( }, { Id: 586 - AegisName: "Mother's_Cake" + AegisName: "Mothers_Cake" Name: "Mother's Cake" Type: 0 Buy: 20 @@ -2726,7 +2726,7 @@ item_db: ( }, { Id: 904 - AegisName: "Scorpion's_Tail" + AegisName: "Scorpions_Tail" Name: "Scorpion Tail" Buy: 124 Weight: 10 @@ -2846,7 +2846,7 @@ item_db: ( }, { Id: 919 - AegisName: "Animal's_Skin" + AegisName: "Animals_Skin" Name: "Animal Skin" Buy: 36 Weight: 10 @@ -2998,7 +2998,7 @@ item_db: ( }, { Id: 940 - AegisName: "Grasshopper's_Leg" + AegisName: "Grasshoppers_Leg" Name: "Grasshopper's Leg" Buy: 36 Weight: 10 @@ -3046,7 +3046,7 @@ item_db: ( }, { Id: 946 - AegisName: "Snail's_Shell" + AegisName: "Snails_Shell" Name: "Snail's Shell" Buy: 64 Weight: 10 @@ -3062,7 +3062,7 @@ item_db: ( }, { Id: 948 - AegisName: "Bear's_Foot" + AegisName: "Bears_Foot" Name: "Bear's Footskin" Buy: 174 Weight: 10 @@ -3589,7 +3589,7 @@ item_db: ( }, { Id: 1015 - AegisName: "Thin_N'_Long_Tongue" + AegisName: "Thin_N_Long_Tongue" Name: "Tongue" Buy: 528 Weight: 10 @@ -3693,7 +3693,7 @@ item_db: ( }, { Id: 1028 - AegisName: "Wild_Boar's_Mane" + AegisName: "Wild_Boars_Mane" Name: "Mane" Buy: 196 Weight: 10 @@ -3701,7 +3701,7 @@ item_db: ( }, { Id: 1029 - AegisName: "Tiger's_Skin" + AegisName: "Tigers_Skin" Name: "Tiger Skin" Buy: 548 Weight: 10 @@ -3789,7 +3789,7 @@ item_db: ( }, { Id: 1040 - AegisName: "Elder_Pixie's_Beard" + AegisName: "Elder_Pixies_Beard" Name: "Elder Pixie's Moustache" Buy: 232 Weight: 10 @@ -4113,7 +4113,7 @@ item_db: ( }, { Id: 1084 - AegisName: "Kapra's_Pass" + AegisName: "Kapras_Pass" Name: "Kafra Pass" Weight: 10 }, @@ -7727,7 +7727,7 @@ item_db: ( }, { Id: 1229 - AegisName: "Mama's_Knife" + AegisName: "Mamas_Knife" Name: "Kitchen Knife" Type: 4 Buy: 20 @@ -8345,7 +8345,7 @@ item_db: ( }, { Id: 1249 - AegisName: "Fisherman's_Dagger" + AegisName: "Fishermans_Dagger" Name: "Fisherman's Dagger" Type: 4 Buy: 10000 @@ -12968,7 +12968,7 @@ item_db: ( }, { Id: 1469 - AegisName: "Longinus's_Spear" + AegisName: "Longinuss_Spear" Name: "Longinus's Spear" Type: 4 Buy: 20 @@ -15266,7 +15266,7 @@ item_db: ( }, { Id: 1558 - AegisName: "Girl's_Diary" + AegisName: "Girls_Diary" Name: "Girl's Diary" Type: 4 Buy: 1500 @@ -16838,7 +16838,7 @@ item_db: ( }, { Id: 1621 - AegisName: "Hypnotist's_Staff" + AegisName: "Hypnotists_Staff" Name: "Hypnotist's Staff" Type: 4 Buy: 43000 @@ -16859,7 +16859,7 @@ item_db: ( }, { Id: 1622 - AegisName: "Hypnotist's_Staff_" + AegisName: "Hypnotists_Staff_" Name: "Hypnotist's Staff" Type: 4 Buy: 20 @@ -17668,7 +17668,7 @@ item_db: ( }, { Id: 1646 - AegisName: "La'cryma_Stick" + AegisName: "Lacryma_Stick" Name: "La'cryma Stick" Type: 4 Buy: 20 @@ -22844,7 +22844,7 @@ item_db: ( }, { Id: 1970 - AegisName: "Queen's_Whip" + AegisName: "Queens_Whip" Name: "Queen's Whip" Type: 4 Buy: 20 @@ -22978,7 +22978,7 @@ item_db: ( }, { Id: 1976 - AegisName: "Queen's_Whip_" + AegisName: "Queens_Whip_" Name: "Queen's Whip" Type: 4 Buy: 20 @@ -24576,7 +24576,7 @@ item_db: ( }, { Id: 2115 - AegisName: "Valkyrja's_Shield" + AegisName: "Valkyrjas_Shield" Name: "Valkyrja's Shield" Type: 5 Buy: 30000 @@ -24600,7 +24600,7 @@ item_db: ( }, { Id: 2116 - AegisName: "Angel's_Safeguard" + AegisName: "Angels_Safeguard" Name: "Angelic Guard" Type: 5 Buy: 10000 @@ -25123,7 +25123,7 @@ item_db: ( }, { Id: 2137 - AegisName: "Valkyrja's_Shield_C" + AegisName: "Valkyrjas_Shield_C" Name: "Neo Valkyrja's Shield" Type: 5 Def: 110 @@ -26011,7 +26011,7 @@ item_db: ( }, { Id: 2183 - AegisName: "Impr_Angel's_Safeguard" + AegisName: "Impr_Angels_Safeguard" Name: "Advanced Angelic Guard" Type: 5 Buy: 10000 @@ -26298,7 +26298,7 @@ item_db: ( }, { Id: 2205 - AegisName: "Diver's_Goggles" + AegisName: "Divers_Goggles" Name: "Diver Goggles" Type: 5 Buy: 3500 @@ -26797,7 +26797,7 @@ item_db: ( }, { Id: 2236 - AegisName: "Santa's_Hat" + AegisName: "Santas_Hat" Name: "Santa Hat" Type: 5 Buy: 20 @@ -26894,7 +26894,7 @@ item_db: ( }, { Id: 2244 - AegisName: "Big_Sis'_Ribbon" + AegisName: "Big_Sis_Ribbon" Name: "Big Ribbon" Type: 5 Buy: 15000 @@ -26942,7 +26942,7 @@ item_db: ( }, { Id: 2247 - AegisName: "Oldman's_Romance" + AegisName: "Oldmans_Romance" Name: "Romantic Gent" Type: 5 Buy: 15000 @@ -27812,7 +27812,7 @@ item_db: ( }, { Id: 2306 - AegisName: "Adventurere's_Suit_" + AegisName: "Adventureres_Suit_" Name: "Adventurer's Suit" Type: 5 Buy: 1000 @@ -28663,7 +28663,7 @@ item_db: ( }, { Id: 2353 - AegisName: "Odin's_Blessing" + AegisName: "Odins_Blessing" Name: "Odin's Blessing" Type: 5 Buy: 30000 @@ -28679,7 +28679,7 @@ item_db: ( }, { Id: 2354 - AegisName: "Goibne's_Armor" + AegisName: "Goibnes_Armor" Name: "Goibne's Armor" Type: 5 Buy: 50000 @@ -28698,7 +28698,7 @@ item_db: ( }, { Id: 2355 - AegisName: "Angel's_Protection" + AegisName: "Angels_Protection" Name: "Angelic Protection" Type: 5 Buy: 10000 @@ -29701,7 +29701,7 @@ item_db: ( }, { Id: 2393 - AegisName: "N_Adventurer's_Suit" + AegisName: "N_Adventurers_Suit" Name: "Novice Adventurer's Suit" Type: 5 Def: 45 @@ -30177,7 +30177,7 @@ item_db: ( }, { Id: 2418 - AegisName: "Vidar's_Boots" + AegisName: "Vidars_Boots" Name: "Vidar's Boots" Type: 5 Buy: 30000 @@ -30196,7 +30196,7 @@ item_db: ( }, { Id: 2419 - AegisName: "Goibne's_Combat_Boots" + AegisName: "Goibnes_Combat_Boots" Name: "Goibne's Greaves" Type: 5 Buy: 30000 @@ -30216,7 +30216,7 @@ item_db: ( }, { Id: 2420 - AegisName: "Angel's_Arrival" + AegisName: "Angels_Arrival" Name: "Angel's Reincarnation" Type: 5 Buy: 10000 @@ -31848,7 +31848,7 @@ item_db: ( }, { Id: 2489 - AegisName: "Vidar's_Boots_" + AegisName: "Vidars_Boots_" Name: "Vidar's Boots" Type: 5 Buy: 30000 @@ -31897,7 +31897,7 @@ item_db: ( }, { Id: 2493 - AegisName: "Goibne's_Combat_Boots_" + AegisName: "Goibnes_Combat_Boots_" Name: "Goibne's Greaves" Type: 5 Buy: 30000 @@ -32246,7 +32246,7 @@ item_db: ( }, { Id: 2511 - AegisName: "Skeleton's_Cape" + AegisName: "Skeletons_Cape" Name: "Skeleton Manteau" Type: 5 Buy: 5000 @@ -32362,7 +32362,7 @@ item_db: ( }, { Id: 2517 - AegisName: "Vali's_Manteau" + AegisName: "Valis_Manteau" Name: "Vali's Manteau" Type: 5 Buy: 30000 @@ -32378,7 +32378,7 @@ item_db: ( }, { Id: 2518 - AegisName: "Morpheus's_Shawl" + AegisName: "Morpheuss_Shawl" Name: "Morpheus's Shawl" Type: 5 Buy: 30000 @@ -32397,7 +32397,7 @@ item_db: ( }, { Id: 2519 - AegisName: "Morrigane's_Manteau" + AegisName: "Morriganes_Manteau" Name: "Morrigane's Manteau" Type: 5 Buy: 30000 @@ -32416,7 +32416,7 @@ item_db: ( }, { Id: 2520 - AegisName: "Goibne's_Shoulder_Arms" + AegisName: "Goibnes_Shoulder_Arms" Name: "Goibne's Spaulders" Type: 5 Buy: 30000 @@ -32436,7 +32436,7 @@ item_db: ( }, { Id: 2521 - AegisName: "Angel's_Warmth" + AegisName: "Angels_Warmth" Name: "Angelic Cardigan" Type: 5 Buy: 10000 @@ -33226,7 +33226,7 @@ item_db: ( }, { Id: 2550 - AegisName: "Fisher's_Muffler" + AegisName: "Fishers_Muffler" Name: "Fisher's Muffler" Type: 5 Buy: 20 @@ -34170,7 +34170,7 @@ item_db: ( }, { Id: 2599 - AegisName: "Goibne's_Shoulder_Arms_" + AegisName: "Goibnes_Shoulder_Arms_" Name: "Goibne's Spaulders" Type: 5 Buy: 30000 @@ -34424,7 +34424,7 @@ item_db: ( }, { Id: 2618 - AegisName: "Matyr's_Flea_Guard" + AegisName: "Matyrs_Flea_Guard" Name: "Matyr's Leash" Type: 5 Buy: 2 @@ -34843,7 +34843,7 @@ item_db: ( }, { Id: 2642 - AegisName: "Serin's_Gold_Ring" + AegisName: "Serins_Gold_Ring" Name: "Serin's Gold Ring" Type: 5 Buy: 20 @@ -34862,7 +34862,7 @@ item_db: ( }, { Id: 2643 - AegisName: "Serin's_Gold_Ring_" + AegisName: "Serins_Gold_Ring_" Name: "Serin's Gold Ring" Type: 5 Buy: 45000 @@ -34947,7 +34947,7 @@ item_db: ( }, { Id: 2648 - AegisName: "Morpheus's_Ring" + AegisName: "Morpheuss_Ring" Name: "Morpheus's Ring" Type: 5 Buy: 30000 @@ -34966,7 +34966,7 @@ item_db: ( }, { Id: 2649 - AegisName: "Morpheus's_Armlet" + AegisName: "Morpheuss_Armlet" Name: "Morpheus's Bracelet" Type: 5 Buy: 30000 @@ -34985,7 +34985,7 @@ item_db: ( }, { Id: 2650 - AegisName: "Morrigane's_Belt" + AegisName: "Morriganes_Belt" Name: "Morrigane's Belt" Type: 5 Buy: 30000 @@ -35004,7 +35004,7 @@ item_db: ( }, { Id: 2651 - AegisName: "Morrigane's_Pendant" + AegisName: "Morriganes_Pendant" Name: "Morrigane's Pendant" Type: 5 Buy: 30000 @@ -35049,7 +35049,7 @@ item_db: ( }, { Id: 2654 - AegisName: "Shinobi's_Sash" + AegisName: "Shinobis_Sash" Name: "Shinobi Sash" Type: 5 Buy: 20000 @@ -35344,7 +35344,7 @@ item_db: ( }, { Id: 2668 - AegisName: "Women's_Glory" + AegisName: "Womens_Glory" Name: "Woman Glory" Type: 5 Weight: 500 @@ -37893,7 +37893,7 @@ item_db: ( }, { Id: 2781 - AegisName: "Aumdura's_Grace" + AegisName: "Aumduras_Grace" Name: "Aumdura's Benefit" Type: 5 Buy: 20 @@ -39049,7 +39049,7 @@ item_db: ( }, { Id: 2833 - AegisName: "Odin's_Recall" + AegisName: "Odins_Recall" Name: "Odin Recall R" Type: 5 Loc: 136 @@ -40241,7 +40241,7 @@ item_db: ( }, { Id: 2900 - AegisName: "Morrigane's_Belt_" + AegisName: "Morriganes_Belt_" Name: "Morrigane's Belt" Type: 5 Buy: 30000 @@ -40261,7 +40261,7 @@ item_db: ( }, { Id: 2901 - AegisName: "Morrigane's_Pendant_" + AegisName: "Morriganes_Pendant_" Name: "Morrigane's Pendant" Type: 5 Buy: 30000 @@ -40281,7 +40281,7 @@ item_db: ( }, { Id: 2902 - AegisName: "Morpheus's_Ring_" + AegisName: "Morpheuss_Ring_" Name: "Morpheus's Ring" Type: 5 Buy: 30000 @@ -40298,7 +40298,7 @@ item_db: ( }, { Id: 2903 - AegisName: "Morpheus's_Armlet_" + AegisName: "Morpheuss_Armlet_" Name: "Morpheus's Bracelet" Type: 5 Buy: 30000 @@ -47915,7 +47915,7 @@ item_db: ( }, { Id: 4546 - AegisName: "Val'khiri_Card" + AegisName: "Valkhiri_Card" Name: "Val'khiri Card" Type: 6 Buy: 20 @@ -51543,7 +51543,7 @@ item_db: ( }, { Id: 4875 - AegisName: "Bear's_Power" + AegisName: "Bears_Power" Name: "Strength of Bear" Type: 6 Loc: 1023 @@ -53007,7 +53007,7 @@ item_db: ( }, { Id: 5016 - AegisName: "Boy's_Cap" + AegisName: "Boys_Cap" Name: "Boy's Cap" Type: 5 Buy: 20 @@ -53478,7 +53478,7 @@ item_db: ( }, { Id: 5044 - AegisName: "Devil's_Wing" + AegisName: "Devils_Wing" Name: "Evil Wing Ears" Type: 5 Buy: 20 @@ -53816,7 +53816,7 @@ item_db: ( }, { Id: 5068 - AegisName: "Ear_Of_Devil's_Wing" + AegisName: "Ear_Of_Devils_Wing" Name: "Evil Wing Ears" Type: 5 Buy: 20 @@ -53917,7 +53917,7 @@ item_db: ( }, { Id: 5074 - AegisName: "Ear_Of_Angel's_Wing" + AegisName: "Ear_Of_Angels_Wing" Name: "Angel Wing Ears" Type: 5 Buy: 20 @@ -54685,7 +54685,7 @@ item_db: ( }, { Id: 5126 - AegisName: "Morpheus's_Hood" + AegisName: "Morpheuss_Hood" Name: "Morpheus's Hood" Type: 5 Buy: 30000 @@ -54702,7 +54702,7 @@ item_db: ( }, { Id: 5127 - AegisName: "Morrigane's_Helm" + AegisName: "Morriganes_Helm" Name: "Morrigane's Helm" Type: 5 Buy: 30000 @@ -54722,7 +54722,7 @@ item_db: ( }, { Id: 5128 - AegisName: "Goibne's_Helmet" + AegisName: "Goibnes_Helmet" Name: "Goibne's Helm" Type: 5 Buy: 30000 @@ -54877,7 +54877,7 @@ item_db: ( }, { Id: 5136 - AegisName: "Santa's_Hat_" + AegisName: "Santas_Hat_" Name: "Antonio's Santa Hat" Type: 5 Buy: 20 @@ -57896,7 +57896,7 @@ item_db: ( }, { Id: 5307 - AegisName: "Carmen_Miranda's_Hat" + AegisName: "Carmen_Mirandas_Hat" Name: "Carmen Miranda's Hat" Type: 5 Buy: 20 @@ -58702,7 +58702,7 @@ item_db: ( }, { Id: 5348 - AegisName: "Big_Sis'_Ribbon_" + AegisName: "Big_Sis_Ribbon_" Name: "Big Ribbon" Type: 5 Buy: 15000 @@ -58719,7 +58719,7 @@ item_db: ( }, { Id: 5349 - AegisName: "Boy's_Cap_" + AegisName: "Boys_Cap_" Name: "Boy's Cap" Type: 5 Buy: 20 @@ -60022,7 +60022,7 @@ item_db: ( }, { Id: 5421 - AegisName: "Ifrit's_Ear" + AegisName: "Ifrits_Ear" Name: "Ifrit's Ears" Type: 5 Buy: 20 @@ -60265,7 +60265,7 @@ item_db: ( }, { Id: 5436 - AegisName: "Bride's_Corolla" + AegisName: "Brides_Corolla" Name: "Bride's Corolla" Type: 5 Buy: 20 @@ -61025,7 +61025,7 @@ item_db: ( }, { Id: 5479 - AegisName: "Shaman's_Hair_Ornament" + AegisName: "Shamans_Hair_Ornament" Name: "Shaman's Hair Decoration" Type: 5 Buy: 20 @@ -61239,7 +61239,7 @@ item_db: ( }, { Id: 5492 - AegisName: "Boy's_Cap_I" + AegisName: "Boys_Cap_I" Name: "Student Cap" Type: 5 Def: 10 @@ -61422,7 +61422,7 @@ item_db: ( }, { Id: 5501 - AegisName: "Pirate's_Pride" + AegisName: "Pirates_Pride" Name: "Pirate's Pride" Type: 5 Weight: 100 @@ -61440,7 +61440,7 @@ item_db: ( }, { Id: 5502 - AegisName: "Necromencer's_Hood" + AegisName: "Necromencers_Hood" Name: "Necromancer's Hood" Type: 5 Weight: 500 @@ -61897,7 +61897,7 @@ item_db: ( }, { Id: 5529 - AegisName: "Evil's_Bone_Hat" + AegisName: "Evils_Bone_Hat" Name: "Frost Giant's Skull" Type: 5 Buy: 20 @@ -62753,7 +62753,7 @@ item_db: ( }, { Id: 5579 - AegisName: "Wanderer's_Sakkat" + AegisName: "Wanderers_Sakkat" Name: "Wanderer's Sakkat" Type: 5 Buy: 20 @@ -63002,7 +63002,7 @@ item_db: ( }, { Id: 5592 - AegisName: "Sigrun's_Wing" + AegisName: "Sigruns_Wing" Name: "Sigrun's Wings" Type: 5 Buy: 20 @@ -67968,7 +67968,7 @@ item_db: ( }, { Id: 5921 - AegisName: "Fish_Monster's_Grill" + AegisName: "Fish_Monsters_Grill" Name: "Fish Monster's Grill" Type: 5 Weight: 200 @@ -68873,7 +68873,7 @@ item_db: ( }, { Id: 6070 - AegisName: "Shaman's_Old_Paper" + AegisName: "Shamans_Old_Paper" Name: "Shaman's Document" Weight: 10 Trade: { @@ -68918,13 +68918,13 @@ item_db: ( }, { Id: 6073 - AegisName: "Dragon's_Mane" + AegisName: "Dragons_Mane" Name: "Dragon's Mane" BuyingStore: true }, { Id: 6074 - AegisName: "Bazett's_Order" + AegisName: "Bazetts_Order" Name: "Bazett's Order" Trade: { nodrop: true @@ -69446,7 +69446,7 @@ item_db: ( }, { Id: 6124 - AegisName: "Wolf's_Flute" + AegisName: "Wolfs_Flute" Name: "Wolf Flute" Buy: 10 Trade: { @@ -74637,7 +74637,7 @@ item_db: ( }, { Id: 7017 - AegisName: "Executioner's_Mitten" + AegisName: "Executioners_Mitten" Name: "Executioner's Mitten" Buy: 4500 Weight: 30 @@ -74653,7 +74653,7 @@ item_db: ( }, { Id: 7019 - AegisName: "Loki's_Whispers" + AegisName: "Lokis_Whispers" Name: "Loki's Whispers" Buy: 20 Weight: 10 @@ -74661,7 +74661,7 @@ item_db: ( }, { Id: 7020 - AegisName: "Mother's_Nightmare" + AegisName: "Mothers_Nightmare" Name: "Mother's Nightmare" Buy: 20 Weight: 10 @@ -74701,7 +74701,7 @@ item_db: ( }, { Id: 7025 - AegisName: "Lucifer's_Lament" + AegisName: "Lucifers_Lament" Name: "Lucifer's Lament" Buy: 30000 Weight: 50 @@ -74875,7 +74875,7 @@ item_db: ( }, { Id: 7047 - AegisName: "Alice's_Apron" + AegisName: "Alices_Apron" Name: "Alice's Apron" Buy: 2424 Weight: 10 @@ -75338,7 +75338,7 @@ item_db: ( }, { Id: 7106 - AegisName: "Goat's_Horn" + AegisName: "Goats_Horn" Name: "Antelope Horn" Buy: 672 Weight: 10 @@ -75346,7 +75346,7 @@ item_db: ( }, { Id: 7107 - AegisName: "Gaoat's_Skin" + AegisName: "Gaoats_Skin" Name: "Antelope Skin" Buy: 756 Weight: 10 @@ -75402,7 +75402,7 @@ item_db: ( }, { Id: 7114 - AegisName: "Tutankhamen's_Mask" + AegisName: "Tutankhamens_Mask" Name: "Masque of Tutankhamen" Buy: 10 Weight: 10 @@ -75410,7 +75410,7 @@ item_db: ( }, { Id: 7115 - AegisName: "Harpy's_Feather" + AegisName: "Harpys_Feather" Name: "Harpy Feather" Buy: 1142 Weight: 10 @@ -75418,7 +75418,7 @@ item_db: ( }, { Id: 7116 - AegisName: "Harpy's_Claw" + AegisName: "Harpys_Claw" Name: "Harpy Talon" Buy: 1210 Weight: 10 @@ -75474,7 +75474,7 @@ item_db: ( }, { Id: 7123 - AegisName: "Dragon's_Skin" + AegisName: "Dragons_Skin" Name: "Dragon Skin" Buy: 1025 Weight: 10 @@ -75490,7 +75490,7 @@ item_db: ( }, { Id: 7125 - AegisName: "Scropion's_Nipper" + AegisName: "Scropions_Nipper" Name: "Scorpion Claw" Buy: 706 Weight: 10 @@ -75720,7 +75720,7 @@ item_db: ( }, { Id: 7155 - AegisName: "Poison_Toad's_Skin" + AegisName: "Poison_Toads_Skin" Name: "Poisonous Toad Skin" Buy: 280 Weight: 10 @@ -75752,7 +75752,7 @@ item_db: ( }, { Id: 7159 - AegisName: "Tengu's_Nose" + AegisName: "Tengus_Nose" Name: "Tengu Nose" Buy: 400 Weight: 10 @@ -75760,14 +75760,14 @@ item_db: ( }, { Id: 7160 - AegisName: "Lord's_Passable_Ticket" + AegisName: "Lords_Passable_Ticket" Name: "Feudal Lord Permit" Weight: 10 BuyingStore: true }, { Id: 7161 - AegisName: "Black_Bear's_Skin" + AegisName: "Black_Bears_Skin" Name: "Black Bear Skin" Buy: 384 Weight: 10 @@ -75892,7 +75892,7 @@ item_db: ( }, { Id: 7177 - AegisName: "Part_Of_Star's_Sob" + AegisName: "Part_Of_Stars_Sob" Name: "Crumb of Sobbing Starlight" Trade: { nodrop: true @@ -75907,7 +75907,7 @@ item_db: ( }, { Id: 7178 - AegisName: "Star's_Sob" + AegisName: "Stars_Sob" Name: "Sobbing Starlight" Trade: { nodrop: true @@ -76156,7 +76156,7 @@ item_db: ( }, { Id: 7209 - AegisName: "Dullahan's_Helm" + AegisName: "Dullahans_Helm" Name: "Helm of Dullahan" Buy: 1350 Weight: 10 @@ -76842,7 +76842,7 @@ item_db: ( }, { Id: 7304 - AegisName: "Witch's_Spell_Book" + AegisName: "Witchs_Spell_Book" Name: "Witch's Spell Scroll" Trade: { nodrop: true @@ -76902,7 +76902,7 @@ item_db: ( }, { Id: 7308 - AegisName: "Witch's_Potion" + AegisName: "Witchs_Potion" Name: "Witch's Tonic" Trade: { nodrop: true @@ -77331,7 +77331,7 @@ item_db: ( }, { Id: 7351 - AegisName: "Friend's_Diary" + AegisName: "Friends_Diary" Name: "Friend's Diary" Buy: 20 Trade: { @@ -78206,7 +78206,7 @@ item_db: ( }, { Id: 7458 - AegisName: "Baphomet's_Horn" + AegisName: "Baphomets_Horn" Name: "Fortune Horn" Buy: 2 Weight: 10 @@ -78844,7 +78844,7 @@ item_db: ( }, { Id: 7518 - AegisName: "Women's_Medal" + AegisName: "Womens_Medal" Name: "Women's Medal" Weight: 10 Trade: { @@ -79685,7 +79685,7 @@ item_db: ( }, { Id: 7594 - AegisName: "Sonia's_Letter" + AegisName: "Sonias_Letter" Name: "Sonia's Letter" Buy: 20 Weight: 10 @@ -82355,7 +82355,7 @@ item_db: ( }, { Id: 7920 - AegisName: "Hero's_Arsenal" + AegisName: "Heros_Arsenal" Name: "Hero's Arsenal" Trade: { nodrop: true @@ -82460,7 +82460,7 @@ item_db: ( }, { Id: 7930 - AegisName: "Cowking's_Nose_Ring" + AegisName: "Cowkings_Nose_Ring" Name: "Devil's Cattle Ring" Weight: 1000 Trade: { @@ -83559,7 +83559,7 @@ item_db: ( }, { Id: 10006 - AegisName: "Queen's_Hair_Ornament" + AegisName: "Queens_Hair_Ornament" Name: "Queen's Hair Ornament" Type: 8 Buy: 20 @@ -83741,7 +83741,7 @@ item_db: ( }, { Id: 10032 - AegisName: "Queen's_Coronet" + AegisName: "Queens_Coronet" Name: "Queen's Coronet" Type: 8 Buy: 20 @@ -85102,7 +85102,7 @@ item_db: ( }, { Id: 11713 - AegisName: "Julia's_Candy" + AegisName: "Julias_Candy" Name: "Julia's Candy" Type: 0 Weight: 30 @@ -86694,7 +86694,7 @@ item_db: ( }, { Id: 12136 - AegisName: "Women's_Bundle" + AegisName: "Womens_Bundle" Name: "Women's Bundle" Type: 2 Weight: 100 @@ -89694,7 +89694,7 @@ item_db: ( }, { Id: 12342 - AegisName: "Manuk's_Opportunity" + AegisName: "Manuks_Opportunity" Name: "Manuk's Opportunity" Type: 2 Weight: 50 @@ -89706,7 +89706,7 @@ item_db: ( }, { Id: 12343 - AegisName: "Manuk's_Courage" + AegisName: "Manuks_Courage" Name: "Manuk's Courage" Type: 2 Weight: 50 @@ -89718,7 +89718,7 @@ item_db: ( }, { Id: 12344 - AegisName: "Pinguicula's_fruit_Jam" + AegisName: "Pinguiculas_fruit_Jam" Name: "Pinguicula's Fruit Jam" Type: 2 Weight: 50 @@ -89730,7 +89730,7 @@ item_db: ( }, { Id: 12345 - AegisName: "Luciola's_Honey_Jam" + AegisName: "Luciolas_Honey_Jam" Name: "Luciola's Honey Jam" Type: 2 Weight: 50 @@ -89762,7 +89762,7 @@ item_db: ( }, { Id: 12348 - AegisName: "Manuk's_Faith" + AegisName: "Manuks_Faith" Name: "Manuk's Faith" Type: 2 Weight: 50 @@ -89774,7 +89774,7 @@ item_db: ( }, { Id: 12349 - AegisName: "Cornus'_Tears" + AegisName: "Cornus_Tears" Name: "Cornus' Tears" Type: 2 Weight: 50 @@ -90041,7 +90041,7 @@ item_db: ( }, { Id: 12370 - AegisName: "Gril's_Naivety" + AegisName: "Grils_Naivety" Name: "Girl's Naivety" Type: 2 Trade: { @@ -90086,7 +90086,7 @@ item_db: ( }, { Id: 12373 - AegisName: "Boy's_Naivety" + AegisName: "Boys_Naivety" Name: "Boy's Pure Heart" Type: 2 Buy: 20 @@ -90164,7 +90164,7 @@ item_db: ( }, { Id: 12379 - AegisName: "Pope's_Cookie" + AegisName: "Popes_Cookie" Name: "Pope Cookie" Type: 2 Buy: 10 @@ -104482,7 +104482,7 @@ item_db: ( }, { Id: 13420 - AegisName: "Honglyun's_Sword" + AegisName: "Honglyuns_Sword" Name: "Honglyun's Sword" Type: 4 Buy: 20 @@ -119602,7 +119602,7 @@ item_db: ( }, { Id: 14285 - AegisName: "Valkyrja's_Shield_C_Box" + AegisName: "Valkyrjas_Shield_C_Box" Name: "Balkiriah Shield Box" Type: 18 Buy: 20 @@ -119878,7 +119878,7 @@ item_db: ( }, { Id: 14301 - AegisName: "Ifrit's_Ear_Box" + AegisName: "Ifrits_Ear_Box" Name: "Ifrit's Ear Box" Type: 18 Buy: 20 @@ -120124,7 +120124,7 @@ item_db: ( }, { Id: 14351 - AegisName: "Tyr's_Blessing20_Box" + AegisName: "Tyrs_Blessing20_Box" Name: "Tyr's Blessing Box(20)" Type: 18 Buy: 20 @@ -120138,11 +120138,11 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Tyr's_Blessing,20; "> + Script: <" getitem Tyrs_Blessing,20; "> }, { Id: 14352 - AegisName: "Tyr's_Blessing50_Box" + AegisName: "Tyrs_Blessing50_Box" Name: "Tyr's Blessing Box(50)" Type: 18 Buy: 20 @@ -120156,7 +120156,7 @@ item_db: ( nomail: true noauction: true } - Script: <" getitem Tyr's_Blessing,50; "> + Script: <" getitem Tyrs_Blessing,50; "> }, { Id: 14359 @@ -120435,7 +120435,7 @@ item_db: ( }, { Id: 14438 - AegisName: "Honglyun's_Sword_Box" + AegisName: "Honglyuns_Sword_Box" Name: "Honglyun's Sword Sword Box" Type: 18 Buy: 20 @@ -120556,7 +120556,7 @@ item_db: ( }, { Id: 14447 - AegisName: "Pirate's_Pride_Box" + AegisName: "Pirates_Pride_Box" Name: "Scallywag's Hat Box" Type: 18 Buy: 20 @@ -120574,7 +120574,7 @@ item_db: ( }, { Id: 14448 - AegisName: "Necromencer's_Hood_Box" + AegisName: "Necromencers_Hood_Box" Name: "Necromancer Hood Box" Type: 18 Buy: 20 @@ -122530,7 +122530,7 @@ item_db: ( }, { Id: 14601 - AegisName: "Tyr's_Blessing" + AegisName: "Tyrs_Blessing" Name: "Tyr's Blessing" Type: 2 Weight: 10 @@ -122942,7 +122942,7 @@ item_db: ( }, { Id: 15001 - AegisName: "Odin's_Blessing_I" + AegisName: "Odins_Blessing_I" Name: "Odin's Blessing" Type: 5 Def: 10 @@ -124315,7 +124315,7 @@ item_db: ( }, { Id: 15068 - AegisName: "Im_Angel's_Protection" + AegisName: "Im_Angels_Protection" Name: "Advanced Angelic Protection" Type: 5 Buy: 10000 @@ -125706,7 +125706,7 @@ item_db: ( }, { Id: 16135 - AegisName: "Evil's_Bone_Hat_Box" + AegisName: "Evils_Bone_Hat_Box" Name: "Satanic Bone Helm Box" Type: 18 Buy: 20 @@ -126476,7 +126476,7 @@ item_db: ( }, { Id: 16362 - AegisName: "Sigrun's_Wing_Box" + AegisName: "Sigruns_Wing_Box" Name: "Sigrun's Wings Box" Type: 18 Weight: 10 @@ -126493,7 +126493,7 @@ item_db: ( }, { Id: 16363 - AegisName: "FSigrun's_Wing_Box" + AegisName: "FSigruns_Wing_Box" Name: "Sigrun's Wings Box" Type: 18 Weight: 10 @@ -131140,7 +131140,7 @@ item_db: ( }, { Id: 18518 - AegisName: "Ear_Of_Angel's_Wing_" + AegisName: "Ear_Of_Angels_Wing_" Name: "Angel Wing Ears" Type: 5 Buy: 20 @@ -131155,7 +131155,7 @@ item_db: ( }, { Id: 18519 - AegisName: "Ear_Of_Devil's_Wing_" + AegisName: "Ear_Of_Devils_Wing_" Name: "Wing of Diablo" Type: 5 Buy: 20 @@ -137663,7 +137663,7 @@ item_db: ( }, { Id: 19043 - AegisName: "Goibne's_Helmet_" + AegisName: "Goibnes_Helmet_" Name: "Goibne's Helm" Type: 5 Buy: 30000 @@ -137684,7 +137684,7 @@ item_db: ( }, { Id: 19044 - AegisName: "Morrigane's_Helm_" + AegisName: "Morriganes_Helm_" Name: "Morrigane's Helm" Type: 5 Buy: 30000 @@ -137892,7 +137892,7 @@ item_db: ( }, { Id: 19085 - AegisName: "Sigrun's_Wing_" + AegisName: "Sigruns_Wing_" Name: "Sigrun's Wings" Type: 5 Buy: 20 @@ -138865,7 +138865,7 @@ item_db: ( }, { Id: 19581 - AegisName: "C_Adventurer's_Hat" + AegisName: "C_Adventurers_Hat" Name: "Costume Adventurer's Hat" Type: 5 Buy: 1000 @@ -139111,7 +139111,7 @@ item_db: ( }, { Id: 19616 - AegisName: "C_Wickebine's_Black_Cat_Ears" + AegisName: "C_Wickebines_Black_Cat_Ears" Name: "Costume Wickebine's Black Cat Ears" Type: 5 Buy: 1000 @@ -140439,7 +140439,7 @@ item_db: ( }, { Id: 19781 - AegisName: "C_Ear_Of_Angel's_Wing_" + AegisName: "C_Ear_Of_Angels_Wing_" Name: "Costume Angel Wing Ears" Type: 5 Loc: 2048 @@ -140463,7 +140463,7 @@ item_db: ( }, { Id: 19784 - AegisName: "C_Morrigane's_Helm" + AegisName: "C_Morriganes_Helm" Name: "Costume Morrigane's Helm" Type: 5 Loc: 1024 @@ -140673,7 +140673,7 @@ item_db: ( }, { Id: 19810 - AegisName: "C_Ifrit's_Ear" + AegisName: "C_Ifrits_Ear" Name: "Costume Ifrit's Ear" Type: 5 Loc: 2048 @@ -140729,7 +140729,7 @@ item_db: ( }, { Id: 19817 - AegisName: "C_Ifrit's_Breath" + AegisName: "C_Ifrits_Breath" Name: "Costume Ifrit's Breath" Type: 5 Loc: 4096 @@ -141085,7 +141085,7 @@ item_db: ( }, { Id: 19864 - AegisName: "C_Dokebi's_Wig" + AegisName: "C_Dokebis_Wig" Name: "Costume Dokebi's Wig" Type: 5 Loc: 1024 @@ -141329,7 +141329,7 @@ item_db: ( }, { Id: 19895 - AegisName: "C_Magician's_Night_Cap" + AegisName: "C_Magicians_Night_Cap" Name: "Costume Magician's Night Cap" Type: 5 Loc: 1024 @@ -141884,7 +141884,7 @@ item_db: ( }, { Id: 19982 - AegisName: "C_Santa's_Hat" + AegisName: "C_Santas_Hat" Name: "Costume Santa Hat" Type: 5 Loc: 1024 @@ -142436,7 +142436,7 @@ item_db: ( }, { Id: 20044 - AegisName: "C_Carmen_Miranda's_Hat" + AegisName: "C_Carmen_Mirandas_Hat" Name: "Costume Carmen Miranda's Hat" Type: 5 Loc: 1024 @@ -142759,7 +142759,7 @@ item_db: ( }, { Id: 20080 - AegisName: "C_Shaman's_Hair_Orna" + AegisName: "C_Shamans_Hair_Orna" Name: "Costume Shaman Hair Ornament" Type: 5 Loc: 1024 @@ -143728,7 +143728,7 @@ item_db: ( }, { Id: 20187 - AegisName: "C_Fricca's_Circlet" + AegisName: "C_Friccas_Circlet" Name: "Costume Fricca's Circlet" Type: 5 Loc: 1024 @@ -143736,7 +143736,7 @@ item_db: ( }, { Id: 20188 - AegisName: "C_Morpheus's_Hood" + AegisName: "C_Morpheuss_Hood" Name: "Costume Morpheus's Hood" Type: 5 Loc: 1024 @@ -143744,7 +143744,7 @@ item_db: ( }, { Id: 20189 - AegisName: "C_Goibne's_Helm" + AegisName: "C_Goibnes_Helm" Name: "Costume Goibne's Helm" Type: 5 Loc: 1024 @@ -145003,7 +145003,7 @@ item_db: ( }, { Id: 20710 - AegisName: "Impr_Angel's_Warmth" + AegisName: "Impr_Angels_Warmth" Name: "Modified Angel's Cardigan" Type: 5 Buy: 20 @@ -146291,7 +146291,7 @@ item_db: ( }, { Id: 22015 - AegisName: "Impr_Angel's_Arrival" + AegisName: "Impr_Angels_Arrival" Name: "Advanced Angel's Reincarnation" Type: 5 Buy: 10000 @@ -148195,7 +148195,7 @@ item_db: ( }, { Id: 24091 - AegisName: "S_Plasterer's_Armor" + AegisName: "S_Plasterers_Armor" Name: "Plasterus Shadow Armor" Type: 5 Buy: 10 @@ -148207,7 +148207,7 @@ item_db: ( }, { Id: 24092 - AegisName: "S_Plasterer's_Shoes" + AegisName: "S_Plasterers_Shoes" Name: "Plasterus Shadow Shoes" Type: 5 Buy: 10 diff --git a/db/re/item_group.conf b/db/re/item_group.conf index c196c95f5..7646059af 100644 --- a/db/re/item_group.conf +++ b/db/re/item_group.conf @@ -412,7 +412,7 @@ Gift_Box: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - ("Girl's_Diary",2), + ("Girls_Diary",2), "Emperium", "Steel", "Old_Blue_Box", @@ -490,7 +490,7 @@ Gift_Box_1: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Gift_Box_2: ( "Star_Crumb", @@ -561,7 +561,7 @@ Gift_Box_2: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - ("Girl's_Diary",2), + ("Girls_Diary",2), "Emperium", "Steel", "Old_Blue_Box", @@ -639,7 +639,7 @@ Gift_Box_3: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Gift_Box_4: ( "Star_Crumb", @@ -710,7 +710,7 @@ Gift_Box_4: ( "Piece_Of_Cake", "Old_Violet_Box", ("Gift_Box",19), - "Girl's_Diary", + "Girls_Diary", ) Old_Blue_Box: ( ("Guard_",3), @@ -727,7 +727,7 @@ Old_Blue_Box: ( ("Leather_Jacket",3), ("Leather_Jacket_",3), ("Adventure_Suit",3), - ("Adventurere's_Suit_",3), + ("Adventureres_Suit_",3), ("Mantle",3), ("Mantle_",3), ("Coat",3), @@ -793,7 +793,7 @@ Old_Blue_Box: ( ("Flower_Ring",3), ("Diamond_Ring",3), ("Mitten_Of_Presbyter",3), - ("Matyr's_Flea_Guard",3), + ("Matyrs_Flea_Guard",3), ("Belt",3), ("Novice_Armlet",3), ("Katana",3), @@ -919,7 +919,7 @@ Old_Blue_Box: ( ("Book_Of_Mother_Earth",3), ("Book_Of_Blazing_Sun",3), ("Book_Of_Gust_Of_Wind",3), - ("Girl's_Diary",3), + ("Girls_Diary",3), ("Rod",3), ("Rod_",3), ("Wand",3), @@ -969,7 +969,7 @@ Old_Blue_Box: ( ("Whip_",3), ("Sunglasses",3), ("Glasses",3), - ("Diver's_Goggles",3), + ("Divers_Goggles",3), ("Wedding_Veil",3), ("Fancy_Flower",3), ("Ribbon",3), @@ -995,15 +995,15 @@ Old_Blue_Box: ( ("Gemmed_Sallet_",3), ("Circlet",3), ("Circlet_",3), - ("Santa's_Hat",3), + ("Santas_Hat",3), ("One_Eyed_Glass",3), ("Granpa_Beard",3), ("Luxury_Sunglasses",3), ("Spinning_Eyes",3), - ("Big_Sis'_Ribbon",3), + ("Big_Sis_Ribbon",3), ("Sweet_Gents",3), ("Golden_Gear",3), - ("Oldman's_Romance",3), + ("Oldmans_Romance",3), ("Western_Grace",3), ("Fillet",3), ("Holy_Bonnet",3), @@ -1061,7 +1061,7 @@ Old_Blue_Box: ( ("Transparent_Headgear",3), ("Pacifier",3), ("Wig",3), - ("Queen's_Hair_Ornament",3), + ("Queens_Hair_Ornament",3), ("Silk_Ribbon",3), ("Punisher",3), ("Wild_Flower",3), @@ -1131,7 +1131,7 @@ Old_Blue_Box: ( ("Danggie",12), ("Tree_Root",12), ("Reptile_Tongue",12), - ("Scorpion's_Tail",12), + ("Scorpions_Tail",12), ("Stem",12), ("Pointed_Scale",12), ("Resin",12), @@ -1146,7 +1146,7 @@ Old_Blue_Box: ( ("Feather_Of_Birds",12), ("Talon",12), ("Sticky_Webfoot",12), - ("Animal's_Skin",12), + ("Animals_Skin",12), ("Claw_Of_Wolves",12), ("Mushroom_Spore",12), ("Orcish_Cuspid",12), @@ -1165,15 +1165,15 @@ Old_Blue_Box: ( ("Posionous_Canine",12), ("Sticky_Mucus",12), ("Bee_Sting",12), - ("Grasshopper's_Leg",12), + ("Grasshoppers_Leg",12), ("Nose_Ring",12), ("Yoyo_Tail",12), ("Solid_Shell",12), ("Horseshoe",12), ("Raccoon_Leaf",12), - ("Snail's_Shell",12), + ("Snails_Shell",12), ("Horn",12), - ("Bear's_Foot",12), + ("Bears_Foot",12), ("Feather",12), ("Heart_Of_Mermaid",12), ("Fin",12), @@ -1236,7 +1236,7 @@ Old_Blue_Box: ( ("Lizard_Scruff",12), ("Colorful_Shell",12), ("Jaws_Of_Ant",12), - ("Thin_N'_Long_Tongue",12), + ("Thin_N_Long_Tongue",12), ("Rat_Tail",12), ("Moustache_Of_Mole",12), ("Nail_Of_Mole",12), @@ -1249,8 +1249,8 @@ Old_Blue_Box: ( ("Spiderweb",12), ("Acorn",12), ("Porcupine_Spike",12), - ("Wild_Boar's_Mane",12), - ("Tiger's_Skin",12), + ("Wild_Boars_Mane",12), + ("Tigers_Skin",12), ("Limb_Of_Mantis",12), ("Blossom_Of_Maneater",12), ("Root_Of_Maneater",12), @@ -1260,7 +1260,7 @@ Old_Blue_Box: ( ("Dragon_Train",12), ("Petite_DiablOfs_Horn",12), ("Petite_DiablOfs_Wing",12), - ("Elder_Pixie's_Beard",12), + ("Elder_Pixies_Beard",12), ("Lantern",12), ("Short_Leg",12), ("Nail_Of_Orc",12), @@ -1326,7 +1326,7 @@ Old_Blue_Box: ( ("Fang_Of_Garm",12), ("Yarn",12), ("Fine_Grit",12), - ("Alice's_Apron",12), + ("Alices_Apron",12), ("Talon_Of_Griffin",12), ("Stone",12), ("Cyfar",12), @@ -1353,26 +1353,26 @@ Old_Blue_Box: ( ("Old_Magic_Circle",12), ("Sharp_Leaf",12), ("Peco_Wing_Feather",12), - ("Goat's_Horn",12), - ("Gaoat's_Skin",12), + ("Goats_Horn",12), + ("Gaoats_Skin",12), ("Boroken_Shiled_Piece",12), ("Shine_Spear_Blade",12), ("Vroken_Sword",12), ("Smooth_Paper",12), ("Fright_Paper_Blade",12), ("Broken_Pharaoh_Symbol",12), - ("Tutankhamen's_Mask",12), - ("Harpy's_Feather",12), - ("Harpy's_Claw",12), + ("Tutankhamens_Mask",12), + ("Harpys_Feather",12), + ("Harpys_Claw",12), ("Rent_Spell_Book",12), ("Rent_Scroll",12), ("Spawns",12), ("Burning_Horse_Shoe",12), ("Honey_Jar",12), ("Hot_Hair",12), - ("Dragon's_Skin",12), + ("Dragons_Skin",12), ("Sand_Lump",12), - ("Scropion's_Nipper",12), + ("Scropions_Nipper",12), ("Large_Jellopy",12), ("Medicine_Bowl",12), ("Fire_Bottle",12), @@ -1386,12 +1386,12 @@ Old_Blue_Box: ( ("Glossy_Hair",12), ("Old_Japaness_Clothes",12), ("Poison_Powder",12), - ("Poison_Toad's_Skin",12), + ("Poison_Toads_Skin",12), ("Broken_Shuriken",12), ("Black_Mask",12), ("Broken_Wine_Vessel",12), - ("Tengu's_Nose",12), - ("Black_Bear's_Skin",12), + ("Tengus_Nose",12), + ("Black_Bears_Skin",12), ("Cloud_Piece",12), ("Sharp_Feeler",12), ("Hard_Peach",12), @@ -1426,7 +1426,7 @@ Old_Blue_Box: ( ("Black_Kitty_Doll",12), ("Old_Manteau",12), ("Rusty_Cleaver",12), - ("Dullahan's_Helm",12), + ("Dullahans_Helm",12), ("Dullahan_Armor",12), ("Rojerta_Piece",12), ("Hanging_Doll",12), @@ -1496,7 +1496,7 @@ Old_Blue_Box: ( ("Holy_Water",12), ("Panacea",12), ("Royal_Jelly",12), - ("Monster's_Feed",12), + ("Monsters_Feed",12), ("Candy",12), ("Candy_Striper",12), ("Apple_Juice",12), @@ -1590,7 +1590,7 @@ Old_Blue_Box: ( "Cinquedea", "Kindling_Dagger", "Obsidian_Dagger", - "Fisherman's_Dagger", + "Fishermans_Dagger", "Jujube_Dagger", "Dragon_Killer", "Ginnungagap", @@ -1602,8 +1602,8 @@ Old_Blue_Box: ( "Nail_Of_Loki", "Bloody_Roar", "Unholy_Touch", - "Hypnotist's_Staff", - "Hypnotist's_Staff_", + "Hypnotists_Staff", + "Hypnotists_Staff_", "Staff_Of_Wing", "Luna_Bow", "Dragon_Wing", @@ -1622,7 +1622,7 @@ Old_Blue_Box: ( "Coward", "Coward_", "Windhawk", - "Queen's_Whip", + "Queens_Whip", "Oriental_Lute", "Diary_Of_Great_Sage", "Hardback", @@ -1645,7 +1645,7 @@ Old_Blue_Box: ( "Banana_Hat", "Wing_Of_Eagle", "Cursed_Lucky_Brooch", - "Shinobi's_Sash", + "Shinobis_Sash", "Hyper_Changer", "Dark_Crystal_Fragment", "Long_Limb", @@ -1699,7 +1699,7 @@ Old_Blue_Box: ( "Thorny_Buckler", "Orleans_Gown", "Strong_Shield", - "Angel's_Arrival", + "Angels_Arrival", "Magni_Cap", "Censor_Bar", "Inverse_Scale", @@ -1744,7 +1744,7 @@ Old_Violet_Box: ( ("Novice_Guard",7), ("Cotton_Shirt_",7), ("Leather_Jacket_",7), - ("Adventurere's_Suit_",7), + ("Adventureres_Suit_",7), ("Mantle_",7), ("Coat_",7), ("Mink_Coat",7), @@ -1791,7 +1791,7 @@ Old_Violet_Box: ( ("Flower_Ring",7), ("Diamond_Ring",7), ("Mitten_Of_Presbyter",7), - ("Matyr's_Flea_Guard",7), + ("Matyrs_Flea_Guard",7), ("Belt",7), ("Novice_Armlet",7), ("Katana_",7), @@ -1865,7 +1865,7 @@ Old_Violet_Box: ( ("Book_Of_Mother_Earth",7), ("Book_Of_Blazing_Sun",7), ("Book_Of_Gust_Of_Wind",7), - ("Girl's_Diary",7), + ("Girls_Diary",7), ("Rod_",7), ("Wand_",7), ("Staff_",7), @@ -1893,7 +1893,7 @@ Old_Violet_Box: ( ("Whip_",7), ("Sunglasses",7), ("Glasses",7), - ("Diver's_Goggles",7), + ("Divers_Goggles",7), ("Wedding_Veil",7), ("Fancy_Flower",7), ("Ribbon",7), @@ -1919,15 +1919,15 @@ Old_Violet_Box: ( ("Gemmed_Sallet_",7), ("Circlet",7), ("Circlet_",7), - ("Santa's_Hat",7), + ("Santas_Hat",7), ("One_Eyed_Glass",7), ("Granpa_Beard",7), ("Luxury_Sunglasses",7), ("Spinning_Eyes",7), - ("Big_Sis'_Ribbon",7), + ("Big_Sis_Ribbon",7), ("Sweet_Gents",7), ("Golden_Gear",7), - ("Oldman's_Romance",7), + ("Oldmans_Romance",7), ("Western_Grace",7), ("Fillet",7), ("Holy_Bonnet",7), @@ -1985,7 +1985,7 @@ Old_Violet_Box: ( ("Transparent_Headgear",7), ("Pacifier",7), ("Wig",7), - ("Queen's_Hair_Ornament",7), + ("Queens_Hair_Ornament",7), ("Silk_Ribbon",7), ("Punisher",7), ("Wild_Flower",7), @@ -2055,7 +2055,7 @@ Old_Violet_Box: ( ("Danggie",14), ("Tree_Root",14), ("Reptile_Tongue",14), - ("Scorpion's_Tail",14), + ("Scorpions_Tail",14), ("Stem",14), ("Pointed_Scale",14), ("Resin",14), @@ -2070,7 +2070,7 @@ Old_Violet_Box: ( ("Feather_Of_Birds",14), ("Talon",14), ("Sticky_Webfoot",14), - ("Animal's_Skin",14), + ("Animals_Skin",14), ("Claw_Of_Wolves",14), ("Mushroom_Spore",14), ("Orcish_Cuspid",14), @@ -2089,15 +2089,15 @@ Old_Violet_Box: ( ("Posionous_Canine",14), ("Sticky_Mucus",14), ("Bee_Sting",14), - ("Grasshopper's_Leg",14), + ("Grasshoppers_Leg",14), ("Nose_Ring",14), ("Yoyo_Tail",14), ("Solid_Shell",14), ("Horseshoe",14), ("Raccoon_Leaf",14), - ("Snail's_Shell",14), + ("Snails_Shell",14), ("Horn",14), - ("Bear's_Foot",14), + ("Bears_Foot",14), ("Feather",14), ("Heart_Of_Mermaid",14), ("Fin",14), @@ -2160,7 +2160,7 @@ Old_Violet_Box: ( ("Lizard_Scruff",14), ("Colorful_Shell",14), ("Jaws_Of_Ant",14), - ("Thin_N'_Long_Tongue",14), + ("Thin_N_Long_Tongue",14), ("Rat_Tail",14), ("Moustache_Of_Mole",14), ("Nail_Of_Mole",14), @@ -2173,8 +2173,8 @@ Old_Violet_Box: ( ("Spiderweb",14), ("Acorn",14), ("Porcupine_Spike",14), - ("Wild_Boar's_Mane",14), - ("Tiger's_Skin",14), + ("Wild_Boars_Mane",14), + ("Tigers_Skin",14), ("Limb_Of_Mantis",14), ("Blossom_Of_Maneater",14), ("Root_Of_Maneater",14), @@ -2184,7 +2184,7 @@ Old_Violet_Box: ( ("Dragon_Train",14), ("Petite_DiablOfs_Horn",14), ("Petite_DiablOfs_Wing",14), - ("Elder_Pixie's_Beard",14), + ("Elder_Pixies_Beard",14), ("Lantern",14), ("Short_Leg",14), ("Nail_Of_Orc",14), @@ -2250,7 +2250,7 @@ Old_Violet_Box: ( ("Fang_Of_Garm",14), ("Yarn",14), ("Fine_Grit",14), - ("Alice's_Apron",14), + ("Alices_Apron",14), ("Talon_Of_Griffin",14), ("Stone",14), ("Cyfar",14), @@ -2277,26 +2277,26 @@ Old_Violet_Box: ( ("Old_Magic_Circle",14), ("Sharp_Leaf",14), ("Peco_Wing_Feather",14), - ("Goat's_Horn",14), - ("Gaoat's_Skin",14), + ("Goats_Horn",14), + ("Gaoats_Skin",14), ("Boroken_Shiled_Piece",14), ("Shine_Spear_Blade",14), ("Vroken_Sword",14), ("Smooth_Paper",14), ("Fright_Paper_Blade",14), ("Broken_Pharaoh_Symbol",14), - ("Tutankhamen's_Mask",14), - ("Harpy's_Feather",14), - ("Harpy's_Claw",14), + ("Tutankhamens_Mask",14), + ("Harpys_Feather",14), + ("Harpys_Claw",14), ("Rent_Spell_Book",14), ("Rent_Scroll",14), ("Spawns",14), ("Burning_Horse_Shoe",14), ("Honey_Jar",14), ("Hot_Hair",14), - ("Dragon's_Skin",14), + ("Dragons_Skin",14), ("Sand_Lump",14), - ("Scropion's_Nipper",14), + ("Scropions_Nipper",14), ("Large_Jellopy",14), ("Medicine_Bowl",14), ("Fire_Bottle",14), @@ -2310,12 +2310,12 @@ Old_Violet_Box: ( ("Glossy_Hair",14), ("Old_Japaness_Clothes",14), ("Poison_Powder",14), - ("Poison_Toad's_Skin",14), + ("Poison_Toads_Skin",14), ("Broken_Shuriken",14), ("Black_Mask",14), ("Broken_Wine_Vessel",14), - ("Tengu's_Nose",14), - ("Black_Bear's_Skin",14), + ("Tengus_Nose",14), + ("Black_Bears_Skin",14), ("Cloud_Piece",14), ("Sharp_Feeler",14), ("Hard_Peach",14), @@ -2350,7 +2350,7 @@ Old_Violet_Box: ( ("Black_Kitty_Doll",14), ("Old_Manteau",14), ("Rusty_Cleaver",14), - ("Dullahan's_Helm",14), + ("Dullahans_Helm",14), ("Dullahan_Armor",14), ("Rojerta_Piece",14), ("Hanging_Doll",14), @@ -2420,7 +2420,7 @@ Old_Violet_Box: ( ("Holy_Water",14), ("Panacea",14), ("Royal_Jelly",14), - ("Monster's_Feed",14), + ("Monsters_Feed",14), ("Candy",14), ("Candy_Striper",14), ("Apple_Juice",14), @@ -2532,7 +2532,7 @@ Old_Violet_Box: ( "Nail_Of_Loki", "Bloody_Roar", "Unholy_Touch", - "Hypnotist's_Staff_", + "Hypnotists_Staff_", "Staff_Of_Wing", "Luna_Bow", "Dragon_Wing", @@ -2550,7 +2550,7 @@ Old_Violet_Box: ( "Legacy_Of_Dragon", "Coward_", "Windhawk", - "Queen's_Whip", + "Queens_Whip", "Oriental_Lute", "Diary_Of_Great_Sage", "Hardback", @@ -2566,7 +2566,7 @@ Old_Violet_Box: ( "Banana_Hat", "Wing_Of_Eagle", "Cursed_Lucky_Brooch", - "Shinobi's_Sash", + "Shinobis_Sash", "Bloody_Iron_Ball", "Hyper_Changer", "Cookbook06", @@ -2707,7 +2707,7 @@ Set_Of_Taiming_Item: ( "Transparent_Headgear", "Pacifier", "Wig", - "Queen's_Hair_Ornament", + "Queens_Hair_Ornament", "Silk_Ribbon", "Punisher", "Wild_Flower", @@ -2737,7 +2737,7 @@ Accessory_Box: ( ("Thimble_Of_Archer",10), ("Rosary",14), ("Ring",10), - ("Matyr's_Flea_Guard",11), + ("Matyrs_Flea_Guard",11), ("Belt",10), ("Brooch",12), ("Nile_Rose_",10), @@ -2760,7 +2760,7 @@ Accessory_Box: ( ("Red_Silk_Seal",2), "Orleans_Glove", "Spiritual_Ring", - "Shinobi's_Sash", + "Shinobis_Sash", "Hyper_Changer", ("Lesser_Elemental_Ring",9), "Expert_Ring", @@ -3100,8 +3100,8 @@ Giftbox_China: ( "Helm_", "Gemmed_Sallet_", "Circlet_", - "Santa's_Hat", - "Big_Sis'_Ribbon", + "Santas_Hat", + "Big_Sis_Ribbon", "Coronet", "Fillet", "Snowy_Horn", @@ -3130,7 +3130,7 @@ Giftbox_China: ( "Viking_Helm", "Cotton_Shirt_", "Leather_Jacket_", - "Adventurere's_Suit_", + "Adventureres_Suit_", "Mantle_", "Coat_", "Mink_Coat", @@ -3334,7 +3334,7 @@ Xmas_Gift: ( ("HandMade_Chocolate",18), ("HandMade_Chocolate_",18), ("Chocolate_Drink",18), - ("Santa's_Hat_",12), + ("Santas_Hat_",12), ("Fire_Cracker_Xmas",4), ) Pierre_Treasurebox: ( @@ -3894,7 +3894,7 @@ Mysterious_Egg: ( High_Weapon_Box: ( ("Mail_Breaker",5), ("Weeder_Knife",5), - ("Mama's_Knife",5), + ("Mamas_Knife",5), ("Assasin_Dagger",5), ("Exercise",5), ("Azoth",5), @@ -3950,7 +3950,7 @@ High_Weapon_Box: ( ("Crescent_Scythe",5), ("Bill_Guisarme",5), ("Zephyrus",5), - ("Longinus's_Spear",5), + ("Longinuss_Spear",5), ("Brionac",5), ("Hell_Fire",5), ("Gae_Bolg",5), @@ -3977,7 +3977,7 @@ High_Weapon_Box: ( ("Red_Square_Bag",5), ("Red_Ether_Bag",5), ("Book_Of_The_Apocalypse",5), - ("Girl's_Diary",5), + ("Girls_Diary",5), ("Legacy_Of_Dragon",5), ("Hardback",5), ("Bible_Of_Battlefield",5), @@ -4000,9 +4000,9 @@ High_Weapon_Box: ( ("Bladed_Whip",5), ("Electric_Eel",5), ("Sea_Witch_Foot",5), - ("Queen's_Whip",5), + ("Queens_Whip",5), ("Carrot_Whip",5), - ("Queen's_Whip_",5), + ("Queens_Whip_",5), ("Stem_Of_Nepenthes",5), "Thorn_Staff", "Eraser", @@ -4508,7 +4508,7 @@ Old_Card_Album_: ( High_Weapon_Box_: ( ("Mail_Breaker",5), ("Weeder_Knife",5), - ("Mama's_Knife",5), + ("Mamas_Knife",5), ("Assasin_Dagger",5), ("Exercise",5), ("Azoth",5), @@ -4564,7 +4564,7 @@ High_Weapon_Box_: ( ("Crescent_Scythe",5), ("Bill_Guisarme",5), ("Zephyrus",5), - ("Longinus's_Spear",5), + ("Longinuss_Spear",5), ("Brionac",5), ("Hell_Fire",5), ("Gae_Bolg",5), @@ -4591,7 +4591,7 @@ High_Weapon_Box_: ( ("Red_Square_Bag",5), ("Red_Ether_Bag",5), ("Book_Of_The_Apocalypse",5), - ("Girl's_Diary",5), + ("Girls_Diary",5), ("Legacy_Of_Dragon",5), ("Hardback",5), ("Bible_Of_Battlefield",5), @@ -4614,9 +4614,9 @@ High_Weapon_Box_: ( ("Bladed_Whip",5), ("Electric_Eel",5), ("Sea_Witch_Foot",5), - ("Queen's_Whip",5), + ("Queens_Whip",5), ("Carrot_Whip",5), - ("Queen's_Whip_",5), + ("Queens_Whip_",5), ("Stem_Of_Nepenthes",5), "Thorn_Staff", "Eraser", diff --git a/db/re/item_packages.conf b/db/re/item_packages.conf index ea4a1aee8..468d47a26 100644 --- a/db/re/item_packages.conf +++ b/db/re/item_packages.conf @@ -7605,7 +7605,7 @@ BR_Independence_Scroll: { Named: true Rate: 100 } - Carmen_Miranda's_Hat: { + Carmen_Mirandas_Hat: { Random: 1 Named: true Rate: 30 diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index 27c6f6686..caa92b718 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -135,7 +135,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 70 - Scorpion's_Tail: 5500 + Scorpions_Tail: 5500 Elunium_Stone: 57 Solid_Shell: 210 Fine_Grit: 100 @@ -676,8 +676,8 @@ mob_db: ( Claw_Of_Wolves: 9000 Mantle_: 10 Meat: 650 - Monster's_Feed: 1050 - Animal's_Skin: 5500 + Monsters_Feed: 1050 + Animals_Skin: 5500 Strawberry: 600 Wolf_Card: 1 } @@ -1106,7 +1106,7 @@ mob_db: ( Cobold_Hair: 4000 Oridecon: 500 Elunium: 500 - Executioner's_Mitten: 800 + Executioners_Mitten: 800 Guh_Moon_Goh_: 300 } },*/ @@ -1300,7 +1300,7 @@ mob_db: ( Amulet: 20 Ninja_Suit: 1 Adventure_Suit: 100 - Girl's_Diary: 5 + Girls_Diary: 5 Munak_Card: 1 } }, @@ -2557,7 +2557,7 @@ mob_db: ( DamageMotion: 540 MvpExp: 0 Drops: { - Grasshopper's_Leg: 9000 + Grasshoppers_Leg: 9000 Guitar_Of_Vast_Land: 10 Green_Feeler: 4 Javelin_: 80 @@ -2754,7 +2754,7 @@ mob_db: ( MvpExp: 0 Drops: { Raccoon_Leaf: 5500 - Animal's_Skin: 5500 + Animals_Skin: 5500 Sweet_Potato: 800 Cat_Hairband: 1 Raccoondog_Doll: 2 @@ -2853,7 +2853,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 60 - Grasshopper's_Leg: 6500 + Grasshoppers_Leg: 6500 Scell: 400 Elunium_Stone: 49 Singing_Plant: 20 @@ -2958,9 +2958,9 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 9000 + Bears_Foot: 9000 Poo_Poo_Hat: 5 - Animal's_Skin: 5000 + Animals_Skin: 5000 Stuffed_Doll: 80 Sweet_Potato: 1500 Honey: 450 @@ -3060,7 +3060,7 @@ mob_db: ( Candy_Striper: 1000 Red_Herb: 1000 Apple: 1000 - Santa's_Hat: 100 + Santas_Hat: 100 Apple: 7 Poring__Card: 1 } @@ -3436,7 +3436,7 @@ mob_db: ( Crystal_Blue: 30 Worm_Peelings: 5500 Garlet: 400 - Monster's_Feed: 500 + Monsters_Feed: 500 Red_Herb: 650 Insect_Feeler: 450 Earthworm_The_Dude: 20 @@ -4283,11 +4283,11 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Oldman's_Romance: 50 - Grasshopper's_Leg: 8000 + Oldmans_Romance: 50 + Grasshoppers_Leg: 8000 Azure_Jewel: 1000 Grasshopper_Doll: 1500 - Angel's_Arrival: 1000 + Angels_Arrival: 1000 Light_Granule: 500 Guitar_Of_Gentle_Breeze: 10 Vocal_Card: 1 @@ -4337,7 +4337,7 @@ mob_db: ( DamageMotion: 432 MvpExp: 0 Drops: { - Big_Sis'_Ribbon: 50 + Big_Sis_Ribbon: 50 Honey: 2000 Bluish_Green_Jewel: 1000 Light_Granule: 500 @@ -4394,7 +4394,7 @@ mob_db: ( Snowy_Horn: 200 Unripe_Apple: 50 Scarlet_Jewel: 1000 - Angel's_Safeguard: 1000 + Angels_Safeguard: 1000 Light_Granule: 500 Apple: 8000 Apple_Juice: 4000 @@ -4503,7 +4503,7 @@ mob_db: ( Claw_Of_Wolves: 8000 Golden_Jewel: 1500 Star_Dust_Blade: 100 - Angel's_Warmth: 1000 + Angels_Warmth: 1000 Light_Granule: 500 Monster_Juice: 50 Vagabond_Wolf_Card: 1 @@ -4559,7 +4559,7 @@ mob_db: ( Light_Granule: 500 Four_Leaf_Clover: 30 Rainbow_Carrot: 50 - Angel's_Protection: 1000 + Angels_Protection: 1000 Eclipse_Card: 1 } }, @@ -4602,7 +4602,7 @@ mob_db: ( MvpExp: 0 Drops: { Crystal_Blue: 50 - Snail's_Shell: 9000 + Snails_Shell: 9000 Garlet: 1200 Shell: 3000 Solid_Shell: 2 @@ -5053,7 +5053,7 @@ mob_db: ( Drops: { Porcupine_Spike: 9000 Coat_: 5 - Animal's_Skin: 5500 + Animals_Skin: 5500 Glaive_: 10 Spear_: 15 Pike_: 20 @@ -5100,7 +5100,7 @@ mob_db: ( Acorn: 9000 Hood_: 20 Fluff: 3000 - Animal's_Skin: 2500 + Animals_Skin: 2500 Sweet_Potato: 500 Sandals_: 25 Strawberry: 600 @@ -5244,8 +5244,8 @@ mob_db: ( MvpExp: 0 Drops: { Phracon: 85 - Animal's_Skin: 5500 - Adventurere's_Suit_: 80 + Animals_Skin: 5500 + Adventureres_Suit_: 80 Wolf_Blood: 2 Cotton_Shirt: 200 Asura_: 5 @@ -5647,7 +5647,7 @@ mob_db: ( DamageMotion: 432 MvpExp: 99000 MvpDrops: { - Tiger's_Skin: 5000 + Tigers_Skin: 5000 Tiger_Footskin: 1000 Flame_Heart: 3000 } @@ -5951,7 +5951,7 @@ mob_db: ( Drops: { Great_Nature: 30 Coal: 150 - Elder_Pixie's_Beard: 5500 + Elder_Pixies_Beard: 5500 Elven_Ears: 1 Cap_: 10 Sparkling_Dust: 100 @@ -7176,9 +7176,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Matyr's_Flea_Guard: 10 - Monster's_Feed: 5000 - Animal's_Skin: 5500 + Matyrs_Flea_Guard: 10 + Monsters_Feed: 5000 + Animals_Skin: 5500 Pet_Food: 400 Elunium_Stone: 100 Grape: 200 @@ -7234,11 +7234,11 @@ mob_db: ( Old_Violet_Box: 2000 } Drops: { - Queen's_Hair_Ornament: 500 + Queens_Hair_Ornament: 500 Safety_Ring: 200 Tiara: 200 Armlet_Of_Obedience: 500 - Mother's_Nightmare: 10 + Mothers_Nightmare: 10 Elunium: 3500 Dea_Staff: 100 Maya_Card: 1 @@ -7752,7 +7752,7 @@ mob_db: ( } Drops: { Broken_Pharaoh_Symbol: 5820 - Tutankhamen's_Mask: 2500 + Tutankhamens_Mask: 2500 Solar_Sword: 100 Holy_Robe: 150 Gemmed_Crown: 500 @@ -7856,7 +7856,7 @@ mob_db: ( Star_Crumb: 4000 } Drops: { - Thin_N'_Long_Tongue: 9700 + Thin_N_Long_Tongue: 9700 Forturn_Sword: 500 Sucsamad: 150 Jaws_Of_Ant: 5000 @@ -8156,7 +8156,7 @@ mob_db: ( Fine_Sand: 350 Sparkling_Dust: 200 Katar_Of_Thornbush: 1 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Sand_Man_Card: 1 } }, @@ -8197,7 +8197,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 9000 + Wild_Boars_Mane: 9000 Grape: 300 Animal_Blood: 2 Eagle_Eyes: 1 @@ -8243,7 +8243,7 @@ mob_db: ( DamageMotion: 576 MvpExp: 0 Drops: { - Animal's_Skin: 9000 + Animals_Skin: 9000 Axe_: 100 Meat: 500 Savage_Meat: 6 @@ -8295,7 +8295,7 @@ mob_db: ( Flame_Heart: 45 Tweezer: 4850 Hammer_Of_Blacksmith: 15 - Scorpion's_Tail: 5000 + Scorpions_Tail: 5000 Solid_Shell: 3000 White_Herb: 700 Scorpion_King_Card: 1 @@ -8632,9 +8632,9 @@ mob_db: ( MvpExp: 0 Drops: { Rat_Tail: 9000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Feather: 800 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Ora_Ora: 2 Tarou_Card: 1 } @@ -9812,12 +9812,12 @@ mob_db: ( DamageMotion: 768 MvpExp: 0 Drops: { - Executioner's_Mitten: 5 + Executioners_Mitten: 5 Black_Butterfly_Mask: 10 Rose_Quartz: 1500 Tights_: 8 Earring_: 1 - Queen's_Whip: 100 + Queens_Whip: 100 Masquerade: 3 Zherlthsh_Card: 1 } @@ -9863,8 +9863,8 @@ mob_db: ( DamageMotion: 540 MvpExp: 0 Drops: { - Thin_N'_Long_Tongue: 3880 - Executioner's_Mitten: 3 + Thin_N_Long_Tongue: 3880 + Executioners_Mitten: 3 White_Herb: 1800 Oil_Bottle: 300 Frozen_Heart: 10 @@ -9913,8 +9913,8 @@ mob_db: ( DamageMotion: 600 MvpExp: 0 Drops: { - Thin_N'_Long_Tongue: 3880 - Executioner's_Mitten: 4 + Thin_N_Long_Tongue: 3880 + Executioners_Mitten: 4 White_Herb: 1800 Oridecon: 150 Electric_Wire: 100 @@ -9966,7 +9966,7 @@ mob_db: ( DamageMotion: 240 MvpExp: 0 Drops: { - Loki's_Whispers: 1 + Lokis_Whispers: 1 Biotite: 1500 Slayer_: 70 Bastard_Sword_: 40 @@ -10284,7 +10284,7 @@ mob_db: ( MvpExp: 0 Drops: { Claw_Of_Rat: 4656 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Blue_Jewel: 80 Glass_Bead: 110 Lemon: 250 @@ -10794,7 +10794,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 6000 + Wild_Boars_Mane: 6000 Grape: 150 Animal_Blood: 3 Eagle_Eyes: 2 @@ -11430,7 +11430,7 @@ mob_db: ( Yoyo_Tail: 6000 Cacao: 500 Yellow_Herb: 130 - Animal's_Skin: 5500 + Animals_Skin: 5500 Monkey_Doll: 7 Strawberry: 500 Orange: 1000 @@ -11856,7 +11856,7 @@ mob_db: ( White_Herb: 800 Feather: 1000 Panda_Cap: 1 - Bear's_Foot: 5000 + Bears_Foot: 5000 White_Jewel: 30 Elunium_Stone: 90 Sasquatch_Card: 1 @@ -11950,7 +11950,7 @@ mob_db: ( Gift_Box: 10 Dirk_: 10 Buckler_: 5 - Santa's_Hat: 10 + Santas_Hat: 10 Goblin_Card: 1 } }, @@ -12766,8 +12766,8 @@ mob_db: ( Fruit_Shell: 120 Thief_Clothes_: 1 Rotten_Fish: 35 - Monster's_Feed: 600 - Big_Sis'_Ribbon: 2 + Monsters_Feed: 600 + Big_Sis_Ribbon: 2 Wild_Rose_Card: 1 } }, @@ -13460,7 +13460,7 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Alice's_Apron: 2500 + Alices_Apron: 2500 Old_Broom: 40 Chrystal_Pumps: 3 Rotha_Shield: 2 @@ -14121,7 +14121,7 @@ mob_db: ( Oridecon_Stone: 300 Gold: 100 Oridecon: 150 - Queen's_Hair_Ornament: 1 + Queens_Hair_Ornament: 1 Cookbook10: 2 Maya_Puple_Card: 1 } @@ -15012,7 +15012,7 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 4550 + Bears_Foot: 4550 Poo_Poo_Hat: 8 Stuffed_Doll: 120 Honey: 500 @@ -15274,7 +15274,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 3500 + Wild_Boars_Mane: 3500 Grape: 290 Animal_Blood: 6 Eagle_Eyes: 1 @@ -18069,7 +18069,7 @@ mob_db: ( Drops: { Fruit_Of_Mastela: 1500 Chrystal_Pumps: 3 - Boy's_Naivety: 1 + Boys_Naivety: 1 Diamond_Ring: 250 Horn_Of_Succubus: 1 Staff_Of_Soul: 1 @@ -18164,8 +18164,8 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Goat's_Horn: 4559 - Gaoat's_Skin: 2500 + Goats_Horn: 4559 + Gaoats_Skin: 2500 Empty_Bottle: 5000 Red_Herb: 500 Blue_Herb: 1000 @@ -18376,8 +18376,8 @@ mob_db: ( DamageMotion: 470 MvpExp: 0 Drops: { - Harpy's_Feather: 4850 - Harpy's_Claw: 2500 + Harpys_Feather: 4850 + Harpys_Claw: 2500 Yellow_Herb: 1500 Yellow_Herb: 800 Izidor: 20 @@ -18620,10 +18620,10 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 5000 - Animal's_Skin: 5000 + Bears_Foot: 5000 + Animals_Skin: 5000 Nice_Sweet_Potato: 2500 - Odin's_Blessing: 20 + Odins_Blessing: 20 Grizzly_Card: 1 } }, @@ -18764,7 +18764,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Dragon's_Skin: 4074 + Dragons_Skin: 4074 Dragon_Canine: 5335 Dragon_Train: 3880 Dragon_Scale: 3589 @@ -18811,7 +18811,7 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Dragon's_Skin: 4074 + Dragons_Skin: 4074 Dragon_Canine: 5335 Dragon_Train: 3880 Dragon_Scale: 3589 @@ -18864,7 +18864,7 @@ mob_db: ( Great_Nature: 2500 Oridecon_Stone: 300 Damascus_: 5 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Fine_Sand: 1200 Sleeper_Card: 1 } @@ -18909,8 +18909,8 @@ mob_db: ( DamageMotion: 576 MvpExp: 0 Drops: { - Scropion's_Nipper: 4365 - Scorpion's_Tail: 5500 + Scropions_Nipper: 4365 + Scorpions_Tail: 5500 Red_Gemstone: 150 Panacea: 2500 Flame_Heart: 850 @@ -19596,7 +19596,7 @@ mob_db: ( Broken_Shuriken: 5335 Ninja_Suit: 2 Smoke_Powder: 700 - Shinobi's_Sash: 100 + Shinobis_Sash: 100 Thief_Clothes_: 1 Black_Mask: 2000 Murasame_: 5 @@ -19640,7 +19640,7 @@ mob_db: ( DamageMotion: 864 MvpExp: 0 Drops: { - Poison_Toad's_Skin: 5500 + Poison_Toads_Skin: 5500 Poison_Powder: 2400 Gold_Ring: 4 Green_Herb: 540 @@ -19789,7 +19789,7 @@ mob_db: ( DamageMotion: 672 MvpExp: 0 Drops: { - Tengu's_Nose: 3500 + Tengus_Nose: 3500 Broken_Wine_Vessel: 5500 Huuma_Giant_Wheel: 5 Fruit_Of_Mastela: 150 @@ -20328,7 +20328,7 @@ mob_db: ( DamageMotion: 420 MvpExp: 0 Drops: { - Black_Bear's_Skin: 4462 + Black_Bears_Skin: 4462 Mystery_Iron_Bit: 3500 Royal_Jelly: 400 Honey: 900 @@ -23971,7 +23971,7 @@ mob_db: ( DamageMotion: 480 MvpExp: 0 Drops: { - Dullahan's_Helm: 3200 + Dullahans_Helm: 3200 Dullahan_Armor: 4850 An_Eye_Of_Dullahan: 1 Manteau: 13 @@ -24025,7 +24025,7 @@ mob_db: ( Striped_Socks: 3000 Bat_Cage: 5044 Elunium: 100 - Loki's_Whispers: 1 + Lokis_Whispers: 1 Lunatic_Brooch: 5 Sabah_Cloth: 10 Loli_Ruri_Card: 1 @@ -24127,7 +24127,7 @@ mob_db: ( Rusty_Cleaver: 2000 Mr_Scream: 50 Oridecon: 100 - Mama's_Knife: 3 + Mamas_Knife: 3 Ginnungagap: 1 Bloody_Murderer_Card: 1 } @@ -29402,7 +29402,7 @@ mob_db: ( MvpExp: 0 Drops: { Meat: 1000 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Hill_Wind_Card: 1 } }, @@ -29909,7 +29909,7 @@ mob_db: ( Drops: { Armlet_Of_Prisoner: 3000 Carnium: 1 - La'cryma_Stick: 100 + Lacryma_Stick: 100 High_Weapon_Box: 1 Will_Of_Warrior: 200 Pair_Of_Red_Ribbon: 1 @@ -30264,7 +30264,7 @@ mob_db: ( Full_Plate_Armor_: 3500 Grave_: 9000 Brionac: 3500 - Longinus's_Spear: 3000 + Longinuss_Spear: 3000 Dragon_Slayer: 2500 Skewer: 1500 B_Seyren_Card: 1 @@ -30664,7 +30664,7 @@ mob_db: ( Drops: { Armlet_Of_Prisoner: 2000 Forturn_Sword: 1 - Adventurere's_Suit_: 40 + Adventureres_Suit_: 40 Gladius_: 10 Chain_Mail_: 2 Ring_Of_Rogue: 1 @@ -31942,9 +31942,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Harpy's_Feather: 4000 - Harpy's_Claw: 3000 - Monster's_Feed: 1000 + Harpys_Feather: 4000 + Harpys_Claw: 3000 + Monsters_Feed: 1000 Blue_Herb: 10 Hill_Wind_Card: 1 } @@ -32282,7 +32282,7 @@ mob_db: ( Reptile_Tongue: 1000 Leaflet_Of_Hinal: 1000 Green_Herb: 1000 - Monster's_Feed: 2000 + Monsters_Feed: 2000 Aloebera: 10 Melon: 500 Green_Iguana_Card: 1 @@ -32816,7 +32816,7 @@ mob_db: ( Bookclip_In_Memory: 300 Legend_Of_Kafra01: 50 Bloody_Page: 500 - Vidar's_Boots: 10 + Vidars_Boots: 10 Cookbook08: 2 Cookbook09: 1 Deathword_Card: 1 @@ -33137,7 +33137,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Blue: 10000 Old_Card_Album: 10 - Goibne's_Shoulder_Arms: 1000 + Goibnes_Shoulder_Arms: 1000 Tha_Odium_Card: 1 } }, @@ -33191,7 +33191,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Red: 10000 Old_Card_Album: 10 - Goibne's_Combat_Boots: 1000 + Goibnes_Combat_Boots: 1000 Tha_Despero_Card: 1 } }, @@ -33245,7 +33245,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Purple: 10000 Old_Card_Album: 10 - Goibne's_Armor: 1000 + Goibnes_Armor: 1000 Tha_Maero_Card: 1 } }, @@ -33299,7 +33299,7 @@ mob_db: ( Crystal_Jewel__: 100 Piece_Of_Memory_Green: 10000 Old_Card_Album: 10 - Goibne's_Helmet: 1000 + Goibnes_Helmet: 1000 Tha_Dolor_Card: 1 } }, @@ -33354,7 +33354,7 @@ mob_db: ( } Drops: { Treasure_Box: 1000 - Morrigane's_Manteau: 1000 + Morriganes_Manteau: 1000 Piece_Of_Bone_Armor: 5000 Full_Plate_Armor_: 5000 Grave_: 5000 @@ -33652,7 +33652,7 @@ mob_db: ( Drops: { Black_wing_Brooch: 10 Dragon_Canine: 1000 - Dragon's_Skin: 1000 + Dragons_Skin: 1000 Dragon_Scale: 2000 Dragonball_Red: 800 Flame_Heart: 20 @@ -33902,8 +33902,8 @@ mob_db: ( Crystal_Jewel__: 2000 } Drops: { - Morpheus's_Armlet: 1000 - Morpheus's_Ring: 1000 + Morpheuss_Armlet: 1000 + Morpheuss_Ring: 1000 Treasure_Box: 5000 Scale_Of_Red_Dragon: 3589 Int_Dish10: 1000 @@ -33957,11 +33957,11 @@ mob_db: ( DamageMotion: 432 MvpExp: 0 Drops: { - Dragon's_Skin: 4000 + Dragons_Skin: 4000 Dragon_Canine: 4000 Tri_Headed_Dragon_Head: 3880 - Morpheus's_Hood: 500 - Morrigane's_Helm: 500 + Morpheuss_Hood: 500 + Morriganes_Helm: 500 Vit_Dish10: 300 Fricca_Circlet: 500 Hydro_Card: 1 @@ -34545,11 +34545,11 @@ mob_db: ( Drops: { Pocket_Watch: 3000 Old_Violet_Box: 3000 - Morrigane's_Pendant: 1000 + Morriganes_Pendant: 1000 Glittering_Clothes: 1000 Survival_Rod_: 500 Counter_Dagger: 500 - Morrigane's_Belt: 1000 + Morriganes_Belt: 1000 Kiel_Card: 1 } }, @@ -34600,7 +34600,7 @@ mob_db: ( Smoke_Powder: 200 Drill_Katar: 5 Elunium: 10 - Vali's_Manteau: 20 + Valis_Manteau: 20 Alicel_Card: 1 } }, @@ -34693,9 +34693,9 @@ mob_db: ( MvpExp: 0 Drops: { Brigan: 4000 - Morpheus's_Shawl: 10 + Morpheuss_Shawl: 10 Rosary_: 10 - Alice's_Apron: 5 + Alices_Apron: 5 Imperial_Cooking_Kits: 50 Sway_Apron: 1 Orleans_Server: 5 @@ -35458,7 +35458,7 @@ mob_db: ( Divine_Cross: 25 Rune_Of_Darkness: 1000 Silk_Robe_: 100 - Odin's_Blessing: 100 + Odins_Blessing: 100 Skeggiold_Card: 1 } }, @@ -35512,7 +35512,7 @@ mob_db: ( Divine_Cross: 25 Rune_Of_Darkness: 1000 Silk_Robe_: 100 - Odin's_Blessing: 100 + Odins_Blessing: 100 Skeggiold_Card: 1 } }, @@ -35943,7 +35943,7 @@ mob_db: ( Drops: { Valhalla_Flower: 160 Old_Violet_Box: 40 - Valkyrja's_Shield: 100 + Valkyrjas_Shield: 100 } }, { @@ -36783,7 +36783,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Wind_Of_Verdure: 50 Combo_Battle_Glove: 2 Roween_Card: 1 @@ -36831,7 +36831,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Rough_Wind: 10 Ulfhedinn: 5 Galion_Card: 1 @@ -39417,7 +39417,7 @@ mob_db: ( Drops: { Great_Nature: 30 Coal: 150 - Elder_Pixie's_Beard: 5500 + Elder_Pixies_Beard: 5500 Elven_Ears: 1 Carnium: 10 Thorny_Buckler: 3 @@ -40377,7 +40377,7 @@ mob_db: ( Acorn: 9000 Hood_: 20 Fluff: 3000 - Animal's_Skin: 2500 + Animals_Skin: 2500 Sweet_Potato: 500 Sandals_: 25 Sweet_Bean: 600 @@ -40671,12 +40671,12 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Monster's_Feed: 5000 + Monsters_Feed: 5000 Tooth_Blade: 10 Wild_Beast_Claw: 10 Skel_Bone: 4500 Well_Dried_Bone: 20 - Animal's_Skin: 5500 + Animals_Skin: 5500 Pet_Food: 400 Hell_Poodle_Card: 1 } @@ -47125,7 +47125,7 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Cowking's_Nose_Ring: 10000 + Cowkings_Nose_Ring: 10000 } }, { @@ -47303,8 +47303,8 @@ mob_db: ( DamageMotion: 504 MvpExp: 0 Drops: { - Dragon's_Mane: 3000 - Dragon's_Skin: 100 + Dragons_Mane: 3000 + Dragons_Skin: 100 Dragon_Canine: 100 Dragon_Train: 1000 Dragon_Scale: 1000 @@ -48120,7 +48120,7 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Pope's_Cookie: 5000 + Popes_Cookie: 5000 } }, { @@ -48168,7 +48168,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Pope's_Cookie: 5000 + Popes_Cookie: 5000 } }, { @@ -49847,7 +49847,7 @@ mob_db: ( Tooth_Of_Ancient_Fish: 500 Lip_Of_Ancient_Fish: 500 Scalpel: 1 - Fisherman's_Dagger: 5 + Fishermans_Dagger: 5 } }, { @@ -49939,7 +49939,7 @@ mob_db: ( Drops: { Leopard_Skin: 3000 Leopard_Talon: 2000 - Animal's_Skin: 1000 + Animals_Skin: 1000 Oridecon_Stone: 40 Claw_: 1 } @@ -50986,7 +50986,7 @@ mob_db: ( DamageMotion: 432 MvpExp: 1005 MvpDrops: { - Tiger's_Skin: 5000 + Tigers_Skin: 5000 Tiger_Footskin: 3000 Tiger_Footskin: 3000 } @@ -51999,7 +51999,7 @@ mob_db: ( Full_Plate_Armor_: 3500 Splendid_Box: 200 Brionac: 3500 - Longinus's_Spear: 3000 + Longinuss_Spear: 3000 Dragon_Slayer: 2500 Skewer: 1500 } @@ -54896,7 +54896,7 @@ mob_db: ( Crystal_Blue: 30 Worm_Peelings: 5500 Garlet: 400 - Monster's_Feed: 500 + Monsters_Feed: 500 Insect_Feeler: 450 Earthworm_The_Dude: 20 Low_Coin_Pocket: 4 @@ -60756,7 +60756,7 @@ mob_db: ( Drops: { Brigan: 2000 Beautiful_Flower: 2000 - Monster's_Feed: 2000 + Monsters_Feed: 2000 Insideout_Shirt: 200 Engkanto_Card: 1 } @@ -67332,8 +67332,8 @@ mob_db: ( Claw_Of_Wolves: 9000 Mantle_: 10 Wing_Of_Fly: 650 - Monster's_Feed: 150 - Animal's_Skin: 5500 + Monsters_Feed: 150 + Animals_Skin: 5500 Strawberry: 600 Wolf_Card: 1 } @@ -67479,8 +67479,8 @@ mob_db: ( Fruit_Shell: 120 Thief_Clothes_: 1 Rotten_Fish: 35 - Monster's_Feed: 600 - Big_Sis'_Ribbon: 2 + Monsters_Feed: 600 + Big_Sis_Ribbon: 2 Wild_Rose_Card: 1 } }, @@ -68547,9 +68547,9 @@ mob_db: ( MvpExp: 0 Drops: { Rat_Tail: 9000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Feather: 800 - Monster's_Feed: 1000 + Monsters_Feed: 1000 Ora_Ora: 2 Tarou_Card: 1 } @@ -69325,7 +69325,7 @@ mob_db: ( MvpExp: 0 Drops: { Raccoon_Leaf: 5500 - Animal's_Skin: 5500 + Animals_Skin: 5500 Sweet_Potato: 800 Cat_Hairband: 1 Raccoondog_Doll: 2 @@ -69379,7 +69379,7 @@ mob_db: ( Great_Nature: 2500 Oridecon_Stone: 300 Damascus_: 5 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Fine_Sand: 1200 Sleeper_Card: 1 } @@ -69429,7 +69429,7 @@ mob_db: ( Great_Nature: 2500 Oridecon_Stone: 300 Damascus_: 5 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Fine_Sand: 1200 Sleeper_Card: 1 } @@ -69829,7 +69829,7 @@ mob_db: ( Broken_Shuriken: 5335 Ninja_Suit: 2 Smoke_Powder: 700 - Shinobi's_Sash: 100 + Shinobis_Sash: 100 Thief_Clothes_: 1 Black_Mask: 2000 Murasame_: 5 @@ -70128,7 +70128,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 70 - Scorpion's_Tail: 5500 + Scorpions_Tail: 5500 Elunium_Stone: 57 Solid_Shell: 210 Wing_Of_Fly: 100 @@ -70173,7 +70173,7 @@ mob_db: ( DamageMotion: 576 MvpExp: 0 Drops: { - Animal's_Skin: 9000 + Animals_Skin: 9000 Axe_: 100 Meat: 500 Wing_Of_Fly: 1 @@ -70220,7 +70220,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 9000 + Wild_Boars_Mane: 9000 Grape: 300 Animal_Blood: 2 Eagle_Eyes: 1 @@ -70267,7 +70267,7 @@ mob_db: ( DamageMotion: 384 MvpExp: 0 Drops: { - Wild_Boar's_Mane: 9000 + Wild_Boars_Mane: 9000 Grape: 300 Animal_Blood: 2 Eagle_Eyes: 1 @@ -70323,7 +70323,7 @@ mob_db: ( Fine_Sand: 350 Sparkling_Dust: 200 Katar_Of_Thornbush: 1 - Hypnotist's_Staff_: 5 + Hypnotists_Staff_: 5 Sand_Man_Card: 1 } }, @@ -70470,7 +70470,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Wind_Of_Verdure: 50 Combo_Battle_Glove: 2 Roween_Card: 1 @@ -70601,7 +70601,7 @@ mob_db: ( DamageMotion: 540 MvpExp: 0 Drops: { - Grasshopper's_Leg: 9000 + Grasshoppers_Leg: 9000 Wing_Of_Fly: 10000 Green_Feeler: 4 Javelin_: 80 @@ -71781,7 +71781,7 @@ mob_db: ( DamageMotion: 864 MvpExp: 0 Drops: { - Poison_Toad's_Skin: 5500 + Poison_Toads_Skin: 5500 Poison_Powder: 2400 Gold_Ring: 4 Green_Herb: 540 @@ -72029,7 +72029,7 @@ mob_db: ( Tooth_Of_Ancient_Fish: 500 Lip_Of_Ancient_Fish: 500 Scalpel: 1 - Fisherman's_Dagger: 5 + Fishermans_Dagger: 5 } }, { @@ -74218,7 +74218,7 @@ mob_db: ( MvpExp: 0 Drops: { Boody_Red: 60 - Grasshopper's_Leg: 6500 + Grasshoppers_Leg: 6500 Scell: 400 Elunium_Stone: 49 Singing_Plant: 20 @@ -75202,7 +75202,7 @@ mob_db: ( Striped_Socks: 3000 Bat_Cage: 5044 Elunium: 100 - Loki's_Whispers: 1 + Lokis_Whispers: 1 Lunatic_Brooch: 5 Sabah_Cloth: 100 Loli_Ruri_Card: 1 @@ -75486,7 +75486,7 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 4550 + Bears_Foot: 4550 Poo_Poo_Hat: 8 Stuffed_Doll: 120 Honey: 500 @@ -75680,7 +75680,7 @@ mob_db: ( Drops: { Great_Nature: 30 Coal: 150 - Elder_Pixie's_Beard: 5500 + Elder_Pixies_Beard: 5500 Elven_Ears: 1 Carnium: 10 Thorny_Buckler: 3 @@ -76506,9 +76506,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Harpy's_Feather: 4000 - Harpy's_Claw: 3000 - Monster's_Feed: 1000 + Harpys_Feather: 4000 + Harpys_Claw: 3000 + Monsters_Feed: 1000 Blue_Herb: 10 Hill_Wind_Card: 1 } @@ -76553,9 +76553,9 @@ mob_db: ( DamageMotion: 360 MvpExp: 0 Drops: { - Harpy's_Feather: 4000 - Harpy's_Claw: 3000 - Monster's_Feed: 1000 + Harpys_Feather: 4000 + Harpys_Claw: 3000 + Monsters_Feed: 1000 Blue_Herb: 10 Hill_Wind_Card: 1 } @@ -76653,8 +76653,8 @@ mob_db: ( DamageMotion: 470 MvpExp: 0 Drops: { - Harpy's_Feather: 4850 - Harpy's_Claw: 2500 + Harpys_Feather: 4850 + Harpys_Claw: 2500 Yellow_Herb: 1500 Yellow_Herb: 800 Izidor: 20 @@ -76703,8 +76703,8 @@ mob_db: ( DamageMotion: 470 MvpExp: 0 Drops: { - Harpy's_Feather: 4850 - Harpy's_Claw: 2500 + Harpys_Feather: 4850 + Harpys_Claw: 2500 Yellow_Herb: 1500 Yellow_Herb: 800 Izidor: 20 @@ -76753,7 +76753,7 @@ mob_db: ( Reptile_Tongue: 1000 Leaflet_Of_Hinal: 1000 Green_Herb: 1000 - Monster's_Feed: 2000 + Monsters_Feed: 2000 Aloebera: 10 Melon: 500 Green_Iguana_Card: 1 @@ -77086,8 +77086,8 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Goat's_Horn: 4559 - Gaoat's_Skin: 2500 + Goats_Horn: 4559 + Gaoats_Skin: 2500 Empty_Bottle: 5000 Red_Herb: 500 Blue_Herb: 1000 @@ -77134,8 +77134,8 @@ mob_db: ( DamageMotion: 336 MvpExp: 0 Drops: { - Goat's_Horn: 4559 - Gaoat's_Skin: 2500 + Goats_Horn: 4559 + Gaoats_Skin: 2500 Empty_Bottle: 5000 Red_Herb: 500 Blue_Herb: 1000 @@ -77731,7 +77731,7 @@ mob_db: ( MvpExp: 0 Drops: { Rotten_Meat: 3000 - Animal's_Skin: 3000 + Animals_Skin: 3000 Rough_Wind: 10 Ulfhedinn: 5 Galion_Card: 1 @@ -78759,8 +78759,8 @@ mob_db: ( DamageMotion: 504 MvpExp: 0 Drops: { - Dragon's_Mane: 3000 - Dragon's_Skin: 100 + Dragons_Mane: 3000 + Dragons_Skin: 100 Dragon_Canine: 100 Dragon_Train: 1000 Dragon_Scale: 1000 @@ -79060,8 +79060,8 @@ mob_db: ( MvpExp: 0 Drops: { Phracon: 85 - Animal's_Skin: 5500 - Adventurere's_Suit_: 80 + Animals_Skin: 5500 + Adventureres_Suit_: 80 Wing_Of_Fly: 200 Cotton_Shirt: 200 Asura_: 5 @@ -79107,8 +79107,8 @@ mob_db: ( MvpExp: 0 Drops: { Phracon: 85 - Animal's_Skin: 5500 - Adventurere's_Suit_: 80 + Animals_Skin: 5500 + Adventureres_Suit_: 80 Wing_Of_Fly: 200 Cotton_Shirt: 200 Asura_: 5 @@ -79210,7 +79210,7 @@ mob_db: ( Bookclip_In_Memory: 300 Legend_Of_Kafra01: 50 Bloody_Page: 500 - Vidar's_Boots: 10 + Vidars_Boots: 10 Cookbook08: 2 Cookbook09: 1 Deathword_Card: 1 @@ -79262,7 +79262,7 @@ mob_db: ( Bookclip_In_Memory: 300 Legend_Of_Kafra01: 50 Bloody_Page: 500 - Vidar's_Boots: 10 + Vidars_Boots: 10 Cookbook08: 2 Cookbook09: 1 Deathword_Card: 1 @@ -79314,7 +79314,7 @@ mob_db: ( Bookclip_In_Memory: 300 Legend_Of_Kafra01: 50 Bloody_Page: 500 - Vidar's_Boots: 10 + Vidars_Boots: 10 Cookbook08: 2 Cookbook09: 1 Deathword_Card: 1 @@ -79693,7 +79693,7 @@ mob_db: ( Drops: { Acorn: 9000 Fluff: 10000 - Animal's_Skin: 10000 + Animals_Skin: 10000 Sweet_Potato: 10000 Wing_Of_Fly: 10000 Sandals_: 25 @@ -79739,7 +79739,7 @@ mob_db: ( MvpExp: 0 Drops: { Fluff: 3333 - Animal's_Skin: 3333 + Animals_Skin: 3333 Acorn: 10000 Wing_Of_Fly: 2500 Sweet_Potato: 500 @@ -80186,7 +80186,7 @@ mob_db: ( Drops: { Porcupine_Spike: 9000 Coat_: 5 - Animal's_Skin: 5500 + Animals_Skin: 5500 Glaive_: 10 Spear_: 15 Pike_: 20 @@ -80480,9 +80480,9 @@ mob_db: ( DamageMotion: 192 MvpExp: 0 Drops: { - Bear's_Foot: 9000 + Bears_Foot: 9000 Poo_Poo_Hat: 5 - Animal's_Skin: 5000 + Animals_Skin: 5000 Wing_Of_Fly: 80 Sweet_Potato: 1500 Honey: 450 @@ -81524,7 +81524,7 @@ mob_db: ( MvpExp: 0 Drops: { Crystal_Blue: 50 - Snail's_Shell: 9000 + Snails_Shell: 9000 Garlet: 1200 Shell: 3000 Wing_Of_Fly: 2 @@ -81666,9 +81666,9 @@ mob_db: ( MvpExp: 0 Drops: { Brigan: 4000 - Morpheus's_Shawl: 10 + Morpheuss_Shawl: 10 Rosary_: 10 - Alice's_Apron: 5 + Alices_Apron: 5 Imperial_Cooking_Kits: 50 Sway_Apron: 1 Orleans_Server: 5 @@ -81722,7 +81722,7 @@ mob_db: ( Smoke_Powder: 200 Drill_Katar: 5 Elunium: 10 - Vali's_Manteau: 20 + Valis_Manteau: 20 Alicel_Card: 1 } }, diff --git a/db/re/mob_race2_db.txt b/db/re/mob_race2_db.txt index 97b6d46f1..ac90caf1c 100644 --- a/db/re/mob_race2_db.txt +++ b/db/re/mob_race2_db.txt @@ -13,7 +13,7 @@ 4,1040,1278,1366,1497,2024 // Guardians 5,1285,1286,1287 -// Ninja Classes (Pirate's_Pride) +// Ninja Classes (Pirates_Pride) 6,1315,1364,1401,1560 // Scarabas 7,2083,2084,2085,2086,2087,2088,2089,2090,2091,2144,2145 diff --git a/db/re/skill_db.conf b/db/re/skill_db.conf index dd7ebe87a..8eb2b40fa 100644 --- a/db/re/skill_db.conf +++ b/db/re/skill_db.conf @@ -21919,7 +21919,7 @@ skill_db: ( Requirements: { SPCost: 5 Items: { - Wolf's_Flute: 0 + Wolfs_Flute: 0 } } }, diff --git a/db/skill_changematerial_db.txt b/db/skill_changematerial_db.txt index 3fb92139e..083b512f4 100644 --- a/db/skill_changematerial_db.txt +++ b/db/skill_changematerial_db.txt @@ -48,7 +48,7 @@ 1035,1000,8,800,12,200 // Dragon_Canine 1037,800,6,1000 // Dragon_Train 1038,1000,1,1000 // Petite_Dablofs_Horn -1040,1000,8,800,12,200 // Elder_Pixie's_Beard +1040,1000,8,800,12,200 // Elder_Pixies_Beard 1041,800,3,1000 // Lantern 1042,800,6,1000 // Short_Leg 1043,800,6,1000 // Nail_Of_Orc diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index ecd6f8b6b..f2820b3b0 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -777,7 +777,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ mes "Due to a change in customer support policy, we no longer accept Kafra Passes. However, we are offering refunds for our customers who still possess these passes."; next; if (select("Sell Kafra Pass", "Alright, bye~") == 1) { - if (countitem(Kapra's_Pass) == 0) { + if (countitem(Kapras_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry,"; mes "but you don't"; @@ -787,27 +787,27 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ end; } else { - .@kafrapassmoney = countitem(Kapra's_Pass)*2000; + .@kafrapassmoney = countitem(Kapras_Pass)*2000; mes "[Kafra Pavianne]"; mes "Let's see..."; - if (countitem(Kapra's_Pass) == 1) { + if (countitem(Kapras_Pass) == 1) { mes "You have 1 Kafra Pass."; mes "You can sell that pass to us for 2000 zeny. Would you like to sell this Kafra Pass back to the Kafra Corporation?"; } else { - mes "You have "+ countitem(Kapra's_Pass) +" Kafra Passes."; + mes "You have "+ countitem(Kapras_Pass) +" Kafra Passes."; mes "If you want to sell them to us, you will receive "+ .@kafrapassmoney +" zeny. Would you like to sell these back to the Kafra Corporation?"; } next; if (select("Yes", "No") == 1) { - if (countitem(Kapra's_Pass) == 0) { + if (countitem(Kapras_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry, but you don't have any Kafra Passes."; close2; cutin "",255; end; } - delitem Kapra's_Pass,countitem(Kapra's_Pass); + delitem Kapras_Pass,countitem(Kapras_Pass); Zeny += .@kafrapassmoney; mes "[Kafra Pavianne]"; mes "Thank you."; diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index c02122c3f..555fd4c93 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -16,16 +16,16 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ if (hascashmount()) { message strcharinfo(PC_NAME),"You must first remove your mount."; end; - } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) { + } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolfs_Flute)) { if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { if (select(" ~ Falcon", " ~ Warg") == 1) setfalcon; else - getitem Wolf's_Flute, 1; + getitem Wolfs_Flute, 1; specialeffect2 EF_TEIHIT3; close; } else { - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; } } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index fa1e61eac..9f9e509f4 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -70,7 +70,7 @@ L_MAKE: mes "[Bearded Man]"; mes "Let's make you your beard!"; next; - if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || + if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS; delitem 7200, 1; delitem 919, 1; diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt index dca4fdfd8..02e650e78 100644 --- a/npc/custom/quests/elvenear.txt +++ b/npc/custom/quests/elvenear.txt @@ -36,7 +36,7 @@ geffen,127,49,5 script Elven Ears Quest 4_M_02,{ mes "[Elven Ears quest]"; mes "Good good, let me just check"; next; - if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) { + if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) { mes "[Elven Ears Quest]"; mes "You don't have the requirements."; mes "Please come back another time..."; diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt index 593293a69..50110ff52 100644 --- a/npc/custom/quests/event_6_new_hats.txt +++ b/npc/custom/quests/event_6_new_hats.txt @@ -194,13 +194,13 @@ prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{ mes "Oh, dear. You need 10 Steels..."; close; } - if (countitem(Bear's_Foot) < 200) { + if (countitem(Bears_Foot) < 200) { mes "[Jac]"; mes "Oh, dear. You need 200 Bear Footskins..."; close; } delitem Steel,10;//Items: Steel, - delitem Bear's_Foot,200; //Items: Bears Footskin, + delitem Bears_Foot,200; //Items: Bears Footskin, mes "[Jac]"; mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment."; next; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index beea787a1..a1864f96f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -62,10 +62,10 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ next; if (select("Yeah.", "Nay." != 1)) break; - if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, + if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty, delitem Tiger_Mask,1;//Items: Tiger_Mask, - delitem Tiger_Footskin,10;//Items: Tiger's_Footskin, - delitem Tiger's_Skin,30;//Items: Tiger_Skin, + delitem Tiger_Footskin,10;//Items: Tiger_Footskin, + delitem Tigers_Skin,30;//Items: Tiger_Skin, delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty, getitem Lion_Mask,1;//Items: Lion_Mask, mes "[Yakima]"; @@ -95,7 +95,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ delitem Manteau_,2;//Items: Manteau_, delitem Skul_Ring,3;//Items: Skull_Ring, delitem Old_Manteau,10;//Items: Old_Manteau, - getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau, + getitem Skeletons_Cape,1;//Items: Skeleton_Manteau, mes "[Yakima]"; mes "Thank you very very much!"; mes callfunc("F_Bye"); diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index bc81fb24b..c0eb1427a 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -228,7 +228,7 @@ N_QuestStart: ///////Job list 3/////// //3-1; moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{ - if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp; + if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp; if (three_qset == 1) goto N_QuestStart; mes "[Clark]"; mes "Love to chat, but I'm waiting for someone."; @@ -456,7 +456,7 @@ N_QuestStart: ///////Job list 5/////// //5-1; prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{ - if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp; + if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp; if (five_qset == 1) goto N_QuestStart; mes "[Lithin]"; mes "Well hello."; @@ -975,7 +975,7 @@ N_QuestStart: } //10-2; pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{ - if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp; + if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp; if (ten_qset == 2) goto N_QuestStart; mes "[Man]"; mes "Sorry I'm waiting for someone, you will have to come back later"; @@ -995,12 +995,12 @@ N_QuestStart: mes "[Man]"; mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!"; mes " "; - mes "Bring me back 1 Tiger's_Skin!"; + mes "Bring me back 1 Tiger's Skin!"; close; } //10-3; cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{ - if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp; + if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp; if (ten_qset == 3) goto N_QuestStart; mes "[Caral]"; mes "Sorry I'm waiting for someone, you will have to come back later."; diff --git a/npc/dev/test.txt b/npc/dev/test.txt index ee2bda259..b711a0a28 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -606,7 +606,7 @@ function script HerculesSelfTestHelper { callsub(OnCheck, "'PORING' mob ID", PORING, 1002); callsub(OnCheck, "'NV_BASIC' skill ID", NV_BASIC, 1); callsub(OnCheck, "'Red_Potion' item ID", Red_Potion, 501); - callsub(OnCheck, "'Monster's_Feed' item ID", Monster's_Feed, 528); + callsub(OnCheck, "'Monsters_Feed' item ID", Monsters_Feed, 528); // setd/getd diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 795b50256..0a631cfb6 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -64,7 +64,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{ mes ""; emotion e_lv; next; - if (countitem(Santa's_Hat) > 0) { + if (countitem(Santas_Hat) > 0) { if (select("Here.", "It's ok.") == 1) { mes "[Designer Louise Kim]"; mes "Nice choice!!"; @@ -160,11 +160,11 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{ mes "~Who would be happier than~"; mes "~being with Louise.~"; emotion e_ho; - delitem Santa's_Hat,1; + delitem Santas_Hat,1; delitem Cactus_Needle,1; delitem Holy_Water,10; delitem Rosary,1; - getitem Santa's_Hat_,1; + getitem Santas_Hat_,1; close; } else { @@ -1370,7 +1370,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ emotion e_heh; delitem Worn_Out_Page,1; christ_carol05 = 3; - getitem Santa's_Hat,1; + getitem Santas_Hat,1; close; } } diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 5f971049f..8b1c9e9d3 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -589,7 +589,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 3: setarray .@items[0], 1003,1, 935,2, 990,2, 1119,1, 6; changequest 2002,2005; break; //Iron_Ore, Eye_Bandage, Blue_Gemstone, Arbalest case 4: setarray .@items[0], 1002,1, 2212,1, 717,2, 1713,1, 7; changequest 2002,2006; break; - //Iron, Green_Herb, Animal's_Skin, Ring_Pommel_Saber + //Iron, Green_Herb, Animals_Skin, Ring_Pommel_Saber default: setarray .@items[0], 998,1, 511,1, 919,2, 1122,1, 8; changequest 2002,2007; break; } BSMITH_Q = .@items[8]; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 609ea56de..76b3c4b39 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -495,13 +495,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{ case 1: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break; //Bill_Of_Birds, Skel_Bone, Green_Herb case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break; - //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb + //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb case 3: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break; //Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff case 4: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 6; changequest 4001,4005; break; //Shell, Worm_Peelings, Yellow_Herb case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break; - //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot + //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break; //Porcupine_Spike, Yoyo_Tail, Acorn case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break; @@ -525,13 +525,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{ case 3: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 10; break; //Bill_Of_Birds, Skel_Bone, Green_Herb case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break; - //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb + //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb case 5: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 10; break; //Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff case 6: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 10; break; //Shell, Worm_Peelings, Yellow_Herb case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break; - //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot + //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break; //Porcupine_Spike, Yoyo_Tail, Acorn case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index b5afe995d..f75d0ea46 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -573,9 +573,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{ next; mes "[Sir Andrew]"; switch(rand(1,2)) { - //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane + //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane case 1: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 2; break; - //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell + //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell case 2: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 3; break; } KNIGHT_Q = .@items[12]; @@ -610,9 +610,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{ mes "Let's check and see..."; next; switch(KNIGHT_Q) { - //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane + //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane case 2: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 0; break; - //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell + //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell case 3: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 0; break; } if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5] && countitem(.@items[6]) >= .@items[7] && countitem(.@items[8]) >= .@items[9] && countitem(.@items[10]) >= .@items[11]) { diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index d5edd8bf2..634e0753b 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -715,7 +715,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Buckler), getitemname(Coat), getitemname(Gas_Mask), - getitemname(Big_Sis'_Ribbon), + getitemname(Big_Sis_Ribbon), getitemname(Fillet), getitemname(Sahkkat), getitemname(Glasses)); @@ -1690,7 +1690,7 @@ alde_alche,79,19,5 script Experiment Expert#am 4_M_ALCHE_A,{ "a %s?", getitemname(Mixture)); next; - select(getitemname(Monster's_Feed), + select(getitemname(Monsters_Feed), getitemname(Lip_Of_Ancient_Fish), getitemname(Rotten_Bandage)); mes "[Van Helmont]"; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 442014649..631da5f7d 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -594,14 +594,14 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ mes "[Sensei Moohae]"; mes "Hmm?"; next; - if (countitem(Tooth_Of_Bat) > 9 && countitem(Bear's_Foot) > 4 && countitem(Poison_Spore) > 19) { + if (countitem(Tooth_Of_Bat) > 9 && countitem(Bears_Foot) > 4 && countitem(Poison_Spore) > 19) { mes "[Sensei Moohae]"; mes "Excellent, all the items I asked for."; mes "I will tell this to the elders."; MONK_Q = 10; changequest 3022,3024; delitem Tooth_Of_Bat,10; - delitem Bear's_Foot,5; + delitem Bears_Foot,5; delitem Poison_Spore,20; next; mes "[Sensei Moohae]"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 5c6fd13cd..311915097 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -674,8 +674,8 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10; else if (ROGUE_Q == 6) { if (Zeny > 9999 && countitem(Chrysalis) > 4 && countitem(Empty_Bottle) > 4 && countitem(Iron_Ore) > 4 && - countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animal's_Skin) > 4 && countitem(Yellow_Gemstone) > 4 && - countitem(Tooth_Of_Bat) > 4 && countitem(Scorpion's_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monster's_Feed) > 4 && + countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animals_Skin) > 4 && countitem(Yellow_Gemstone) > 4 && + countitem(Tooth_Of_Bat) > 4 && countitem(Scorpions_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monsters_Feed) > 4 && countitem(Fluff) > 4 && countitem(Clover) > 4 && countitem(Feather_Of_Birds) > 4 && countitem(Talon) > 4 && countitem(Spawn) > 4 && countitem(Raccoon_Leaf) > 4) { mes "[Mr. Smith]"; @@ -686,12 +686,12 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ delitem Iron_Ore,5; delitem Stone_Heart,5; delitem Red_Herb,5; - delitem Animal's_Skin,5; + delitem Animals_Skin,5; delitem Yellow_Gemstone,5; delitem Tooth_Of_Bat,5; - delitem Scorpion's_Tail,5; + delitem Scorpions_Tail,5; delitem Yoyo_Tail,5; - delitem Monster's_Feed,5; + delitem Monsters_Feed,5; delitem Fluff,5; delitem Clover,5; delitem Feather_Of_Birds,5; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 4c5424f9a..cb5492046 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -1494,9 +1494,9 @@ yuno_in03,62,176,2 script History Professor#sa 4_M_MANAGER,{ } } else if (SAGE_Q == 10) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; @@ -2045,9 +2045,9 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ close; } else if (SAGE_Q == 12) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; @@ -2368,9 +2368,9 @@ yuno_in03,244,31,3 script Physics Professor#sa 2_M_PHARMACIST,{ } } else if (SAGE_Q == 14) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index d4b623031..b215bd6d8 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -53,7 +53,7 @@ alberta_in,165,96,0 trader Item Collector#alb 1_F_MERCHANT_02,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } alberta_in,180,15,0 trader Armor Dealer#alb 4W_F_01,{ @@ -68,7 +68,7 @@ OnInit: sellitem Manteau; sellitem Glasses; sellitem Sunglasses; - sellitem Diver's_Goggles; + sellitem Divers_Goggles; sellitem Cap; sellitem Cotton_Shirt; sellitem Leather_Jacket; @@ -507,7 +507,7 @@ ein_in01,119,26,4 trader Weapon Dealer#ein 4_M_EINMAN,{ OnInit: sellitem Kindling_Dagger; sellitem Obsidian_Dagger; - sellitem Fisherman's_Dagger; + sellitem Fishermans_Dagger; sellitem Jujube_Dagger; } @@ -707,7 +707,7 @@ OnInit: sellitem Blue_Gemstone; sellitem Sunglasses; sellitem Garlet; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } hu_in01,100,390,3 trader Bow Dealer#hu 4_M_04,{ @@ -1103,7 +1103,7 @@ OnInit: sellitem Scell; sellitem Garlet; sellitem Zargon; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } //== Louyang =============================================== @@ -1216,16 +1216,16 @@ OnInit: moc_ruins,93,53,2 trader Item Collector#moc1 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } moc_ruins,81,113,0 trader Item Collector#moc2 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } @@ -1408,7 +1408,7 @@ OnInit: sellitem Pumpkin; sellitem Pumpkin_Head; sellitem Tree_Root; - sellitem Goat's_Horn; + sellitem Goats_Horn; sellitem Pet_Food; sellitem Poison_Powder; sellitem Single_Cell; @@ -1480,7 +1480,7 @@ OnInit: prontera,64,125,0 trader Butcher#prt 4_M_BARBER,{ OnInit: sellitem Meat; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } prontera,58,182,0 trader Flower Girl#prt 4W_KID,{ @@ -1701,7 +1701,7 @@ OnInit: sellitem Sweet_Potato; sellitem Banana; sellitem Meat; - sellitem Monster's_Feed; + sellitem Monsters_Feed; sellitem Pet_Food; sellitem Wing_Of_Fly; sellitem Wing_Of_Butterfly; diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 9f2b7525e..e09fd90c0 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -188,11 +188,11 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ close; } */ - if (countitem(Goat's_Horn) > 49) { + if (countitem(Goats_Horn) > 49) { mes "[Vegetable Farmer]"; mes "Amazing, you did that with speed."; mes "I am truly grateful."; - delitem Goat's_Horn,50; + delitem Goats_Horn,50; getexp 258489,155155; //getitem White_Potion,10; close; diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 83e7e2ea4..3b97f60ee 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -429,7 +429,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ goto L_End; } else if (cooking_q == 1) { - if (countitem(Grasshopper's_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) { + if (countitem(Grasshoppers_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) { cutin "orleans_4",0; emotion e_an; mes "[Charles Orleans]"; @@ -462,7 +462,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "know this recipe now. That's"; mes "all for today, so please go"; mes "and practice on your own now."; - delitem Grasshopper's_Leg,5; + delitem Grasshoppers_Leg,5; delitem Old_Frying_Pan,1; delitem Cooking_Oil,1; cooking_q = 7; diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt index 63fdccf16..7b0911f37 100644 --- a/npc/quests/doomed_swords.txt +++ b/npc/quests/doomed_swords.txt @@ -723,7 +723,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "Mysteltainn twig used to kill Baldur. Hurry and bring it..."; close; } - if (countitem(Loki's_Whispers) < 1) { + if (countitem(Lokis_Whispers) < 1) { mes "[Mysterious Blacksmith]"; mes "Hm. You forgot to bring"; mes "^0099FF1 Loki's Whispers^000000. We need"; @@ -732,7 +732,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "find that as quickly as you can! "; close; } - if (countitem(Mother's_Nightmare) < 1) { + if (countitem(Mothers_Nightmare) < 1) { mes "[Mysterious Blacksmith]"; mes "Hm, you still need to"; mes "bring ^0099FF1 Mother's Nightmare^000000"; @@ -758,7 +758,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "of wielding it. Bring ^0099FF1 Emperium^000000 and I will recognize your worth."; close; } - if (countitem(Young_Twig) > 0 && countitem(Loki's_Whispers) > 0 && countitem(Mother's_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) { + if (countitem(Young_Twig) > 0 && countitem(Lokis_Whispers) > 0 && countitem(Mothers_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) { mes "[Mysterious Blacksmith]"; mes "Well done, adventurer."; mes "All seems to be in readiness."; @@ -773,8 +773,8 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "quickly! I d-don't want"; mes "to touch it if I can avoid it."; delitem Young_Twig,1; - delitem Loki's_Whispers,1; - delitem Mother's_Nightmare,1; + delitem Lokis_Whispers,1; + delitem Mothers_Nightmare,1; delitem Foolishness_Of_Blind,1; delitem Emperium,1; getitem Mysteltainn_,1; @@ -1058,7 +1058,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "prepared to wield that blade"; mes "with your own two hands..."; next; - if (countitem(Executioner's_Mitten) < 2) { + if (countitem(Executioners_Mitten) < 2) { mes "[Mysterious Blacksmith]"; mes "Hm. In order for me"; mes "to forge the Executioner,"; @@ -1105,7 +1105,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "if you bring ^0099FF1 Emperium^000000."; close; } - if (countitem(Executioner's_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) { + if (countitem(Executioners_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) { mes "[Mysterious Blacksmith]"; mes "Great, I see that you've"; mes "prepared everything that"; @@ -1120,7 +1120,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "terrifying sword. Now"; mes "take it! Be wary, and don't"; mes "let its bloodlust consume you!"; - delitem Executioner's_Mitten,2; + delitem Executioners_Mitten,2; delitem Bloody_Edge,10; delitem Frozen_Heart,3; delitem Amulet,50; diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index 6b10b67fc..2f8ac43c1 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -896,7 +896,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{ close; } else if (dmdswrd_Q == 40) { - if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Loki's_Whispers) == 1) { + if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Lokis_Whispers) == 1) { mes "[Huey]"; mes "Oh, you're back. Did"; mes "you bring everything"; @@ -914,7 +914,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{ delitem Bloody_Edge,9; delitem Blade_Lost_In_Darkness,6; delitem Cardinal_Jewel,9; - delitem Loki's_Whispers,1; + delitem Lokis_Whispers,1; dmdswrd_Q = 41; close; } diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 89af304ef..479e71e67 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -938,7 +938,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ tu_archer01 = 11; close; } else if(tu_archer01 == 11){ - if (RENEWAL && countitem(Grasshopper's_Leg) < 10) { + if (RENEWAL && countitem(Grasshoppers_Leg) < 10) { mes "Hey..."; mes "You gotta bring"; mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!"; @@ -965,7 +965,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ specialeffect2 EF_WIND; tu_archer01 = 12; if (RENEWAL) - delitem Grasshopper's_Leg,10; + delitem Grasshoppers_Leg,10; getexp 1000,1000; getitem Great_Bow,1; close; diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index 7cb580130..87c72ef16 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -619,7 +619,7 @@ getitem Old_Violet_Box,1; } else if ((.@incen_item > 90) && (.@incen_item < 101)) { - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; } next; mes "[" + .@name$ + "]"; @@ -1330,7 +1330,7 @@ close; } } - if ((countitem(Thin_N'_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) { + if ((countitem(Thin_N_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) { mes "[" + .@name$ + "]"; mes "Huh. I didn't actually"; mes "expect that you'd collect"; @@ -1338,7 +1338,7 @@ mes "Now, take this and give it to"; mes "a Blacksmith or Mastersmith."; mes "Your guild's pretty good..."; - delitem Thin_N'_Long_Tongue,30; + delitem Thin_N_Long_Tongue,30; delitem Shoulder_Protection,30; delitem Black_Mask,30; guildrelay_q = 88; @@ -1380,7 +1380,7 @@ mes "Don't forget this time."; close; } - if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixie's_Beard) > 29) && (guildrelay_q == 89)) { + if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixies_Beard) > 29) && (guildrelay_q == 89)) { mes "[" + .@name$ + "]"; mes "Huh. I didn't actually"; mes "expect that you'd collect"; @@ -1390,7 +1390,7 @@ mes "Your guild's pretty good..."; delitem Fright_Paper_Blade,30; delitem Lizard_Scruff,30; - delitem Elder_Pixie's_Beard,30; + delitem Elder_Pixies_Beard,30; guildrelay_q = 88; getitem Soul_Of_Courage,1; close; @@ -2019,7 +2019,7 @@ getitem Soul_Of_Harmony,1; close; } - else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toad's_Skin) > 29) && (guildrelay_q == 11)) { + else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toads_Skin) > 29) && (guildrelay_q == 11)) { mes "[" + .@name$ + "]"; mes "Oh, perfect! You brought"; mes "all the items. Well then,"; @@ -2029,7 +2029,7 @@ mes "^42426FAssassin Cross^000000. Thank you."; delitem Heart_Of_Tree,30; delitem Soft_Leaf,30; - delitem Poison_Toad's_Skin,30; + delitem Poison_Toads_Skin,30; if (BaseJob == Job_Dancer) { guildrelay_q = 72; } @@ -2039,7 +2039,7 @@ getitem Soul_Of_Harmony,1; close; } - else if ((countitem(Goat's_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) { + else if ((countitem(Goats_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) { mes "[" + .@name$ + "]"; mes "Oh, perfect! You brought"; mes "all the items. Well then,"; @@ -2047,7 +2047,7 @@ mes "take this spirit now. Please"; mes "give it to an ^42426FAssassin^000000 or an"; mes "^42426FAssassin Cross^000000. Thank you."; - delitem Goat's_Horn,30; + delitem Goats_Horn,30; delitem Honey_Jar,30; delitem Porcupine_Spike,30; if (BaseJob == Job_Dancer) { diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index bbc75cd19..977071343 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -1778,7 +1778,7 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{ } else { mes "this... Longinus's Spear!"; - getitem Longinus's_Spear,1; + getitem Longinuss_Spear,1; } lv4_weapon = 0; next; diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 503fc23bd..8e55e54a3 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -593,7 +593,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ mes "Its name?"; mes "^3355FFOrc Trophy^000000!"; next; - if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpion's_Tail) > 0)) { + if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpions_Tail) > 0)) { mes "[Shogo]"; mes "Oh! You have all the items necessary to make an Orc Trophy! Good, good! With all my pride as a monster tamer, let me make one for you right away!"; next; @@ -610,7 +610,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ mes "the cute monster"; mes "you are raising..."; mes "Orc Trophy!"; - delitem Scorpion's_Tail,1; + delitem Scorpions_Tail,1; delitem Patriotism_Marks,1; getitem Horror_Of_Tribe,1; // Horror_Of_Tribe close; @@ -641,7 +641,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ } comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{ - if (countitem(Girl's_Diary) > 0) { + if (countitem(Girls_Diary) > 0) { mes "[Munak's grandma]"; mes "Oh my..."; mes "Have you seen my granddaughter,"; diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 6a8a295bf..722509fbc 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -414,7 +414,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{ mes "- you put some items into Kafra Storage. -"; close; } - if (countitem(Big_Sis'_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) { + if (countitem(Big_Sis_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) { mes "[Nephia]"; mes "Oh..."; mes "You've brought all these ribbons! I can't wait to tie you a new ribbon to put on your ^FF66CCbeautiful hair!^000000"; @@ -430,7 +430,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{ next; mes "[Nephia]"; mes "That's it~! We're done! Oh, I just know you're going to look precious wearing this."; - delitem Big_Sis'_Ribbon,1; + delitem Big_Sis_Ribbon,1; delitem Ribbon_,1; delitem Silk_Ribbon,1; getitem Red_Tailed_Ribbon,1; @@ -719,7 +719,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Angelic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; next; mes "[Hatbyr Mhore]"; mes "There's no doubt that you'll be the talk of the town sporting these fashionable things."; @@ -774,7 +774,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Satanic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Devil's_Wing,1; + getitem Ear_Of_Devils_Wing,1; next; mes "[Hatbyr Mhore]"; mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!"; @@ -844,7 +844,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Satanic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Devil's_Wing,1; + getitem Ear_Of_Devils_Wing,1; next; mes "[Hatbyr Mhore]"; mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!"; @@ -898,7 +898,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Angelic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; next; mes "[Hatbyr Mhore]"; mes "There's no doubt that you'll be the talk of the town sporting these fashionable things."; @@ -1094,7 +1094,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{ mes "- you put some items into Kafra Storage. -"; close; } - if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bear's_Skin) > 299) { + if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bears_Skin) > 299) { if ((MaxWeight-Weight) < 2000) { mes "[Fuzzy Fuzz]"; mes "You brought every material I need, but unfortunately you don't have enough space in your inventory. Try and place some of your items into Kafra Storage first."; @@ -1120,7 +1120,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{ delitem Panda_Cap,1; delitem Needle_Pouch,100; delitem Spool,100; - delitem Black_Bear's_Skin,300; + delitem Black_Bears_Skin,300; getitem Brown_Bear_Cap,1; close; } @@ -1471,7 +1471,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{ next; switch(select("Party Hat", "Straw Hat", "Cowboy Hat", "Sombrero", "Beanie")) { case 1: - if (countitem(Santa's_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) { + if (countitem(Santas_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) { mes "[Mad Hatter]"; mes "Party Hat! It's a Santa Hat I've remade by adding colorful paper for a festive look. Celebrate good times with a Party Hat! Come on!"; next; @@ -1494,7 +1494,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{ mes "^3355FF*Squick Squick Grind Grind*^000000"; mes "^3355FF*Swish Swish Rustle Rustle*^000000"; next; - delitem Santa's_Hat,1; + delitem Santas_Hat,1; delitem Oil_Paper,100; delitem Smooth_Paper,100; mes "[Mad Hatter]"; @@ -1809,7 +1809,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ mes "[Nehris]"; mes "This crown is inspired by the the one worn by the 'Isis' monster. It has a elegant look fitting for ancient royalty."; next; - if (countitem(Queen's_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) { + if (countitem(Queens_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) { mes "[Nehris]"; mes "Thank you for"; mes "bringing everything."; @@ -1817,7 +1817,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ next; mes "^3355FF* Clang Clang! Scrape Scrape! Jingle Jingle! *^000000"; next; - delitem Queen's_Hair_Ornament,1; + delitem Queens_Hair_Ornament,1; delitem Emperium,1; delitem Gold,3; Zeny -= 20000; diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index 8efebb27a..80cea9f6a 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -1650,7 +1650,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat PHENDARK,{ countitem(Tail_) || countitem(Whip) || countitem(Whip_) || countitem(Lariat) || countitem(Rapture_Rose) || countitem(Chemeti) || countitem(Whip_Of_Red_Flame) || countitem(Whip_Of_Ice_Piece) || countitem(Whip_Of_Earth) || - countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queen's_Whip) || + countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queens_Whip) || countitem(Electric_Wire) )) close; // no whip equipped or in inventory diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index 9daf0f24c..0a90d3a0b 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -577,8 +577,8 @@ hugel,147,103,3 script Ghenirhemin 4_M_HUGRANFA,{ //== Hahoe Mask / Mythical Lion Mask / Bride Mask ========== payon,135,320,3 script Chungwolmang 4W_M_01,{ if (moza_tal == 2) { - if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boar's_Mane) > 99) { - //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane + if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boars_Mane) > 99) { + //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boars_Mane callsub S_MakeMask,5176,7015,20,952,100,1028,100,0,0; } if (countitem(Slender_Snake) > 499 && countitem(Tooth_Of_Ancient_Fish) > 1 && countitem(Orange_Dyestuffs) > 0) { diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt index ec856c37f..7fb5178b8 100644 --- a/npc/quests/newgears/2010_headgears.txt +++ b/npc/quests/newgears/2010_headgears.txt @@ -368,8 +368,8 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 1_F_04,{ //== 4. Making the new headgear Statue Of Baby Angel(5443) = alberta,151,78,0 script Bebete#Baby_Angel_Status 4W_KID,{ - // Check if wearing Ear_Of_Angel's_Wing, Angelic_Chain, Flying_Angel - if (!isequipped(Ear_Of_Angel's_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) { + // Check if wearing Ear_Of_Angels_Wing, Angelic_Chain, Flying_Angel + if (!isequipped(Ear_Of_Angels_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) { mes "[Bebete]"; mes "A fake angel? Go away!!"; next; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index b8322b4f5..78f21d38b 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -897,7 +897,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ mes "If you ever happen to gather all these materials one day, feel free to come back."; close; }else{ - if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragon's_Skin) < 30){ + if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragons_Skin) < 30){ mes "[Kaibara]"; mes "It looks like there are not enough ingredients for me to make you a Gokurin."; next; @@ -1180,7 +1180,7 @@ que_ng,22,62,3 script Tetsu 4_M_SEAMAN,{ break; } - if(countitem(Steel)<50 || countitem(Harpy's_Feather)<20 || countitem(Oridecon)<5){ + if (countitem(Steel) < 50 || countitem(Harpys_Feather) < 20 || countitem(Oridecon) < 5) { mes "[Tetsu]"; mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki."; next; diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt index f426106fc..c9d4e48f9 100644 --- a/npc/quests/partyrelay.txt +++ b/npc/quests/partyrelay.txt @@ -2015,7 +2015,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "you've already forgotten."; close; } - if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) { + if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2023,9 +2023,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Please take your next ticket"; mes "and this small reward for you."; next; - delitem Thin_N'_Long_Tongue,10; + delitem Thin_N_Long_Tongue,10; delitem Leopard_Talon,10; - delitem Poison_Toad's_Skin,10; + delitem Poison_Toads_Skin,10; party_relay = 20; getitem Mission_Certificate7,1; getitem Leaf_Of_Yggdrasil,2; @@ -2039,7 +2039,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "I'll see you later, then."; close; } - else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) { + else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2047,9 +2047,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Please take your next ticket"; mes "and this small reward for you."; next; - delitem Thin_N'_Long_Tongue,10; + delitem Thin_N_Long_Tongue,10; delitem Leopard_Talon,10; - delitem Poison_Toad's_Skin,10; + delitem Poison_Toads_Skin,10; party_relay = 20; getitem Mission_Certificate7,1; getitem Leaf_Of_Yggdrasil,2; @@ -2310,7 +2310,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Standard Time. Don't forget!"; close; } - if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9)) { + if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2319,7 +2319,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "and this small reward for you."; next; delitem Porcupine_Spike,10; - delitem Elder_Pixie's_Beard,10; + delitem Elder_Pixies_Beard,10; delitem Fish_Tail,10; party_relay = 9; getitem Mission_Certificate3,1; @@ -2332,7 +2332,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Good luck on your travels~"; close; } - else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9))) { + else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9))) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2341,7 +2341,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "and this small reward for you."; next; delitem Porcupine_Spike,10; - delitem Elder_Pixie's_Beard,10; + delitem Elder_Pixies_Beard,10; delitem Fish_Tail,10; party_relay = 9; getitem Mission_Certificate3,1; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 0f1481282..80a458dea 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -7289,7 +7289,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ } } else if (ep13_alba == 3) { - if ((countitem(Monster's_Feed) > 19) && (countitem(Pet_Food) > 29)) { + if ((countitem(Monsters_Feed) > 19) && (countitem(Pet_Food) > 29)) { mes "[Taab]"; mes "Oh, thanks!"; mes "You brought them their"; @@ -7305,7 +7305,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ mes "material to give you."; mes "How about a spiritual reward?"; next; - delitem Monster's_Feed,20; + delitem Monsters_Feed,20; delitem Pet_Food,30; ep13_alba = 6; if (RENEWAL_EXP) { @@ -8270,7 +8270,7 @@ spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{ specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; .@fcast = 15; - if (isequipped(2550)) //Fisher's_Muffler + if (isequipped(2550)) //Fishers_Muffler .@fcast -= 2; if (isequipped(2443)) //Fish_Shoes .@fcast -= 2; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 09ef6209e..85b60e7fb 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -458,7 +458,7 @@ spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 CLEAR_NPC,{ specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; .@fcast = 15; - if (isequipped(2550)) //Fisher's_Muffler + if (isequipped(2550)) //Fishers_Muffler .@fcast -= 2; if (isequipped(2443)) //Fish_Shoes .@fcast -= 2; @@ -6495,7 +6495,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ ep13_2_bs2 = 1; ep13_2_bs3 = 1; ep13_2_bs4 = 1; - getitem Bazett's_Order,1; + getitem Bazetts_Order,1; changequest 11101,11102; close; } @@ -6503,7 +6503,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "How's the search going?"; next; - if (countitem(Bazett's_Order) < 1) { + if (countitem(Bazetts_Order) < 1) { mes "[Bazett]"; mes "!!!!!!!"; mes "You lost the notes!!?"; @@ -6512,7 +6512,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "What's done has been done."; mes "I'll give you a new one."; - getitem Bazett's_Order,1; + getitem Bazetts_Order,1; close; } else { @@ -6527,7 +6527,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ next; switch(select("Yes.", "Not yet...")) { case 1: - if (countitem(Bazett's_Order) < 1) { + if (countitem(Bazetts_Order) < 1) { mes "[Bazett]"; mes "!!!!!!!"; mes "You lost the notes!!?"; @@ -6570,7 +6570,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "Ah... this isn't much, but it's a coin that the giants use."; mes "Maybe you can buy something from them with this."; - delitem Bazett's_Order,1; + delitem Bazetts_Order,1; ep13_2_busut = 7; if (ep13_2_bs1 == 3) getitem Manuk_Coin,1; if (ep13_2_bs2 == 3) getitem Manuk_Coin,1; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index f816efcdc..c2f726023 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -424,7 +424,7 @@ alberta_in,28,145,4 script Grampa 2_M_PHARMACIST,{ close; case 2: delitem Tiger_Footskin,10; - getitem Boy's_Cap,1; + getitem Boys_Cap,1; mes "[Grampa]"; mes "T... Thank you !!"; mes "With this I can revive my youthful splendor!! I must eat this thing right away !"; @@ -2650,7 +2650,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ mes "I should stay at home."; close; } - if ((ep13_2_hiki == 6) && (countitem(Monster's_Feed) > 0) && (countitem(Red_Potion) > 0)) { + if ((ep13_2_hiki == 6) && (countitem(Monsters_Feed) > 0) && (countitem(Red_Potion) > 0)) { mes "[Iromo]"; mes "...Huh? This smell..."; mes "This is the one I like the most."; @@ -2687,7 +2687,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ mes "I like cats so I approached him."; mes "Then suddenly he scratched and bit me."; next; - delitem Monster's_Feed,1; + delitem Monsters_Feed,1; delitem Red_Potion,1; ep13_2_hiki = 7; changequest 10083,10084; diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 1b58726dd..e276622e9 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -79,8 +79,8 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ close; } case 2: - if ((countitem(Oldman's_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) { - delitem Oldman's_Romance,1; + if ((countitem(Oldmans_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) { + delitem Oldmans_Romance,1; delitem Feather_Of_Birds,300; Zeny -= 500; mes "[Trader]"; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index c2a20306b..31ebb517a 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -1484,7 +1484,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{ switch(select("Issue me a Transit Permit", "I want to live in Amatsu", "Nothing")) { case 1: if (event_amatsu == 6) { - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { mes "[Jiro]"; mes "You already have one..."; mes "You don't need to have two of them."; @@ -1497,7 +1497,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{ next; if (select("Issue one", "Talk to you later") == 1) { Zeny -= 10000; - getitem Lord's_Passable_Ticket,1; + getitem Lords_Passable_Ticket,1; mes "[Jiro]"; mes "There you go."; mes "Don't lose it this time."; @@ -1678,7 +1678,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ close; } if (event_amatsu == 6) { - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { mes "[Jyuro]"; mes "You have the ticket..."; mes "Do you want me to send you now, or do you need a little instruction?"; @@ -1734,7 +1734,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ mes "A gate? On the top floor of the building??? Surely, you must been be mistaken."; emotion e_swt; next; - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { if (select("Show him the ticket", "Cancel") == 1) { mes "[Jyuro]"; mes "What? That pass is...?"; @@ -1742,7 +1742,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ mes "the lord but I guess it has"; mes "been issued to the wrong person."; next; - delitem Lord's_Passable_Ticket,1; + delitem Lords_Passable_Ticket,1; mes "[Jyuro]"; mes "I will keep this ticket because"; mes "it was issued without permission."; @@ -1885,7 +1885,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 8_M_JPNMASTER,{ event_amatsu = 6; completequest 8135; delitem Fox_Tail,1; - getitem Lord's_Passable_Ticket,1; + getitem Lords_Passable_Ticket,1; mes "[Ishida Yoshinaga]"; mes "This isn't a big reward but"; mes "someday it will be useful for you."; @@ -1943,7 +1943,7 @@ ama_in01,22,111,0 script Grandma#ama2 4_F_JPNOBA,{ mes "it won't harm me!! Yelp!^000000"; next; select("Taaaah!!"); - if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bear's_Foot) < 1 || countitem(Tiger's_Skin) < 1)) { + if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bears_Foot) < 1 || countitem(Tigers_Skin) < 1)) { if (rand(1,4) == 1) .@fox_kill = 0; else diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index f409782c8..dba9c5d14 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -859,7 +859,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{ next; switch(select("Yes.", "No, thanks.")) { case 1: - if (countitem(Monster's_Feed) && Zeny > 49) { + if (countitem(Monsters_Feed) && Zeny > 49) { mes "^3355FFYou cast your"; mes "fishing line"; mes "into the water.^000000"; @@ -871,7 +871,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{ next; mes "^3355FFYou've hooked a Phen!^000000"; next; - delitem Monster's_Feed,1; + delitem Monsters_Feed,1; Zeny -= 50; .@randfish = rand(1,100); if (.@randfish > 0 && .@randfish < 40) { diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 480b696b3..0a80c25ae 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -2148,7 +2148,7 @@ lhz_in02,201,210,5 script Digotz 4_M_LGTMAN,{ mes "my fashionable street clothes?"; close; } - if ((friendship == 12 && countitem(Friend's_Diary) > 0)) { + if ((friendship == 12 && countitem(Friends_Diary) > 0)) { mes "[Digotz]"; mes "Even if Benkaistein"; mes "did come back, I don't"; @@ -2555,7 +2555,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ cutin "lhz_macu05",255; end; } - if (friendship == 13 && countitem(Friend's_Diary) > 0) { + if (friendship == 13 && countitem(Friends_Diary) > 0) { cutin "lhz_macu06",2; mes "[Maku]"; mes "Hey, what is that? You want"; @@ -2703,7 +2703,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "that I'm grateful or anything."; cutin "lhz_macu07",255; next; - delitem Friend's_Diary,1; + delitem Friends_Diary,1; friendship = 14; if (RENEWAL_EXP) { if (BaseLevel > 90) getexp 70000,0; @@ -3175,7 +3175,7 @@ yuno_in04,96,106,5 script Passionate Student 4_M_SAGE_A,{ mes "sure to let you know~"; close; } - if ((friendship == 11 && countitem(Friend's_Diary) > 0)) { + if ((friendship == 11 && countitem(Friends_Diary) > 0)) { mes "[Benkaistein]"; mes "Aw nuts, this is"; mes "taking much longer"; @@ -3351,7 +3351,7 @@ yuno_in04,168,117,3 script Book#lhz HIDDEN_NPC,{ } if (friendship == 10) { friendship = 11; - getitem Friend's_Diary,1; + getitem Friends_Diary,1; mes "^3355FFThis book is labeled,"; mes "''Benkaistein's Journal"; mes "Vol. 6.'' This is probably"; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index d9c07c597..40fd7b38e 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1433,7 +1433,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{ close; } else if (ch_par == 17) { - if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toad's_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) { + if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toads_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) { mes "[Hua Tuo]"; mes "Hm? Ah, you have returned."; mes "Sorry, I was taking care of my other patients. Have you already gathered the medicines I'll need?"; @@ -1448,7 +1448,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{ mes "Please take this as a token of my appreciation. It's not much, but this medicine is an old family secret. I hope it will be helpful to you in dangerous situations."; delitem Leopard_Talon,2; delitem Hard_Peach,10; - delitem Poison_Toad's_Skin,5; + delitem Poison_Toads_Skin,5; delitem Browny_Root,20; delitem Germinating_Sprout,10; delitem Honey_Jar,5; diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 3a74bdd26..4a1143c8f 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -204,12 +204,12 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 3: - if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N'_Long_Tongue) > 0)) { + if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N_Long_Tongue) > 0)) { mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000"; next; delitem Poison_Spore,850; delitem Burn_Tree,300; - delitem Thin_N'_Long_Tongue,1; + delitem Thin_N_Long_Tongue,1; emotion e_oh; mes "^3355FF*Vroooooom~~*"; mes "*Bzzzzzt*"; @@ -268,10 +268,10 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 6: - if (countitem(Alice's_Apron) > 99) { + if (countitem(Alices_Apron) > 99) { mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000"; next; - delitem Alice's_Apron,100; + delitem(Alices_Apron, 100); emotion e_oh; mes "^3355FF*Vroooooom~~*"; mes "*Bzzzzzt*"; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 3e3bb3414..09ad94115 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.txt @@ -1438,7 +1438,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "Oh... Did you get all the"; mes "materials?"; next; - if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goat's_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) { + if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goats_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) { mes "[Aged Stranger]"; mes "You found the right materials."; mes "Okay, I will start to make the"; @@ -1446,7 +1446,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ next; delitem Log,30; delitem Tough_Vines,20; - delitem Goat's_Horn,20; + delitem Goats_Horn,20; delitem Sea_Otter_Leather,10; mos_whale_edq = 34; mes "[Aged Stranger]"; @@ -4496,7 +4496,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "Did you get"; mes "all of the items?"; next; - setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10; + setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10; for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) { if (countitem(.@n[.@i]) < .@n[.@i+1]) { .@f = 1; @@ -4591,7 +4591,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "Did you get"; mes "all of them?"; next; - setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10; + setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10; for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) { if (countitem(.@n[.@i]) < .@n[.@i+1]) { .@f = 1; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index c02caf857..6fc89a0cf 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -529,12 +529,12 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ .@success = 993; //Yellow_Live break; case 2: - .@consume = 946; //Snail's_Shell + .@consume = 946; //Snails_Shell .@amount = 20; .@success = 991; //Crystal_Blue break; case 3: - .@consume = 904; //Scorpion's_Tail + .@consume = 904; //Scorpions_Tail .@amount = 20; .@success = 990; //Boody_Red break; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index d11563b8d..c6c95bc17 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -4516,7 +4516,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{ close; } else if (rachel_camel == 8) { - if ((countitem(Monster's_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) { + if ((countitem(Monsters_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) { mes "[Camel Farm Owner Saraman]"; mes "Oh good, you're back."; mes "Did you bring everything?"; @@ -4552,7 +4552,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{ mes "ingredients. That's a good"; mes "amount to collect since that's"; mes "what Ms. Ivory usually orders."; - delitem Monster's_Feed,5; + delitem Monsters_Feed,5; delitem Yellow_Potion,1; delitem Unripe_Apple,1; delitem Empty_Bottle,1; diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt index 5722d8e08..d3982699c 100644 --- a/npc/quests/seals/sleipnir_seal.txt +++ b/npc/quests/seals/sleipnir_seal.txt @@ -247,10 +247,10 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 348) getitem Helm_,1; else if (.@god_treasure1 < 400) getitem Gemmed_Sallet_,1; else if (.@god_treasure1 < 448) getitem Circlet_,1; - else if (.@god_treasure1 < 496) getitem Santa's_Hat,1; - else if (.@god_treasure1 < 544) getitem Big_Sis'_Ribbon,1; + else if (.@god_treasure1 < 496) getitem Santas_Hat,1; + else if (.@god_treasure1 < 544) getitem Big_Sis_Ribbon,1; else if (.@god_treasure1 < 592) getitem Sweet_Gents,1; - else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1; + else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1; else if (.@god_treasure1 < 688) getitem Western_Grace,1; else if (.@god_treasure1 < 736) getitem Fillet,1; else if (.@god_treasure1 < 784) getitem Holy_Bonnet,1; @@ -287,7 +287,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else getitem Apple_Of_Archer,1; } else if (.@god_treasure < 501) { - if (.@god_treasure1 < 80) getitem Adventurere's_Suit_,1; + if (.@god_treasure1 < 80) getitem Adventureres_Suit_,1; else if (.@god_treasure1 < 160) getitem Mantle_,1; else if (.@god_treasure1 < 240) getitem Coat_,1; else if (.@god_treasure1 < 320) getitem Mink_Coat,1; @@ -325,7 +325,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 660) getitem Clip,1; else if (.@god_treasure1 < 770) getitem Rosary,1; else if (.@god_treasure1 < 880) getitem Mitten_Of_Presbyter,1; - else getitem Matyr's_Flea_Guard,1; + else getitem Matyrs_Flea_Guard,1; } else { if (.@god_treasure1 < 150) getitem Mr_Scream,1; @@ -360,7 +360,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 496) getitem Spinx_Helm,1; else if (.@god_treasure1 < 544) getitem Corsair,1; else if (.@god_treasure1 < 592) getitem Sweet_Gents,1; - else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1; + else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1; else if (.@god_treasure1 < 688) getitem Western_Grace,1; else if (.@god_treasure1 < 736) getitem Spinx_Helm_,1; else if (.@god_treasure1 < 784) getitem Holy_Bonnet_,1; diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index b22360ec6..2d8aaf691 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -102,7 +102,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{ } } else if (qskill_hunter == 1) { - if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpy's_Feather) > 4 && countitem(Pet_Food) > 29) { + if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpys_Feather) > 4 && countitem(Pet_Food) > 29) { mes "[Arpesto]"; mes "Hm? You're back?"; mes "Oh, did you bring"; @@ -222,7 +222,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{ mes "sure you make good use"; mes "of that new skill. Take care~"; delitem Cardinal_Jewel_,5; - delitem Harpy's_Feather,5; + delitem Harpys_Feather,5; delitem Pet_Food,30; qskill_hunter = 100; skill "HT_PHANTASMIC",1,0; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index ee84bd837..bee16543f 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -238,7 +238,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{ next; switch (select("That's why I came here.", "What about my cart?", "Two pairs is pitiful?")) { case 1: - if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animal's_Skin) > 19)) { + if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animals_Skin) > 19)) { mes "[Charlron]"; mes "Haha! Ok, ok!"; mes "With the things you brought"; @@ -246,7 +246,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{ next; delitem Wooden_Block,50; delitem Iron,10; - delitem Animal's_Skin,20; + delitem Animals_Skin,20; skill "MC_CHANGECART",1,0; mes "[Charlron]"; mes "Congratulations."; diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 06f79fba3..420477f4f 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -266,7 +266,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ close; } else if(SAG_SK == 1) { - if (countitem(Scorpion's_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snail's_Shell) < 10 || countitem(Scroll) < 4) { + if (countitem(Scorpions_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snails_Shell) < 10 || countitem(Scroll) < 4) { mes "[Mishuna]"; mes "Hm, you still haven't"; mes "gathered all of the materials"; @@ -333,10 +333,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ mes "Creation skill by reviewing"; mes "your copy of Barmundt's scroll.^000000"; specialeffect2 EF_ABSORBSPIRITS; - delitem Scorpion's_Tail,10; // Scorpion_Tail + delitem Scorpions_Tail,10; delitem Horn,7; // Horn delitem Colorful_Shell,12; // Rainbow_Shell - delitem Snail's_Shell,10; // Snail's_Shell + delitem Snails_Shell,10; delitem Scroll,4; // Blank_Scroll SAG_SK = 2; skill "SA_CREATECON",1,0; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index 6c56924f1..35cd38998 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -175,7 +175,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ close; } case 2: - if ((countitem(Grasshopper's_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { + if ((countitem(Grasshoppers_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { mes "[Alcouskou]"; mes "Okay! Let's practice!"; next; @@ -192,7 +192,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "Great! -At this level,"; mes "I am sure you can increase"; mes "your skill on your own."; - delitem Grasshopper's_Leg,20; + delitem Grasshoppers_Leg,20; skill "TF_BACKSLIDING",1,0; close; } @@ -252,7 +252,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "If not, I cannot teach you."; close; case 3: - if ((countitem(Zargon) > 0) && (countitem(Bear's_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { + if ((countitem(Zargon) > 0) && (countitem(Bears_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { mes "[Alcouskou]"; mes "Wow, you have already prepared?"; mes "Great, I see promise in you. -"; @@ -283,7 +283,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "I hope it aids you in the future."; mes ". . . . . Hope to see you soon"; delitem Zargon,1; - delitem Bear's_Foot,1; + delitem Bears_Foot,1; delitem Spawn,5; skill "TF_PICKSTONE",1,0; close; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 2ed7ad703..e5c3c6e68 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -307,7 +307,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "know right away. For now,"; mes "please hold on to these pieces."; sign_q = 54; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; } else if (sign_q == 54) { if (rand(1,5) == 4) { @@ -736,19 +736,19 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "accept this as a token"; mes "of my gratitude. Good luck"; mes "on your travels, adventurer."; - if (checkweight(Star's_Sob,1) == 0) { + if (checkweight(Stars_Sob,1) == 0) { next; mes "^3355FFWait a second! Right now,"; mes "you have too many items in your inventory. Please come back after you've freed up more inventory space.^000000"; close; } - delitem Star's_Sob,1; + delitem Stars_Sob,1; sign_q = 202; getexp RENEWAL_EXP?10000:100000,0; getitem Old_Violet_Box,1; } else if (sign_q > 201) { - if (countitem(Star's_Sob) == 1) { + if (countitem(Stars_Sob) == 1) { mes "I'm sorry..."; mes "But I'm taking"; mes "back the Sobbing"; @@ -759,7 +759,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "[Metz]"; mes "......"; mes "Farewell."; - delitem Star's_Sob,1; + delitem Stars_Sob,1; } else { mes "I guess I can't"; @@ -1305,8 +1305,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ delitem Fluff,100; if (countitem(Poison_Spore) > 49) { delitem Poison_Spore,50; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1335,8 +1335,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ mes "..."; if (countitem(Poison_Spore) > 49) { delitem Poison_Spore,50; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1364,8 +1364,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ case 6: mes "[Arian]"; mes "..."; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1526,7 +1526,7 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ else getexp 18000,0; } sign_q = 14; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; close; case 14: mes "[Arian]"; @@ -1910,7 +1910,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ mes "Come and drink with me~"; } next; - if (countitem(Part_Of_Star's_Sob) > 0) { + if (countitem(Part_Of_Stars_Sob) > 0) { .@pay_point = 1; mes "["+ strcharinfo(PC_NAME) +"]"; mes "Sure..."; @@ -2381,7 +2381,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ } if (.@pay_point > 29) { sign_q = 15; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 750,0; @@ -2425,7 +2425,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ } else if ((.@pay_point > 26) && (.@pay_point < 30)) { sign_q = 15; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 750,0; @@ -2826,7 +2826,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{ mes "relying on a rumor..."; next; sign_q = 20; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; mes "[Sir Jore]"; mes "Thank you very much"; mes "for helping me. Now I can"; @@ -3680,7 +3680,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{ next; mes "[Jesqurienne]"; sign_q = 25; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; mes "Here..."; mes "My old friend, Metz, told"; mes "me to give this to someone"; @@ -4746,7 +4746,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "go find someone named,"; mes "um, ''Bakerlan'' in Alberta."; sign_q = 35; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 700,0; @@ -4783,7 +4783,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "go find someone named,"; mes "um, ''Bakerlan'' in Alberta."; sign_q = 35; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; Zeny += 20000; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; @@ -5571,7 +5571,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "my time is quite precious."; close; case 2: - if (countitem(Part_Of_Star's_Sob) < 5) { + if (countitem(Part_Of_Stars_Sob) < 5) { mes "[Bakerlan]"; mes "Hmm, I suppose you"; mes "still haven't completed"; @@ -5580,7 +5580,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "Starlight, you know..."; close; } - else if (countitem(Part_Of_Star's_Sob) == 5) { + else if (countitem(Part_Of_Stars_Sob) == 5) { mes "[Bakerlan]"; mes "Ah, now I see that"; mes "you speak the truth."; @@ -5655,7 +5655,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "Now bring all of the stone pieces to Metz."; mes "He will tell you what you need to do next."; sign_q = 53; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 500,0; else if (BaseLevel < 70) getexp 800,0; @@ -6287,7 +6287,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ mes "everything ready..."; next; mes "[Melkaba]"; - if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bear's_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) { + if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bears_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) { mes "Hmm, you're still"; mes "missing some of the"; mes "ingredients. Now, listen"; @@ -6358,7 +6358,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ Zeny -= 10000; delitem Royal_Jelly,10; delitem Honey,20; - delitem Bear's_Foot,30; + delitem Bears_Foot,30; delitem Leaflet_Of_Hinal,1; delitem Ment,1; delitem Empty_Bottle,1; @@ -6376,7 +6376,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ specialeffect EF_PHARMACY_FAIL; delitem Royal_Jelly,10; delitem Honey,20; - delitem Bear's_Foot,30; + delitem Bears_Foot,30; delitem Leaflet_Of_Hinal,1; delitem Ment,1; delitem Empty_Bottle,1; @@ -7279,7 +7279,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ mes "[Engel]"; mes "Right. Let me guide you to a shortcut to the exit of these mines, just in case you don't know your way out of here. Good luck~"; delitem Picture_Letter,1; - delitem Part_Of_Star's_Sob,7; + delitem Part_Of_Stars_Sob,7; sign_q = 57; close2; warp "mjo_dun02",371,344; @@ -7386,7 +7386,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ mes "While you were gone, I managed to restore this Sobbing Starlight. Why don't you go ahead and take a look?"; next; sign_q = 71; - getitem Star's_Sob,1; + getitem Stars_Sob,1; specialeffect2 EF_YUFITELHIT; next; mes "[Engel]"; @@ -7506,7 +7506,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ if (countitem(Golden_Anvil) > 0) delitem Golden_Anvil,1; else if (countitem(Emperium_Anvil) > 0) delitem Emperium_Anvil,1; sign_q = 71; - getitem Star's_Sob,1; + getitem Stars_Sob,1; specialeffect2 EF_YUFITELHIT; close; } @@ -8636,7 +8636,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ .@fail_s3 = rand(1,600); .@fail_s4 = rand(1,500); .@fail_s5 = rand(1,400); - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) { sign_q = 200; mes "[Serin]"; @@ -8829,7 +8829,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ } } else if (sign_q == 125) { - if (countitem(Serin's_Gold_Ring_) ==1) { + if (countitem(Serins_Gold_Ring_) ==1) { mes "[Serin]"; mes "If you think that"; mes "I can't summon Dark Lord"; @@ -8957,7 +8957,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ mes "Farewell, now."; mes "And good luck on"; mes "your travels, my friend..."; - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 127; close; } @@ -8977,9 +8977,9 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ .@fail_s3 = rand(1,800); .@fail_s4 = rand(1,700); .@fail_s5 = rand(1,600); - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) { - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 200; mes "[Serin]"; mes "Even though you tried"; @@ -9026,7 +9026,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ } else { if (((sign_sq == 0) && (.@fail_s5 == 356)) || ((sign_sq == 1) && (.@fail_s4 == 356)) || (.@fail_s3 == 356)) { - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 200; mes "[Serin]"; mes "Even though you tried"; @@ -9219,7 +9219,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "I want you to have this ring. It's the only way I can properly express my gratitude for your aid so far."; sign_q = 85; sign_sq = 0; - getitem Serin's_Gold_Ring,1; + getitem Serins_Gold_Ring,1; close; } else { @@ -9271,7 +9271,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ close; } else if (sign_q == 92) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Serin]"; mes "Ah, "+strcharinfo(PC_NAME)+"~"; mes "How is everything?"; @@ -9530,7 +9530,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "..."; mes "......"; mes ".........."; - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { next; switch(select("Give Serin her ring.", "Keep the ring.")) { case 1: @@ -9563,7 +9563,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "to forget her sadness. The tears streaked across her cheeks and"; mes "the faint smile on her lips tell you that her memories of you"; mes "will always remain in her heart.^000000"; - delitem Serin's_Gold_Ring_,1; + delitem Serins_Gold_Ring_,1; getexp RENEWAL_EXP?50000:500000,0; close; case 2: @@ -9729,23 +9729,23 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "of her soul and memories that"; mes "you can still sense somehow."; mes "What could have happened to her?^000000"; - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { next; mes "^33555FFSuddenly, Serin's"; mes "gold ring sparkled"; mes "with a soft glow and"; mes "faded away.^000000"; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; close; } close; } else { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Serin]"; mes "Thank you..."; emotion e_sob; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; next; mes "^3355FFYou returned"; mes "Serin's gold ring.^000000"; @@ -9809,7 +9809,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } if (sign_q == 90) { - if (countitem(Serin's_Gold_Ring) == 1) { + if (countitem(Serins_Gold_Ring) == 1) { mes "That bastard stole"; mes "two spell books from me."; mes "You've brought one of them"; @@ -9834,7 +9834,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if (sign_q == 91) { - if (countitem(Witch's_Spell_Book) > 0) { + if (countitem(Witchs_Spell_Book) > 0) { mes "Once that fool stole my spell"; mes "books, he was cursed after he"; mes "cast those spells without my"; @@ -9912,7 +9912,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "that the Queen of the Dead"; mes "is searching for her lost mother, Angrboda. Now, if you could find where Angrboda has been"; mes "sealed away..."; - delitem Witch's_Spell_Book,1; + delitem Witchs_Spell_Book,1; sign_q = 92; close; } @@ -10023,12 +10023,12 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if (sign_q == 119) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "This is Serin's gold ring?"; mes "Excellent, this has been"; mes "strongly infused with her"; mes "vibes. It's really tough to find something like this that resonates so strongly with its owner."; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; sign_q = 120; close; } @@ -10205,8 +10205,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "of the vouchers I've"; mes "given you, alright?"; sign_q = 124; - getitem Witch's_Potion,1; - getitem Serin's_Gold_Ring_,1; + getitem Witchs_Potion,1; + getitem Serins_Gold_Ring_,1; getitem Seal_Of_Witch,5; close; } @@ -10241,7 +10241,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "the Witch's Medals that"; mes "I've lent to you, alright?"; sign_q = 124; - getitem Witch's_Potion,1; + getitem Witchs_Potion,1; getitem Seal_Of_Witch,5; close; } @@ -10254,7 +10254,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "these preparations..."; close; } - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { mes "You're finally"; mes "back. We might not"; mes "have enough time to"; @@ -10301,7 +10301,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if ((sign_q == 127) || (sign_q == 128)) { - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (countitem(Seal_Of_Witch) < 5) { mes "Hmmm...?"; mes "Where are all the"; @@ -10379,7 +10379,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "you so much for your"; mes "help. Once you finish here,"; mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason..."; - if (countitem(Serin's_Gold_Ring_) == 1) sign_q = 129; + if (countitem(Serins_Gold_Ring_) == 1) sign_q = 129; else sign_q = 130; getexp RENEWAL_EXP?30000:300000,0; close; @@ -10408,8 +10408,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "her for that. Though, it's"; mes "ironic that you failed your"; mes "ordeals for her sake..."; - if (countitem(Serin's_Gold_Ring) > 0) delitem Serin's_Gold_Ring,1; - if (countitem(Witch's_Potion) > 0) delitem Witch's_Potion,1; + if (countitem(Serins_Gold_Ring) > 0) delitem Serins_Gold_Ring,1; + if (countitem(Witchs_Potion) > 0) delitem Witchs_Potion,1; sign_q = 201; getexp RENEWAL_EXP?20000:200000,0; close; @@ -10442,7 +10442,7 @@ OnTouch: callfunc "F_UpdateSignVars"; if (sign_q == 83) { if (sign_sq == 2) { - if (countitem(Witch's_Spell_Book) > 0) { + if (countitem(Witchs_Spell_Book) > 0) { mes "[Kirkena]"; mes "W-what's this?"; mes "Why is it that"; @@ -10480,7 +10480,7 @@ OnTouch: mes "give you this. It will send"; mes "a living human back to one"; mes "of the towns in your realm."; - delitem Witch's_Spell_Book,1; + delitem Witchs_Spell_Book,1; sign_sq = 3; getitem Wing_Of_Crow,1; close; @@ -10587,7 +10587,7 @@ OnTouch: close; } else if (sign_q == 88) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Kirkena]"; mes "As I expected,"; mes "there is something behind"; @@ -10865,7 +10865,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{ mes "Now, I shall show"; mes "you something truly"; mes "interesting...^000000"; - delitem Star's_Sob,1; + delitem Stars_Sob,1; sign_q = 143; close; case 2: @@ -10913,7 +10913,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{ mes "Sobbing Starlight.^000000"; next; sign_q = 144; - getitem Lucifer's_Lament,1; + getitem Lucifers_Lament,1; mes "[Lady Hell]"; mes "^8C1717Although you may also know"; mes "this object as God's Tear Drop, keep in mind that history, as you humans know it, may actually be different than the truth.^000000"; @@ -10962,7 +10962,7 @@ niflheim,146,241,0 script Depressing Man 4_M_JOB_WIZARD,{ close; } else if (sign_q == 87) { - if (countitem(Serin's_Gold_Ring) > 1) { + if (countitem(Serins_Gold_Ring) > 1) { mes "[Gen]"; mes "You lookin' for"; mes "something? Crayu"; @@ -11736,12 +11736,12 @@ OnTouch: if (sign_q == 83) { if(sign_sq == 0) { sign_sq = 1; - getitem Witch's_Spell_Book,1; + getitem Witchs_Spell_Book,1; } } else if (sign_q == 90) { sign_q = 91; - getitem Witch's_Spell_Book,1; + getitem Witchs_Spell_Book,1; } close; } @@ -11977,11 +11977,11 @@ function script F_SignSeal { mes "more powerful to break the seal...^000000"; close; } - if (countitem(Girl's_Diary) || countitem(Rapture_Rose)) { + if (countitem(Girls_Diary) || countitem(Rapture_Rose)) { if (getarg(0) < 980) F_SealFail; } else if (countitem(Weeder_Knife) || countitem(Combat_Knife) || countitem(Princess_Knife) || countitem(Cursed_Dagger) || countitem(Lariat) || countitem(Kaiser_Knuckle)) { if (getarg(0) < 960) F_SealFail; } - else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mama's_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) { + else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mamas_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) { if (getarg(0) < 940) F_SealFail; } else if (countitem(Ice_Falchon) || countitem(House_Auger) || countitem(Assasin_Dagger)) { if (getarg(0) < 920) F_SealFail; } @@ -12003,7 +12003,7 @@ function script F_SignSeal { if (getarg(0) < 760) F_SealFail; } else if (countitem(Sabbath) || countitem(Right_Epsilon) || countitem(Wizardy_Staff)) { if (getarg(0) < 740) F_SealFail; } - else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinus's_Spear)) { + else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinuss_Spear)) { if (getarg(0) < 720) F_SealFail; } else if (countitem(Guillotine) || countitem(Brionac)) { if (getarg(0) < 700) F_SealFail; } @@ -12283,7 +12283,7 @@ OnTimer45000: geffen,119,48,0 script Fountain#s HIDDEN_NPC,{ callfunc "F_UpdateSignVars"; - if (countitem(Lucifer's_Lament) > 0) { + if (countitem(Lucifers_Lament) > 0) { mes "^3355FFAs you approach the fountain,"; mes "a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within"; mes "the fountain's water.^000000"; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index fc01464f2..bf099cd2d 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -2450,7 +2450,7 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of case MHP2: case Attack_Delay_4: case Luck6: - .@enchant = callfunc("F_Rand", Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day); + .@enchant = callfunc("F_Rand", Bears_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day); mes("[Hugin's Magic Master]"); // Custom text mes("Seems you already completed the best upgrade option in your 4th slot. For that I can give a random bonus effect to your 3rd slot. And of course, with certain payment..."); next; diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 0308884fd..78e200843 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1748,7 +1748,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{ jobchange roclass(eaclass()|EAJL_THIRD); getitem Sniper_Goggle,1; getitem Green_Apple_Ring,1; - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; close; } mes "Hey, you look great."; diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 811593c81..6ac0d9935 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -445,7 +445,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "You've come along fine this far."; mes "This is not much, but take this as a reward."; job_novice_q = 7; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; completequest 7120; close; } else if (job_novice_q == 7) { @@ -2609,7 +2609,7 @@ L_Supplies: nov_3_swordman = 40; getitem Cargo_Free_Ticket,20; getitem Warp_Free_Ticket,30; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; getitem N_Cutter,1; next; mes "[Hanson]"; diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index e5ee13ffb..be9f1dbee 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -1129,7 +1129,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ Assassin_Mask_, Elven_Ears, Hahoe_Mask, - Boy's_Cap; + Boys_Cap; setarray .@costumes[0], C_Frog_Cap, C_Centimental_Flower, C_Magestic_Goat, diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt index 7be4eaa6f..864505b85 100644 --- a/npc/re/merchants/enchan_mal.txt +++ b/npc/re/merchants/enchan_mal.txt @@ -93,7 +93,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1224: callsub L_Socket,1,2; //Sword_Breaker case 1225: callsub L_Socket,1,2; //Mail_Breaker case 1227: callsub L_Socket,1,2; //Weeder_Knife - case 1229: callsub L_Socket,1,2; //Mama's_Knife + case 1229: callsub L_Socket,1,2; //Mamas_Knife case 1232: callsub L_Socket,1,2; //Assasin_Dagger case 1233: callsub L_Socket,1,2; //Exercise case 1235: callsub L_Socket,1,2; //Azoth @@ -212,7 +212,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1466: callsub L_Socket,1,2; //Crescent_Scythe case 1467: callsub L_Socket,1,2; //Bill_Guisarme case 1468: callsub L_Socket,1,2; //Zephyrus - case 1469: callsub L_Socket,1,2; //Longinus's_Spear + case 1469: callsub L_Socket,1,2; //Longinuss_Spear case 1470: callsub L_Socket,1,2; //Brionac case 1471: callsub L_Socket,1,2; //Hell_Fire case 1474: callsub L_Socket,1,2; //Gae_Bolg @@ -264,7 +264,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 15: // Books switch(@mal_equip_id) { case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse - case 1558: callsub L_Socket,1,2; //Girl's_Diary + case 1558: callsub L_Socket,1,2; //Girls_Diary case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon case 1561: callsub L_Socket,1,2; //Hardback case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield @@ -311,11 +311,11 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1963: callsub L_Socket,1,2; //Rapture_Rose case 1964: callsub L_Socket,1,2; //Chemeti case 1969: callsub L_Socket,1,2; //Bladed_Whip - case 1970: callsub L_Socket,1,2; //Queen's_Whip + case 1970: callsub L_Socket,1,2; //Queens_Whip case 1972: callsub L_Socket,1,2; //Electric_Eel case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot case 1974: callsub L_Socket,1,2; //Carrot_Whip - case 1976: callsub L_Socket,1,2; //Queen's_Whip_ + case 1976: callsub L_Socket,1,2; //Queens_Whip_ case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes case 1984: callsub L_Socket,2,2; //Stem_Whip case 1985: callsub L_Socket,4,2; //Rosebine diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 6732035dc..98fd3789c 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -110,7 +110,7 @@ pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) { - if (countitem(Wolf's_Flute)) { + if (countitem(Wolfs_Flute)) { mes "[Expert Flute Crafter]"; mes "The Wolf Flute you have is crafted by myself, with wood."; mes "You can come back here and find me if you lose your Wolf flute!"; @@ -137,7 +137,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ mes "Hope you are ready to use it."; delitem Bamboo_Cut,1; Zeny -= 100000; - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; close; } mes "[Expert Flute Crafter]"; diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index d8f7594b2..543d9cdc7 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -712,16 +712,16 @@ OnInit: morocc,171,103,4 trader Item Collector#moc3 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } morocc,205,247,2 trader Item Collector#moc4 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index ac4a765fd..72e1bd6c9 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -38,7 +38,7 @@ setarray .@tame_id[0],Unripe_Apple,Orange_Juice,Rainbow_Carrot,Earthworm_The_Dude,Rotten_Fish,Sweet_Milk,Well_Dried_Bone,Singing_Flower,Dew_Laden_Moss; setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3; - setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore; + setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animals_Skin,Animals_Skin,Grasshoppers_Leg,Mushroom_Spore; setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500; setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014; .@tame_gets = 3; @@ -95,9 +95,9 @@ setarray .@tame_id[0],Silver_Knife_Of_Chaste,Monster_Juice,Contracts_In_Shadow,Sway_Apron,Prohibition_Red_Candle,Book_Of_Devil; setarray .@tame_amount[0],1,1,1,1,1,1; - setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn; + setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alices_Apron,Queens_Whip,Evil_Horn; setarray .@hunt_amount[0],600,600,600,500,1,100; - setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0; + setarray .@hunt_id2[0],0,0,0,0,Executioners_Mitten,0; setarray .@hunt_amount2[0],0,0,0,0,20,0; setarray .@mob_id[0],1170,1035,1109,1275,1200,1101; .@tame_gets = 1; diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index 3a3068a5c..1c680d7ed 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -530,11 +530,11 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{ break; case 2: callsub L_Quest,8275; - if ((countitem(Bear's_Foot) > 9) && (countitem(Animal's_Skin) > 4)) { + if ((countitem(Bears_Foot) > 9) && (countitem(Animals_Skin) > 4)) { callsub L_Reward; getitem Novice_Potion,100; - delitem Bear's_Foot,10; - delitem Animal's_Skin,5; + delitem Bears_Foot,10; + delitem Animals_Skin,5; getexp 1000,100; erasequest 8275; close; diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index 10566cb39..e243300d5 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -469,10 +469,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ Assassin_Mask_, -1, 200, Improved_Assassin_Mask, Welding_Mask, -1, 200, Improved_Welding_Mask, Safety_Ring, -1, 200, Safety_Ring_, - Angel's_Protection, 1, 100, Im_Angel's_Protection, - Angel's_Safeguard, 1, 100, Impr_Angel's_Safeguard, - Angel's_Arrival, 1, 100, Impr_Angel's_Arrival, - Angel's_Warmth, 1, 100, Impr_Angel's_Warmth, + Angels_Protection, 1, 100, Im_Angels_Protection, + Angels_Safeguard, 1, 100, Impr_Angels_Safeguard, + Angels_Arrival, 1, 100, Impr_Angels_Arrival, + Angels_Warmth, 1, 100, Impr_Angels_Warmth, Kiss_Of_Angel, 1, 100, Improved_Kiss_Of_Angel; break; case 4: @@ -487,10 +487,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ Variant_Shoes, -1, 300, Enhanced_Variant_Shoes, Ring_Of_Flame_Lord,-1, 300, Good_Ring_Of_Flame_Lord, Ring_Of_Resonance, -1, 300, Good_Ring_Of_Resonance, - Angel's_Protection, 1, 20, Im_Angel's_Protection, - Angel's_Safeguard, 1, 20, Impr_Angel's_Safeguard, - Angel's_Arrival, 1, 20, Impr_Angel's_Arrival, - Angel's_Warmth, 1, 20, Impr_Angel's_Warmth, + Angels_Protection, 1, 20, Im_Angels_Protection, + Angels_Safeguard, 1, 20, Impr_Angels_Safeguard, + Angels_Arrival, 1, 20, Impr_Angels_Arrival, + Angels_Warmth, 1, 20, Impr_Angels_Warmth, Kiss_Of_Angel, 1, 20, Improved_Kiss_Of_Angel; break; } @@ -680,10 +680,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ else if (.@r <= 9) getitem Improved_Assassin_Mask,1; else if (.@r <= 12) getitem Improved_Welding_Mask,1; else if (.@r <= 13) getitem Safety_Ring_,1; - else if (.@r <= 14) getitem Im_Angel's_Protection,1; - else if (.@r <= 15) getitem Impr_Angel's_Safeguard,1; - else if (.@r <= 16) getitem Impr_Angel's_Arrival,1; - else if (.@r <= 17) getitem Impr_Angel's_Warmth,1; + else if (.@r <= 14) getitem Im_Angels_Protection,1; + else if (.@r <= 15) getitem Impr_Angels_Safeguard,1; + else if (.@r <= 16) getitem Impr_Angels_Arrival,1; + else if (.@r <= 17) getitem Impr_Angels_Warmth,1; else getitem Improved_Kiss_Of_Angel,1; break; case 4: diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index bbf074581..d669d0d46 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -17592,7 +17592,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ } } else if (questprogress(7420) == 1) { - if ((countitem(Pinguicula's_fruit_Jam) < 3) || (countitem(Luciola's_Honey_Jam) < 3)) { + if ((countitem(Pinguiculas_fruit_Jam) < 3) || (countitem(Luciolas_Honey_Jam) < 3)) { mes "[Leo]"; mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~"; mes "They are specialties of the base of Splendide."; @@ -17611,8 +17611,8 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes "It seems like Mayor Jun has an eye for character."; mes "So he is Mayor after all..."; next; - delitem Pinguicula's_fruit_Jam,3; //Pinguicula's_fruit_Jam - delitem Luciola's_Honey_Jam,3; //Luciola's_Honey_Jam + delitem Pinguiculas_fruit_Jam,3; + delitem Luciolas_Honey_Jam, 3; completequest 7420; getexp 200000,200000; .@alltotal = questprogress(7420) + questprogress(7419) + questprogress(7418); diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 79615327d..39ca8649c 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -5148,7 +5148,7 @@ function script mora_remains { 1@mist,145,245,0 script Meshir's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell 1@mist,196,276,0 script Noirit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato 1@mist,304,327,0 script Pajama God's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf -1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell +1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snails_Shell 1@mist,330,177,0 script Milebit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn 1@mist,284,84,0 script Kunmun's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin 1@mist,170,54,0 script Tsaihokin's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart |