From 4fe61e3252848199a8d23c2f6b91e9604de29c5c Mon Sep 17 00:00:00 2001 From: Micksha Date: Thu, 18 Jun 2020 13:12:18 +0000 Subject: Content --- conf/map/maps.conf | 1 + db/map_index.txt | 7 +- db/re/item_db.conf | 1383 +++++++++++++++++++++++++++++++++++++++++++++--- db/re/mob_db.conf | 298 +++++++++++ maps/re/012-1.mcache | Bin 1393 -> 1425 bytes maps/re/020-1.mcache | Bin 0 -> 4690 bytes npc/001-1/calypsan.txt | 6 +- npc/001-1/shop.txt | 34 +- npc/008-3-4/_mobs.txt | 2 +- npc/008-3-5/_mobs.txt | 2 +- npc/020-1/_import.txt | 4 + npc/020-1/_mobs.txt | 57 ++ npc/020-1/_warps.txt | 4 + npc/_anchors.txt | 6 + npc/_import.txt | 1 + 15 files changed, 1722 insertions(+), 83 deletions(-) create mode 100644 maps/re/020-1.mcache create mode 100644 npc/020-1/_import.txt create mode 100644 npc/020-1/_mobs.txt create mode 100644 npc/020-1/_warps.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index 531fd8fc..9c520b52 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -112,6 +112,7 @@ map_list: ( "012-3-1", "012-3-2", "012-3-3", + "020-1", "sec_pri", "test", "testbg", diff --git a/db/map_index.txt b/db/map_index.txt index ca1ca981..a593a5b8 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -109,6 +109,7 @@ 012-3-1 109 012-3-2 110 012-3-3 111 -sec_pri 112 -test 113 -testbg 114 +020-1 112 +sec_pri 113 +test 114 +testbg 115 diff --git a/db/re/item_db.conf b/db/re/item_db.conf index b9537c14..4547d1ba 100644 --- a/db/re/item_db.conf +++ b/db/re/item_db.conf @@ -1202,6 +1202,52 @@ item_db: ( dispbottom l("A treasure is burried in @@, (@@, @@)", ShovelQuests_AssignedMAP$, ShovelQuests_AssignedX, ShovelQuests_AssignedY); "> }, +{ + Id: 616 + AegisName: "ChocolateBar" + Name: "Chocolate Bar" + Type: "IT_HEALING" + Buy: 750 + Sell: 65 + Weight: 100 +}, +{ + Id: 617 + AegisName: "MoubooMilk" + Name: "Mouboo Milk" + Type: "IT_HEALING" + Buy: 750 + Sell: 65 + Weight: 200 +}, +{ + Id: 618 + AegisName: "MoubooSteak" + Name: "Mouboo Steak" + Type: "IT_HEALING" + Buy: 750 + Sell: 65 + Weight: 250 +}, +{ + Id: 619 + AegisName: "RoastedAcorn" + Name: "Roasted Acorn" + Type: "IT_HEALING" + Buy: 750 + Sell: 65 + Weight: 50 +}, +{ + Id: 620 + AegisName: "RedApple" + Name: "Red Apple" + Type: "IT_HEALING" + Buy: 750 + Sell: 65 + Weight: 100 +}, + // Generic { @@ -1798,6 +1844,267 @@ item_db: ( Sell: 400 Weight: 50 }, +{ + Id: 763 + AegisName: "Bone" + Name: "Bone" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 100 +}, +{ + Id: 764 + AegisName: "DruidTreeBranch" + Name: "Druid Tree Branch" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 200 +}, +{ + Id: 765 + AegisName: "LeftScorpionClaw" + Name: "Left Scorpion Claw" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 150 +}, +{ + Id: 766 + AegisName: "RightScorpionClaw" + Name: "Right Scorpion Claw" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 150 +}, +{ + Id: 767 + AegisName: "CopperOre" + Name: "Copper Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 768 + AegisName: "SilverOre" + Name: "Silver Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 769 + AegisName: "GoldOre" + Name: "Gold Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 770 + AegisName: "PlatinumOre" + Name: "Platinum Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 771 + AegisName: "DiamondPowder" + Name: "Diamond Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 772 + AegisName: "RubyPowder" + Name: "Ruby Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 773 + AegisName: "EmeraldPowder" + Name: "Emerald Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 774 + AegisName: "SapphirePowder" + Name: "Sapphire Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 775 + AegisName: "TopazPowder" + Name: "Topaz Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 776 + AegisName: "AmethystPowder" + Name: "Amethyst Powder" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 50 +}, +{ + Id: 777 + AegisName: "ScorpionStinger" + Name: "Scorpion Stinger" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 20 +}, +{ + Id: 778 + AegisName: "Skull" + Name: "Skull" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 350 +}, +{ + Id: 779 + AegisName: "SnakeSkin" + Name: "Snake Skin" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 100 +}, +{ + Id: 780 + AegisName: "SnakeTongue" + Name: "Snake Tongue" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 35 +}, +{ + Id: 781 + AegisName: "TerraniteOre" + Name: "Terranite Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 782 + AegisName: "IronIngot" + Name: "Iron Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 783 + AegisName: "CopperIngot" + Name: "Copper Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 784 + AegisName: "SilverIngot" + Name: "Silver Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 785 + AegisName: "GoldIngot" + Name: "Gold Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 786 + AegisName: "PlatinumIngot" + Name: "Platinum Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 787 + AegisName: "TerraniteIngot" + Name: "Terranite Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 788 + AegisName: "RotoniumOre" + Name: "Rotonium Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 789 + AegisName: "ZealiteOre" + Name: "Zealite Ore" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 500 +}, +{ + Id: 790 + AegisName: "RotoniumIngot" + Name: "Rotonium Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, +{ + Id: 791 + AegisName: "ZealiteIngot" + Name: "Zealite Ingot" + Type: "IT_ETC" + Buy: 1000 + Sell: 250 + Weight: 1000 +}, { Id: 800 AegisName: "DiamondShard" @@ -2080,7 +2387,7 @@ item_db: ( Sell: 2900 Weight: 70 Def: 6 - Slots: 0 + Slots: 1 Loc: "EQP_HEAD_MID" WeaponLv: 0 EquipLv: 17 @@ -2092,6 +2399,21 @@ item_db: ( bonus bAgi, 1; bonus bMatk, 30; "> + AllowCards: { + id5000: 1 + id5001: 1 + id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 + } }, { Id: 1308 @@ -2196,39 +2518,24 @@ item_db: ( noselltonpc: true } }, -// Boots -{ - Id: 1800 - AegisName: "LousyMoccasins" - Name: "Lousy Moccasins" - Type: "IT_ARMOR" - Buy: 600 - Sell: 180 - Weight: 18 - Def: 1 - Slots: 0 - Loc: "EQP_SHOES" - WeaponLv: 0 - EquipLv: 4 - Refine: false - ViewSprite: 1800 - BindOnEquip: false -}, + +// Placeholder Chests + { - Id: 1801 - AegisName: "CottonBoots" - Name: "Cotton Boots" + Id: 1312 + AegisName: "ApprenticeRobe" + Name: "Apprentice Robe" Type: "IT_ARMOR" - Buy: 2600 - Sell: 420 - Weight: 35 - Def: 2 + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 Slots: 1 - Loc: "EQP_SHOES" + Loc: "EQP_HEAD_MID" WeaponLv: 0 - EquipLv: 12 + EquipLv: 10 Refine: false - ViewSprite: 1801 + ViewSprite: 1312 BindOnEquip: false AllowCards: { id5003: 1 @@ -2253,15 +2560,280 @@ item_db: ( } }, { - Id: 1802 - AegisName: "FurBoots" - Name: "Fur Boots" + Id: 1313 + AegisName: "AssassinChest" + Name: "Assassin Chest" Type: "IT_ARMOR" - Buy: 12000 - Sell: 650 - Weight:75 - Def: 4 - Slots: 0 + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1313 + BindOnEquip: false +}, +{ + Id: 1314 + AegisName: "BlackArmor" + Name: "Black Armor" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1314 + BindOnEquip: false +}, +{ + Id: 1315 + AegisName: "Chainmail" + Name: "Chainmail" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1315 + BindOnEquip: false +}, +{ + Id: 1316 + AegisName: "EvocatorRobe" + Name: "Evocator Robe" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1316 + BindOnEquip: false +}, +{ + Id: 1317 + AegisName: "JustifierChest" + Name: "Justifier Chest" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 1 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1317 + BindOnEquip: false + AllowCards: { + id5003: 1 + id5004: 1 + id5005: 1 + id5006: 1 + id5007: 1 + id5008: 1 + id5009: 1 + id5010: 1 + id5011: 1 + id5012: 1 + id5013: 1 + id5014: 1 + id5015: 1 + id5016: 1 + id5017: 1 + id5018: 1 + id5019: 1 + id5020: 1 + id5021: 1 + } +}, +{ + Id: 1318 + AegisName: "LightPlatemail" + Name: "Light Platemail" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1318 + BindOnEquip: false +}, +{ + Id: 1319 + AegisName: "PeltJacket" + Name: "Pelt Jacket" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1319 + BindOnEquip: false +}, +{ + Id: 1320 + AegisName: "Snakeplate" + Name: "Snakeplate" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1320 + BindOnEquip: false +}, +{ + Id: 1321 + AegisName: "SorcererRobe" + Name: "Sorcerer Robe" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1321 + BindOnEquip: false +}, +{ + Id: 1322 + AegisName: "TerraniteArmor" + Name: "Terranite Armor" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1322 + BindOnEquip: false +}, +{ + Id: 1323 + AegisName: "WizardRobe" + Name: "Wizard Robe" + Type: "IT_ARMOR" + Buy: 50000 + Sell: 5000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_MID" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1323 + BindOnEquip: false +}, + +// Boots +{ + Id: 1800 + AegisName: "LousyMoccasins" + Name: "Lousy Moccasins" + Type: "IT_ARMOR" + Buy: 600 + Sell: 180 + Weight: 18 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 4 + Refine: false + ViewSprite: 1800 + BindOnEquip: false +}, +{ + Id: 1801 + AegisName: "CottonBoots" + Name: "Cotton Boots" + Type: "IT_ARMOR" + Buy: 2600 + Sell: 420 + Weight: 35 + Def: 2 + Slots: 1 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 12 + Refine: false + ViewSprite: 1801 + BindOnEquip: false + AllowCards: { + id5003: 1 + id5004: 1 + id5005: 1 + id5006: 1 + id5007: 1 + id5008: 1 + id5009: 1 + id5010: 1 + id5011: 1 + id5012: 1 + id5013: 1 + id5014: 1 + id5015: 1 + id5016: 1 + id5017: 1 + id5018: 1 + id5019: 1 + id5020: 1 + id5021: 1 + } +}, +{ + Id: 1802 + AegisName: "FurBoots" + Name: "Fur Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 650 + Weight:75 + Def: 4 + Slots: 0 Loc: "EQP_SHOES" WeaponLv: 0 EquipLv: 20 @@ -2287,6 +2859,150 @@ item_db: ( BindOnEquip: false BuyingStore: true }, + +// Placeholder Boots +{ + Id: 1804 + AegisName: "AssassinBoots" + Name: "Assassin Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1804 + BindOnEquip: false + BuyingStore: true +}, +{ + Id: 1805 + AegisName: "BromenalBoots" + Name: "Bromenal Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1805 + BindOnEquip: false + BuyingStore: true +}, +{ + Id: 1806 + AegisName: "RidingBoots" + Name: "Riding Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1806 + BindOnEquip: false + BuyingStore: true +}, +{ + Id: 1807 + AegisName: "Slippers" + Name: "Slippers" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1807 + BindOnEquip: false + BuyingStore: true +}, +{ + Id: 1808 + AegisName: "WarlordBoots" + Name: "Warlord Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1808 + BindOnEquip: false + BuyingStore: true +}, +{ + Id: 1809 + AegisName: "ManaSlippers" + Name: "Mana Slippers" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 1 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1809 + BindOnEquip: false + BuyingStore: true + AllowCards: { + id5000: 1 + id5001: 1 + id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 + } +}, +{ + Id: 1810 + AegisName: "SquirrelBoots" + Name: "Squirrel Boots" + Type: "IT_ARMOR" + Buy: 12000 + Sell: 600 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_SHOES" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 1810 + BindOnEquip: false + BuyingStore: true +}, + // Gloves { Id: 2000 @@ -2411,6 +3127,93 @@ item_db: ( ViewSprite: 2005 BindOnEquip: false }, + +//Placeholder Gloves +{ + Id: 2006 + AegisName: "AssassinGloves" + Name: "Assassin Gloves" + Type: "IT_ARMOR" + Buy: 8000 + Sell: 400 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_GARMENT" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2006 + BindOnEquip: false +}, +{ + Id: 2007 + AegisName: "BromenalGloves" + Name: "Bromenal Gloves" + Type: "IT_ARMOR" + Buy: 8000 + Sell: 400 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_GARMENT" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2007 + BindOnEquip: false +}, +{ + Id: 2008 + AegisName: "ShortGloves" + Name: "Short Gloves" + Type: "IT_ARMOR" + Buy: 8000 + Sell: 400 + Weight: 10 + Def: 1 + Slots: 0 + Loc: "EQP_GARMENT" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2008 + BindOnEquip: false +}, +{ + Id: 2009 + AegisName: "SilkGloves" + Name: "Silk Gloves" + Type: "IT_ARMOR" + Buy: 8000 + Sell: 400 + Weight: 10 + Def: 1 + Slots: 1 + Loc: "EQP_GARMENT" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2009 + BindOnEquip: false + AllowCards: { + id5000: 1 + id5001: 1 + id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 + } +}, + + // Pants { Id: 2200 @@ -2485,6 +3288,16 @@ item_db: ( id5000: 1 id5001: 1 id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 } }, { @@ -2554,11 +3367,82 @@ item_db: ( Slots: 0 Loc: "EQP_HEAD_LOW" WeaponLv: 0 - EquipLv: 25 + EquipLv: 25 + Refine: false + ViewSprite: 2206 + BindOnEquip: false +}, + +//PLaceholder Pants +{ + Id: 2207 + AegisName: "AssassinPants" + Name: "Assassin Pants" + Type: "IT_ARMOR" + Buy: 10000 + Sell: 1000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_LOW" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2207 + BindOnEquip: false +}, +{ + Id: 2208 + AegisName: "ChainmailSkirt" + Name: "Chainmail Skirt" + Type: "IT_ARMOR" + Buy: 10000 + Sell: 1000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_LOW" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2208 + BindOnEquip: false +}, +{ + Id: 2209 + AegisName: "PirateShorts" + Name: "Pirate Shorts" + Type: "IT_ARMOR" + Buy: 10000 + Sell: 1000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_LOW" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2209 + BindOnEquip: false +}, +{ + Id: 2210 + AegisName: "TerranitePants" + Name: "Terranite Pants" + Type: "IT_ARMOR" + Buy: 10000 + Sell: 1000 + Weight: 100 + Def: 10 + Slots: 0 + Loc: "EQP_HEAD_LOW" + WeaponLv: 0 + EquipLv: 10 Refine: false - ViewSprite: 2206 + ViewSprite: 2210 BindOnEquip: false }, + // Shields { Id: 2700 @@ -2740,7 +3624,6 @@ item_db: ( ViewSprite: 2200 BindOnEquip: false }, - { Id: 2906 AegisName: "InfantryHelmet" @@ -3146,6 +4029,280 @@ item_db: ( noselltonpc: true } }, + +// Placeholder Hats + +{ + Id: 2925 + AegisName: "BullHelmet" + Name: "Bull Helmet" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 0 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2925 + BindOnEquip: false +}, +{ + Id: 2926 + AegisName: "BunnyEars" + Name: "Bunny Ears" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 1 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2926 + BindOnEquip: false + AllowCards: { + id5003: 1 + id5004: 1 + id5005: 1 + id5006: 1 + id5007: 1 + id5008: 1 + id5009: 1 + id5010: 1 + id5011: 1 + id5012: 1 + id5013: 1 + id5014: 1 + id5015: 1 + id5016: 1 + id5017: 1 + id5018: 1 + id5019: 1 + id5020: 1 + id5021: 1 + } +}, +{ + Id: 2927 + AegisName: "DesertHat" + Name: "Desert Hat" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 1 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2927 + BindOnEquip: false + AllowCards: { + id5003: 1 + id5004: 1 + id5005: 1 + id5006: 1 + id5007: 1 + id5008: 1 + id5009: 1 + id5010: 1 + id5011: 1 + id5012: 1 + id5013: 1 + id5014: 1 + id5015: 1 + id5016: 1 + id5017: 1 + id5018: 1 + id5019: 1 + id5020: 1 + id5021: 1 + } +}, +{ + Id: 2928 + AegisName: "MinerHat" + Name: "Miner Hat" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 0 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2928 + BindOnEquip: false + OnEquipScript: <" + doevent "#SpotlightMaster::OnTouch"; + "> + OnUnequipScript: <" + doevent "#SpotlightMaster::OnTouch"; + "> +}, +{ + Id: 2929 + AegisName: "SilkHeadband" + Name: "Silk Headband" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 1 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2929 + BindOnEquip: false + AllowCards: { + id5000: 1 + id5001: 1 + id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 + } +}, +{ + Id: 2930 + AegisName: "Headband" + Name: "Headband" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 1 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2930 + BindOnEquip: false + AllowCards: { + id5003: 1 + id5004: 1 + id5005: 1 + id5006: 1 + id5007: 1 + id5008: 1 + id5009: 1 + id5010: 1 + id5011: 1 + id5012: 1 + id5013: 1 + id5014: 1 + id5015: 1 + id5016: 1 + id5017: 1 + id5018: 1 + id5019: 1 + id5020: 1 + id5021: 1 + } +}, +{ + Id: 2931 + AegisName: "TerraniteHelmet" + Name: "Terranite Helmet" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 0 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2931 + BindOnEquip: false +}, +{ + Id: 2932 + AegisName: "TrapperHat" + Name: "Trapper Hat" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 0 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2932 + BindOnEquip: false +}, +{ + Id: 2933 + AegisName: "WizardHat" + Name: "Wizard Hat" + Type: "IT_ARMOR" + Buy: 25000 + Sell: 2500 + Weight: 100 + Atk: 0 + Matk: -10 + Def: 1 + Slots: 1 + Loc: "EQP_HEAD_TOP" + WeaponLv: 0 + EquipLv: 10 + Refine: false + ViewSprite: 2933 + BindOnEquip: false + AllowCards: { + id5000: 1 + id5001: 1 + id5002: 1 + id5034: 1 + id5035: 1 + id5036: 1 + id5037: 1 + id5038: 1 + id5039: 1 + id5040: 1 + id5041: 1 + id5042: 1 + id5043: 1 + } +}, + // Scarfs { Id: 3200 @@ -3564,30 +4721,30 @@ item_db: ( // Cards & Dyes { Id: 5000 - AegisName: "CrimsonCashmereDye" - Name: "Crimson Cashmere Dye" + AegisName: "PitchBlackSilkDye" + Name: "Pitch Black Silk Dye" Type: "IT_CARD" Buy: 2000 Sell: 80 - Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5001 - AegisName: "ChocolateCashmereDye" - Name: "Chocolate Cashmere Dye" + AegisName: "ChocolateSilkDye" + Name: "Chocolate Silk Dye" Type: "IT_CARD" Buy: 2000 Sell: 80 - Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5002 - AegisName: "MintCashmereDye" - Name: "Mint Cashmere Dye" + AegisName: "CrimsonSilkDye" + Name: "Crimson Silk Dye" Type: "IT_CARD" Buy: 2000 Sell: 80 - Loc: ["EQP_HEAD_MID","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5003 @@ -3596,7 +4753,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5004 @@ -3605,7 +4762,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5005 @@ -3614,7 +4771,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5006 @@ -3623,7 +4780,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5007 @@ -3632,7 +4789,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5008 @@ -3641,7 +4798,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5009 @@ -3650,7 +4807,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5010 @@ -3659,7 +4816,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5011 @@ -3668,7 +4825,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5012 @@ -3677,7 +4834,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5013 @@ -3686,7 +4843,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5014 @@ -3695,7 +4852,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5015 @@ -3704,7 +4861,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5016 @@ -3713,7 +4870,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5017 @@ -3722,7 +4879,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5018 @@ -3731,7 +4888,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5019 @@ -3740,7 +4897,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5020 @@ -3749,7 +4906,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5021 @@ -3758,7 +4915,7 @@ item_db: ( Type: "IT_CARD" Buy: 1200 Sell: 70 - Loc: ["EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] }, { Id: 5022 @@ -3898,6 +5055,96 @@ item_db: ( "> Loc: ["EQP_ACC_L"] }, +{ + Id: 5034 + AegisName: "TomatoSilkDye" + Name: "Tomato Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5035 + AegisName: "GoldenrodSilkDye" + Name: "Goldenrod Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5036 + AegisName: "SunflowerSilkDye" + Name: "Sunflower Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5037 + AegisName: "OliveSilkDye" + Name: "Olive Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5038 + AegisName: "SeaGreenSilkDye" + Name: "Sea Green Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5039 + AegisName: "MintSilkDye" + Name: "Mint Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5040 + AegisName: "MidnightBlueSilkDye" + Name: "Midnight Blue Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5041 + AegisName: "SlatBlueSilkDye" + Name: "Slat Blue Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5042 + AegisName: "OrchidSilkDye" + Name: "Orchid Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, +{ + Id: 5043 + AegisName: "PinkiePinkSilkDye" + Name: "Pinkie Pink Silk Dye" + Type: "IT_CARD" + Buy: 2000 + Sell: 80 + Loc: ["EQP_HEAD_TOP","EQP_HEAD_MID","EQP_SHOES","EQP_GARMENT","EQP_HEAD_LOW"] +}, // Bows { Id: 6000 diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf index 056fd8eb..ca0ef908 100644 --- a/db/re/mob_db.conf +++ b/db/re/mob_db.conf @@ -3224,6 +3224,304 @@ mob_db: ( Pearl: 1 } }, +{ + Id: 1077 + SpriteName: "DesertSnake" + Name: "Desert Snake" + Lv: 35 + Hp: 3640 + Sp: 0 + Exp: 85 + JExp: 7 + AttackRange: 1 + Attack: [250, 425] + Def: 65 + Mdef: 10 + Stats: { + Str: 35 + Agi: 45 + Vit: 25 + Int: 5 + Dex: 60 + Luk: 25 + } + ViewRange: 1 + ChaseRange: 15 + Size: 0 + Race: 2 + Element: (1, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 220 + AttackDelay: 1000 + AttackMotion: 750 + DamageMotion: 1120 + Drops: { + } +}, +{ + Id: 1078 + SpriteName: "DesertScorpion" + Name: "Desert Scorpion" + Lv: 28 + Hp: 3000 + Sp: 0 + Exp: 44 + JExp: 5 + AttackRange: 1 + Attack: [220, 350] + Def: 40 + Mdef: 15 + Stats: { + Str: 45 + Agi: 15 + Vit: 50 + Int: 1 + Dex: 30 + Luk: 20 + } + ViewRange: 7 + ChaseRange: 12 + Size: 0 + Race: 2 + Element: (1, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 400 + AttackDelay: 1250 + AttackMotion: 800 + DamageMotion: 500 + Drops: { + } +}, +{ + Id: 1079 + SpriteName: "BlackSlime" + Name: "Black Slime" + Lv: 25 + Hp: 2650 + Sp: 0 + Exp: 35 + JExp: 4 + AttackRange: 1 + Attack: [290, 400] + Def: 25 + Mdef: 5 + Stats: { + Str: 25 + Agi: 25 + Vit: 45 + Int: 1 + Dex: 35 + Luk: 20 + } + ViewRange: 8 + ChaseRange: 8 + Size: 0 + Race: 2 + Element: (1, 1) + Mode: { + CanMove: true + CanAttack: false + } + MoveSpeed: 320 + AttackDelay: 2262 + AttackMotion: 764 + DamageMotion: 826 + Drops: { + MaggotSlime: 800 + } +}, +{ + Id: 1080 + SpriteName: "FireGoblin" + Name: "Fire Goblin" + Lv: 37 + Hp: 4042 + Sp: 0 + Exp: 75 + JExp: 8 + AttackRange: 1 + Attack: [396,499] + Def: 35 + Mdef: 25 + Stats: { + Str: 25 + Agi: 30 + Vit: 45 + Int: 1 + Dex: 25 + Luk: 15 + } + ChaseRange: 12 + Race: 2 + Element: (3, 1) + Mode: { + CanMove: true + CanAttack: true + ChangeChase: true + CastSensorChase: true + } + MoveSpeed: 600 + AttackDelay: 1872 + AttackMotion: 672 + DamageMotion: 480 + Drops: { + BugLeg: 400 + } +}, +{ + Id: 1081 + SpriteName: "BrotherhoodFighter" + Name: "Brotherhood Fighter" + Lv: 30 + Hp: 3220 + Sp: 0 + Exp: 37 + JExp: 6 + AttackRange: 1 + Attack: [175, 300] + Def: 50 + Mdef: 10 + Stats: { + Str: 45 + Agi: 20 + Vit: 20 + Int: 15 + Dex: 30 + Luk: 10 + } + ViewRange: 6 + ChaseRange: 9 + Race: 2 + Element: (7, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 270 + AttackDelay: 870 + AttackMotion: 672 + DamageMotion: 400 +}, +{ + Id: 1082 + SpriteName: "BrotherhoodArcher" + Name: "Brotherhood Archer" + Lv: 32 + Hp: 3200 + Sp: 0 + Exp: 50 + JExp: 6 + AttackRange: 2 + Attack: [300, 440] + Def: 20 + Mdef: 20 + Stats: { + Str: 10 + Agi: 25 + Vit: 30 + Int: 5 + Dex: 60 + Luk: 10 + } + ViewRange: 6 + ChaseRange: 9 + Race: 2 + Element: (7, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 310 + AttackDelay: 2170 + AttackMotion: 954 + DamageMotion: 620 +}, +{ + Id: 1083 + SpriteName: "BrotherhoodLeader" + Name: "Brotherhood Leader" + Lv: 40 + Hp: 3900 + Sp: 0 + Exp: 110 + JExp: 13 + AttackRange: 2 + Attack: [425, 550] + Def: 70 + Mdef: 25 + Stats: { + Str: 30 + Agi: 40 + Vit: 30 + Int: 20 + Dex: 50 + Luk: 10 + } + ViewRange: 6 + ChaseRange: 9 + Race: 2 + Element: (7, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 240 + AttackDelay: 870 + AttackMotion: 454 + DamageMotion: 420 +}, +{ + Id: 1084 + SpriteName: "Skeleton" + Name: "Skeleton" + Lv: 40 + Hp: 4100 + Sp: 0 + Exp: 140 + JExp: 17 + AttackRange: 1 + Attack: [525, 650] + Def: 40 + Mdef: 10 + Stats: { + Str: 40 + Agi: 40 + Vit: 30 + Int: 20 + Dex: 50 + Luk: 10 + } + ViewRange: 7 + ChaseRange: 11 + Race: 2 + Element: (7, 1) + Mode: { + CanMove: true + CanAttack: true + CastSensorChase: true + ChangeChase: true + } + MoveSpeed: 270 + AttackDelay: 1070 + AttackMotion: 570 + DamageMotion: 450 +}, { Id: 1100 SpriteName: "PoisonSkull" diff --git a/maps/re/012-1.mcache b/maps/re/012-1.mcache index 2a30e443..1fd1ac10 100644 Binary files a/maps/re/012-1.mcache and b/maps/re/012-1.mcache differ diff --git a/maps/re/020-1.mcache b/maps/re/020-1.mcache new file mode 100644 index 00000000..dfb5b8f8 Binary files /dev/null and b/maps/re/020-1.mcache differ diff --git a/npc/001-1/calypsan.txt b/npc/001-1/calypsan.txt index 36668f1b..ac3cbf3f 100644 --- a/npc/001-1/calypsan.txt +++ b/npc/001-1/calypsan.txt @@ -19,7 +19,7 @@ speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("Look at your equipment, can you guess what material it is made from?"), l("Seek a colorant for that material:"), - l("Cotton, cashmere, leather, ..."), + l("Cotton, Silk, leather, ..."), l("Zinc-Titanium Oxide, Phthalocyanides, Cadmiums, Lazulite..."), l("Colorant is not the yeying color. Some wear out from light, others look great but inflict itai-itai, and others become spotty or wash-away."), l("What yoiis should know:"), @@ -34,7 +34,7 @@ function sell_dye { speech S_FIRST_BLANK_LINE | S_LAST_NEXT, l("For what kind of tissue?"); - .@tissue_type = select(l("Cotton"), l("Cashmere")); + .@tissue_type = select(l("Cotton"), l("Silk")); closeclientdialog; switch (.@tissue_type) @@ -43,7 +43,7 @@ shop "Cotton#Dye001-1"; break; case 2: - shop "Cashmere#Dye001-1"; + shop "Silk#Dye001-1"; break; default: consolemes(CONSOLEMES_ERROR, "Calypsan script error, tissue_type is incorrect"); diff --git a/npc/001-1/shop.txt b/npc/001-1/shop.txt index 9d49736f..85e43235 100644 --- a/npc/001-1/shop.txt +++ b/npc/001-1/shop.txt @@ -83,23 +83,43 @@ OnClock0000: restoreshopitem YellowCottonDye, 10; } -001-1,48,125,0 trader Cashmere#Dye001-1 NPC_NO_SPRITE,{ +001-1,48,125,0 trader Silk#Dye001-1 NPC_NO_SPRITE,{ OnInit: tradertype(NST_MARKET); - sellitem CrimsonCashmereDye, -1, 7; - sellitem ChocolateCashmereDye, -1, 7; - sellitem MintCashmereDye, -1, 7; + sellitem PitchBlackSilkDye, -1, 7; + sellitem ChocolateSilkDye, -1, 7; + sellitem CrimsonSilkDye, -1, 7; + sellitem TomatoSilkDye, -1, 7; + sellitem GoldenrodSilkDye, -1, 7; + sellitem SunflowerSilkDye, -1, 7; + sellitem OliveSilkDye, -1, 7; + sellitem SeaGreenSilkDye, -1, 7; + sellitem MintSilkDye, -1, 7; + sellitem MidnightBlueSilkDye, -1, 7; + sellitem SlatBlueSilkDye, -1, 7; + sellitem OrchidSilkDye, -1, 7; + sellitem PinkiePinkSilkDye, -1, 7; .sex = G_OTHER; .distance = 4; end; OnClock0000: - restoreshopitem CrimsonCashmereDye, 7; - restoreshopitem ChocolateCashmereDye, 7; - restoreshopitem MintCashmereDye, 7; + restoreshopitem PitchBlackSilkDye, -1, 7; + restoreshopitem ChocolateSilkDye, -1, 7; + restoreshopitem CrimsonSilkDye, -1, 7; + restoreshopitem TomatoSilkDye, -1, 7; + restoreshopitem GoldenrodSilkDye, -1, 7; + restoreshopitem SunflowerSilkDye, -1, 7; + restoreshopitem OliveSilkDye, -1, 7; + restoreshopitem SeaGreenSilkDye, -1, 7; + restoreshopitem MintSilkDye, -1, 7; + restoreshopitem MidnightBlueSilkDye, -1, 7; + restoreshopitem SlatBlueSilkDye, -1, 7; + restoreshopitem OrchidSilkDye, -1, 7; + restoreshopitem PinkiePinkSilkDye, -1, 7; } 001-1,64,114,0 trader Store#Aquada001-1 NPC_NO_SPRITE,{ diff --git a/npc/008-3-4/_mobs.txt b/npc/008-3-4/_mobs.txt index db3cc108..37fb788a 100644 --- a/npc/008-3-4/_mobs.txt +++ b/npc/008-3-4/_mobs.txt @@ -29,4 +29,4 @@ 008-3-4,83,44,14,9 monster Red Slime 1074,5,10000,50000 008-3-4,115,67,13,29 monster Red Slime 1074,4,10000,50000 008-3-4,37,79,24,27 monster Yellow Slime 1073,4,10000,50000 -008-3-4,111,67,13,29 monster Red Slime 1074,8,20000,75000 +008-3-4,111,67,13,29 monster Yellow Slime 1073,8,20000,75000 diff --git a/npc/008-3-5/_mobs.txt b/npc/008-3-5/_mobs.txt index de960072..5331e5e6 100644 --- a/npc/008-3-5/_mobs.txt +++ b/npc/008-3-5/_mobs.txt @@ -3,7 +3,7 @@ 008-3-5,87,83,22,16 monster Cave Maggot 1027,8,2000,20000 008-3-5,79,68,54,12 monster Crafty 1018,12,2500,35000 008-3-5,71,62,49,39 monster Thief Slime 1105,3,20000,100000 -008-3-5,90,70,13,29 monster Red Slime 1074,8,20000,75000 +008-3-5,90,70,13,29 monster Yellow Slime 1073,8,20000,75000 008-3-5,79,82,21,15 monster Bandit 1063,3,2000,20000 008-3-5,74,66,38,21 monster Snake 1075,3,10000,100000 008-3-5,54,41,26,21 monster Robin Bandit 1064,2,2000,20000 diff --git a/npc/020-1/_import.txt b/npc/020-1/_import.txt new file mode 100644 index 00000000..9af8d519 --- /dev/null +++ b/npc/020-1/_import.txt @@ -0,0 +1,4 @@ +// Map 020-1: Tulimshar +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/020-1/_mobs.txt", +"npc/020-1/_warps.txt", diff --git a/npc/020-1/_mobs.txt b/npc/020-1/_mobs.txt new file mode 100644 index 00000000..e9ad346a --- /dev/null +++ b/npc/020-1/_mobs.txt @@ -0,0 +1,57 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 020-1: Tulimshar mobs +020-1,165,77,14,12 monster Maggot 1026,6,5000,10000 +020-1,222,172,54,18 monster Maggot 1026,15,5000,10000 +020-1,282,114,12,39 monster Maggot 1026,5,5000,10000 +020-1,175,209,128,38 monster Desert Scorpion 1078,15,12000,36000 +020-1,59,158,18,26 monster Desert Scorpion 1078,5,12000,36000 +020-1,92,189,58,56 monster Desert Snake 1077,8,18000,72000 +020-1,60,174,23,29 monster Black Slime 1079,4,8500,36000 +020-1,188,216,84,32 monster Maggot 1026,20,5000,10000 +020-1,157,252,9,3 monster Golden Scorpion 1110,1,120000,120000 +020-1,167,81,21,11 monster Brotherhood Fighter 1081,3,6000,18000 +020-1,279,96,13,15 monster Legion Swordswoman 1066,3,6000,18000 +020-1,74,185,23,46 monster Yellow Slime 1073,6,13500,60000 +020-1,254,226,44,30 monster Desert Snake 1077,4,18000,36000 +020-1,277,248,18,10 monster Thief Slime 1105,3,11500,45000 +020-1,126,200,45,11 monster Giant Maggot 1076,2,36000,120000 +020-1,70,73,10,16 monster Giant Maggot 1076,2,36000,120000 +020-1,70,87,14,16 monster Maggot 1026,6,5000,10000 +020-1,70,74,7,10 monster Thief Slime 1105,1,11500,45000 +020-1,103,187,58,57 monster Fire Goblin 1080,10,8000,50000 +020-1,74,95,0,0 monster Manana Tree 1017,1,420000,240000 +020-1,157,130,123,35 monster Tortuga 1004,20,35000,120000 +020-1,43,180,4,22 monster Blub 1008,1,60000,120000 +020-1,282,249,12,7 monster Blub 1008,1,60000,120000 +020-1,114,119,54,62 monster Little Blub 1007,12,25000,120000 +020-1,294,95,0,0 monster Crocotree 1010,1,420000,240000 +020-1,274,105,0,0 monster Crocotree 1010,1,420000,240000 +020-1,278,125,0,0 monster Crocotree 1010,1,420000,240000 +020-1,259,146,0,0 monster Crocotree 1010,1,420000,240000 +020-1,289,144,0,0 monster Crocotree 1010,1,420000,240000 +020-1,246,160,0,0 monster Crocotree 1010,1,420000,240000 +020-1,215,184,0,0 monster Crocotree 1010,1,420000,240000 +020-1,194,175,0,0 monster Crocotree 1010,1,420000,240000 +020-1,187,157,0,0 monster Crocotree 1010,1,420000,240000 +020-1,172,154,0,0 monster Crocotree 1010,1,420000,240000 +020-1,140,133,0,0 monster Crocotree 1010,1,420000,240000 +020-1,176,137,0,0 monster Crocotree 1010,1,420000,240000 +020-1,156,84,0,0 monster Crocotree 1010,1,420000,240000 +020-1,142,77,0,0 monster Crocotree 1010,1,420000,240000 +020-1,104,183,0,0 monster Crocotree 1010,1,420000,240000 +020-1,80,194,0,0 monster Crocotree 1010,1,420000,240000 +020-1,50,188,0,0 monster Crocotree 1010,1,420000,240000 +020-1,49,169,0,0 monster Crocotree 1010,1,420000,240000 +020-1,71,166,0,0 monster Crocotree 1010,1,420000,240000 +020-1,80,154,0,0 monster Crocotree 1010,1,420000,240000 +020-1,90,138,0,0 monster Crocotree 1010,1,420000,240000 +020-1,67,142,0,0 monster Crocotree 1010,1,420000,240000 +020-1,40,139,0,0 monster Crocotree 1010,1,420000,240000 +020-1,39,125,0,0 monster Crocotree 1010,1,420000,240000 +020-1,77,124,0,0 monster Crocotree 1010,1,420000,240000 +020-1,89,97,0,0 monster Crocotree 1010,1,420000,240000 +020-1,63,83,0,0 monster Crocotree 1010,1,420000,240000 +020-1,55,96,0,0 monster Crocotree 1010,1,420000,240000 +020-1,66,64,0,0 monster Crocotree 1010,1,420000,240000 +020-1,291,254,0,0 monster Crocotree 1010,1,420000,240000 +020-1,285,246,0,0 monster Crocotree 1010,1,420000,240000 diff --git a/npc/020-1/_warps.txt b/npc/020-1/_warps.txt new file mode 100644 index 00000000..3c273cc5 --- /dev/null +++ b/npc/020-1/_warps.txt @@ -0,0 +1,4 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 020-1: Tulimshar warps +020-1,166,242,0 warp #020-1_166_242 1,0,020-1,165,250 +020-1,166,249,0 warp #020-1_166_249 1,0,020-1,165,241 diff --git a/npc/_anchors.txt b/npc/_anchors.txt index 36315554..c0574e8d 100644 --- a/npc/_anchors.txt +++ b/npc/_anchors.txt @@ -8,11 +8,13 @@ OnInit: htput(.ht, "^ART", "001-1 89 86"); htput(.ht, "^BLACK|SMITH", "001-2-27 35 32"); htput(.ht, "^CAMP|FIRE", "008-1 55 46"); + htput(.ht, "^CANDOR", "012-1 49 114"); htput(.ht, "^CITY|^HALL", "001-2-7 36 41"); htput(.ht, "^DIMOND|COVE", "008-1 106 222"); htput(.ht, "^DRA|ISLAND", "000-1 62 111"); htput(.ht, "^FARM|MOUB", "008-1 71 129"); htput(.ht, "^FIRST|^DECK1?$", "000-2-0 23 28"); + htput(.ht, "^GARDEN", "020-1 76 99"); htput(.ht, "^HARB|^MASTER", "001-2-16 28 32"); htput(.ht, "^HOLD$", "000-2-2 42 31"); htput(.ht, "^HURN", "008-1 250 109"); @@ -21,7 +23,9 @@ OnInit: htput(.ht, "^LIB", "001-2-4 42 35"); htput(.ht, "^LIGHT", "001-2-0 37 32"); htput(.ht, "^LUVIA", "008-1 256 206"); + htput(.ht, "^MAGIC|ACAD", "020-1 51 119"); htput(.ht, "^MERCH|^BANK", "001-2-19 28 30"); + htput(.ht, "^MINE", "020-1 76 237"); htput(.ht, "^MOON", "001-2-2 40 34"); htput(.ht, "^NARD", "000-2-3 21 28"); htput(.ht, "^NOBLE1?$", "001-2-1 37 37"); @@ -29,6 +33,7 @@ OnInit: htput(.ht, "^NOBLE3$", "001-2-11 45 33"); htput(.ht, "^NOBLE4$", "001-2-12 34 32"); htput(.ht, "^NOBLE5$", "001-2-15 34 38"); + htput(.ht, "^OASIS", "020-1 287 246"); htput(.ht, "^RED|PLUSH|^INN", "001-2-28 30 35"); htput(.ht, "^ROSSY", "008-3-0 130 108"); htput(.ht, "^SECOND|^DECK2$", "000-2-1 67 32"); @@ -36,6 +41,7 @@ OnInit: htput(.ht, "^START2$", "000-0-0 26 28"); htput(.ht, "^START3$", "000-0-1 26 28"); htput(.ht, "^START|^BEGIN", "000-0 22 24"); + htput(.ht, "^TULIM|MARKET", "020-1 224 175"); htput(.ht, "^VEIN", "008-3-0 87 172"); htput(.ht, "^WARE", "001-2-18 37 31"); htput(.ht, "^WEST|PORT", "008-1-1 52 60"); diff --git a/npc/_import.txt b/npc/_import.txt index dfe1ab2b..7fba4b92 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -111,6 +111,7 @@ @include "npc/012-3-1/_import.txt" @include "npc/012-3-2/_import.txt" @include "npc/012-3-3/_import.txt" +@include "npc/020-1/_import.txt" @include "npc/sec_pri/_import.txt" @include "npc/test/_import.txt" @include "npc/testbg/_import.txt" -- cgit v1.2.3-60-g2f50