diff options
| m--------- | client-data | 0 | ||||
| m--------- | tools | 0 | ||||
| -rw-r--r-- | world/map/db/const-aegis.txt | 1 | ||||
| -rw-r--r-- | world/map/db/item_db_weapon.txt | 28 |
4 files changed, 15 insertions, 14 deletions
diff --git a/client-data b/client-data -Subproject 53f03e240acc174fce201e95f7a59dcf153fd21 +Subproject c18664a43c474bd9a623f1513180fb132abd9cd diff --git a/tools b/tools -Subproject 43275bda27806beaf1cb83ff2985116dbb46512 +Subproject 44536183f98feaa25df6c4e8813950128d60f42 diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index 4a03064e..752c9874 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -807,6 +807,7 @@ LeprechaunHat 5280 PartyHatR 5281 PartyHatG 5282 PartyHatB 5283 +HMCPirateHat 5287 CactusDrink 501 CactusPotion 502 CandyCane 506 diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index da712d6d..4fe6f58a 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -5,11 +5,11 @@ 521, Dagger, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} 522, SharpKnife, 4, 100, 50, 150, 10, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} 529, IronArrow, 10, 4, 2, 1, 40, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} -530, ShortBow, 4, 2500, 1000, 600, 50, 0, 5, -5, 0, 2, 2, 0, 4, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +530, ShortBow, 4, 2500, 1000, 600, 50, 0, 5, -5, 0, 2, 34, 0, 4, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 536, ShortSword, 4, 8000, 4000, 1500, 90, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} -545, ForestBow, 4, 20000, 5000, 1200, 70, 0, 5, -7, 0, 2, 2, 0, 0, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +545, ForestBow, 4, 20000, 5000, 1200, 70, 0, 5, -7, 0, 2, 34, 0, 0, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 547, Bardiche, 4, 20, 10, 10, 0, 100, 1, 0, 0, 2, 2, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} -548, Halberd, 4, 20, 10, 1400, 180, 0, 2, 0, 0, 2, 2, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} +548, Halberd, 4, 20, 10, 1400, 180, 0, 2, 0, 0, 2, 34, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} 549, Axe, 4, 20, 10, 1200, 100, 0, 1, 0, 0, 2, 2, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} 550, BlacksmithsAxe, 4, 20, 10, 1200, 100, 0, 1, 0, 0, 2, 2, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} 561, Sabre, 4, 10000, 5000, 300, 100, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} @@ -18,7 +18,7 @@ 572, Scimitar, 4, 8000, 4000, 200, 100, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";} 573, Falchion, 4, 8000, 4000, 300, 270, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem"; bonus bDoubleAddRate, 40; bonus bHit, -25; bonus bCritical, -25;} 574, ScorpionKing, 4, 8000, 4000, 600, 100, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";} -575, DesertBow, 4, 8000, 4000, 1200, 85, 0, 7, -10, 0, 2, 2, 0, 1, 11, 0, {}, {callfunc "UnreleasedItem"; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +575, DesertBow, 4, 8000, 4000, 1200, 85, 0, 7, -10, 0, 2, 34, 0, 1, 11, 0, {}, {callfunc "UnreleasedItem"; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 576, Beheader, 4, 8000, 4000, 2000, 999, 0, 1, 0, 0, 2, 2, 0, 1, 4, 0, {}, {callfunc "NoBowItem"; set @bStat, Int; set @maxbStatVal, 1; callfunc "RequireMaxStat"; bonus bDoubleAddRate, 50; bonus bSpeedAddRate, 10; bonus bHit, -20; bonus bCritical, -25;} 577, BoneDarts, 4, 8000, 4000, 300, 100, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";} 578, SandCutter, 4, 30000, 15000, 1500, 140, 0, 1, 0, 0, 2, 2, 0, 80, 10, 0, {}, {bonus bDoubleAddRate, 5; bonus bHit, 3;} @@ -34,22 +34,22 @@ 590, DragonSword, 4, 8000, 4000, 100, 141, -2, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;} 591, LongSword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";} 594, Spear, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {callfunc "UnreleasedItem";} -596, Pike, 4, 20, 10, 1600, 140, 0, 2, 0, 0, 2, 2, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} -609, ImperialBow, 4, 101000, 40000, 900, 110, 0, 6, -9, 0, 2, 2, 0, 90, 11, 0, {}, {set @bStat, Dex; set @minbStatVal, 80; callfunc "RequireStat"; bonus2 bHPDrainRate, 100, 4; bonus bCriticalDef, 10; bonus bFlee, 10; bonus bAspdRate, 10; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} -623, Scythe, 4, 100, 50, 1200, 100, 0, 2, 0, 0, 2, 2, 0, 1, 3, 0, {}, {} -758, WoodenStaff, 4, 4000, 2000, 1000, 50, 0, 1, 10, 0, 2, 2, 0, 1, 10, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";} +596, Pike, 4, 20, 10, 1600, 140, 0, 2, 0, 0, 2, 34, 0, 0, 1, 0, {}, {callfunc "UnreleasedItem";} +609, ImperialBow, 4, 101000, 40000, 900, 110, 0, 6, -9, 0, 2, 34, 0, 90, 11, 0, {}, {set @bStat, Dex; set @minbStatVal, 80; callfunc "RequireStat"; bonus2 bHPDrainRate, 100, 4; bonus bCriticalDef, 10; bonus bFlee, 10; bonus bAspdRate, 10; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +623, Scythe, 4, 100, 50, 1200, 100, 0, 2, 0, 0, 2, 34, 0, 1, 3, 0, {}, {} +758, WoodenStaff, 4, 4000, 2000, 1000, 50, 0, 1, 10, 0, 2, 34, 0, 1, 10, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";} 762, TerraniteArrow, 10, 80, 20, 1, 50, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 20; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 867, IceGladius, 4, 2000, 1000, 1000, 110, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {bonus bLuk, 1;} -878, BansheeBow, 4, 101000, 40000, 900, 140, 0, 6, -9, 0, 2, 2, 0, 90, 11, 0, {}, {set @bStat, Dex; set @minbStatVal, 80; callfunc "RequireStat"; bonus2 bHPDrainRate, 100, -2; bonus bAspdRate, 20; bonus bMaxHP, -150; bonus bSpeedAddRate, 20; bonus bDefRate, -40; bonus bDef2Rate, -35; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} -903, SlingShot, 4, 500, 50, 10, 5, 0, 4, 0, 0, 2, 2, 0, 1, 11, 0, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} +878, BansheeBow, 4, 101000, 40000, 900, 140, 0, 6, -9, 0, 2, 34, 0, 90, 11, 0, {}, {set @bStat, Dex; set @minbStatVal, 80; callfunc "RequireStat"; bonus2 bHPDrainRate, 100, -2; bonus bAspdRate, 20; bonus bMaxHP, -150; bonus bSpeedAddRate, 20; bonus bDefRate, -40; bonus bDef2Rate, -35; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +903, SlingShot, 4, 500, 50, 10, 5, 0, 4, 0, 0, 2, 34, 0, 1, 11, 0, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} 904, SlingBullet, 10, 1, 0, 1, 3, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_SLING; callfunc "CheckAmmo";} //ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} -906, KidBook, 4, 10000, 5000, 100, 1, 0, 3, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} -907, FloydBook, 4, 10000, 5000, 100, 1, 0, 3, 0, 0, 2, 2, 0, 135, 1, 7, {}, {} -1170, SweetTooth, 4, 4000, 2000, 1000, 50, 0, 1, 15, 0, 2, 2, 0, 1, 10, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";} +906, KidBook, 4, 10000, 5000, 100, 1, 0, 3, 0, 0, 2, 34, 0, 1, 1, 0, {}, {} +907, FloydBook, 4, 10000, 5000, 100, 1, 0, 3, 0, 0, 2, 34, 0, 135, 1, 7, {}, {} +1170, SweetTooth, 4, 4000, 2000, 1000, 50, 0, 1, 15, 0, 2, 34, 0, 1, 10, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";} 1171, Wand, 4, 400, 200, 100, 1, 0, 1, 5, 0, 2, 2, 0, 1, 1, 0, {}, {set @bStat, Int; set @minbStatVal, 5; callfunc "RequireStat";} 1199, Arrow, 10, 1, 0, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} -1200, Bow, 4, 1000, 500, 20, 20, 0, 5, -2, 0, 2, 2, 0, 4, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +1200, Bow, 4, 1000, 500, 20, 20, 0, 5, -2, 0, 2, 34, 0, 4, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 1201, Knife, 4, 50, 25, 120, 5, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} 1215, ToySabre, 4, 2000000, 25, 1, 1, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {} 1282, BoneArrows, 10, 50, 20, 0, 55, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 1; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} |