From 62a866fb025efa73994ce11fa0638125953f224d Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Sat, 1 Jun 2024 11:20:10 +0200 Subject: KeepAfterUse + DontUseAmmo --- world/map/db/item_db.conf | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 466b9526..60a97c4c 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1611,7 +1611,12 @@ item_db: ( Loc: "EQP_HAND_R" Refine: false ViewSprite: 910 + DontUseAmmo: true Subtype: "W_BOW" + Script: <" + //set @LauncherType, AMMO_DONT_USE; // @TMWA + //callfunc "CheckLauncher"; // @TMWA + "> }, { Id: 1227 @@ -16237,9 +16242,8 @@ item_db: ( } else { //@EVOL2 doevent "Shovel::OnDig"; //@EVOL2 } //@EVOL2 - //getitem IronShovel, 1; // @TMWA + //callfunc "useShovel"; // @TMWA "> - // TODO: add keep after use flag to evolved.py and tmwa and replicate the 5 lines above }, { Id: 5330 @@ -16542,7 +16546,8 @@ item_db: ( noauction: true noselltonpc: true Script: <" - getitem PirateTreasureMap, 1; + set @MapName$, "PirateTreasureMap"; + callfunc "readMap"; "> } }, @@ -16565,7 +16570,8 @@ item_db: ( noauction: true noselltonpc: true Script: <" - getitem DungeonMap, 1; + set @MapName$, "DungeonMap"; + callfunc "readMap"; "> } }, @@ -16588,7 +16594,8 @@ item_db: ( noauction: true noselltonpc: true Script: <" - getitem TreasureMap, 1; + set @MapName$, "TreasureMap"; + callfunc "readMap"; "> } }, -- cgit v1.2.3-70-g09d2 From edff1967ef79a4f9881f212ed277f94de2a0c6d6 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Thu, 6 Jun 2024 23:19:44 +0200 Subject: Pumpkin to RipePumpkin --- world/map/db/const-aegis.txt | 2 +- world/map/db/item_db.conf | 4 ++-- world/map/db/item_db_use.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index a1cd00ae..3676decc 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -991,7 +991,7 @@ PumpkinJuice 5343 ChocolateBiscuit 5344 ChocolateBunny 5345 Potatoz 5346 -Pumpkin 5347 +RipePumpkin 5347 FruitSalad 5348 DuckEgg 5349 Dragonfruit 5350 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 60a97c4c..0bb35211 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -16473,8 +16473,8 @@ item_db: ( }, { Id: 5347 - AegisName: "Pumpkin" - Name: "Pumpkin" + AegisName: "RipePumpkin" + Name: "RipePumpkin" Type: "IT_USABLE" Buy: 170 Sell: 85 diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index a1b8ff96..e4783e41 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -135,7 +135,7 @@ 5344, ChocolateBiscuit, 0, 80, 40, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 100, 0, 1;}, {} 5345, ChocolateBunny, 0, 175, 88, 12, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 250, 0, 1;}, {} 5346, Potatoz, 0, 230, 115, 8, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 450, 0, 1;}, {} -5347, Pumpkin, 0, 170, 85, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 300, 0, 1;}, {} +5347, RipePumpkin, 0, 170, 85, 120, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 300, 0, 1;}, {} 5348, FruitSalad, 0, 240, 120, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 475, 0, 1;}, {} 5349, DuckEgg, 0, 200, 100, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 150, 50, 1;}, {} 5350, Dragonfruit, 0, 230, 115, 14, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 600, 0, 1;}, {} -- cgit v1.2.3-70-g09d2 From 7ded4cfe66d031587fa82849756f8276e08d875b Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Fri, 7 Jun 2024 08:51:04 +0200 Subject: Bromenal set rebalance --- world/map/db/item_db.conf | 30 +++++++++++++++--------------- world/map/db/item_db_chest.txt | 2 +- world/map/db/item_db_foot.txt | 2 +- world/map/db/item_db_hand.txt | 2 +- world/map/db/item_db_head.txt | 2 +- world/map/db/item_db_leg.txt | 2 +- world/map/db/item_db_offhand.txt | 2 +- 7 files changed, 21 insertions(+), 21 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 0bb35211..277b033e 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1981,15 +1981,15 @@ item_db: ( Type: "IT_ARMOR" Buy: 8000 Sell: 500 - Weight: 30 - Matk: -2 - Def: 1 + Weight: 250 + Matk: -14 + Def: 4 Slots: 0 Loc: "EQP_SHOES" Refine: false ViewSprite: 792 Script: <" - bonus bMatkRate, -2; // @EVOL2 + bonus bMatkRate, -14; // @EVOL2 "> }, { @@ -6295,14 +6295,14 @@ item_db: ( Buy: 100000 Sell: 3000 Weight: 2000 - Matk: -170 + Matk: -150 Def: 25 Slots: 0 Loc: "EQP_HEAD_MID" Refine: false ViewSprite: 793 Script: <" - bonus bMatkRate, -170; // @EVOL2 + bonus bMatkRate, -150; // @EVOL2 "> }, { @@ -11286,7 +11286,7 @@ item_db: ( Sell: 1500 Weight: 400 Matk: -30 - Def: 15 + Def: 16 Slots: 0 Loc: "EQP_HEAD_TOP" Refine: false @@ -16832,7 +16832,7 @@ item_db: ( Sell: 1000 Weight: 150 Matk: -12 - Def: 6 + Def: 7 Slots: 0 Loc: "EQP_HEAD_LOW" Refine: false @@ -17754,14 +17754,14 @@ item_db: ( Buy: 6000 Sell: 2000 Weight: 40 - Matk: -20 - Def: 4 + Matk: -25 + Def: 5 Slots: 0 Loc: "EQP_GARMENT" Refine: false ViewSprite: 794 Script: <" - bonus bMatkRate, -20; // @EVOL2 + bonus bMatkRate, -25; // @EVOL2 "> }, { @@ -18040,15 +18040,15 @@ item_db: ( Type: "IT_ARMOR" Buy: 40000 Sell: 3000 - Weight: 2500 - Matk: -200 - Def: 20 + Weight: 2000 + Matk: -160 + Def: 18 Slots: 0 Loc: "EQP_HAND_L" Refine: false ViewSprite: 797 Script: <" - bonus bMatkRate, -200; // @EVOL2 + bonus bMatkRate, -160; // @EVOL2 "> //Disabled: true // @TMWA }, diff --git a/world/map/db/item_db_chest.txt b/world/map/db/item_db_chest.txt index 27b04137..ff48e16e 100644 --- a/world/map/db/item_db_chest.txt +++ b/world/map/db/item_db_chest.txt @@ -26,7 +26,7 @@ 782, ForestArmor, 5, 3000, 1500, 40, 0, 10, 0, -20, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bDex, 3;} 783, PlatynaRedDress, 5, 100000, 50000, 35, 0, 15, 0, 3, 0, 2, 512, 0, 0, 0, 0, {}, {} 791, YetiSkinShirt, 5, 20000, 10000, 20, 0, 12, 0, -12, 0, 2, 512, 0, 0, 0, 0, {}, {} -793, BromenalChest, 5, 100000, 3000, 2000, 0, 25, 0, -170, 0, 2, 512, 0, 0, 0, 0, {}, {} +793, BromenalChest, 5, 100000, 3000, 2000, 0, 25, 0, -150, 0, 2, 512, 0, 0, 0, 0, {}, {} 798, SorcererRed, 5, 8000, 4000, 5, 0, 5, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {bonus bAgi, 1;} 870, FineDress, 5, 10000, 5000, 35, 0, 8, 0, 20, 0, 2, 512, 0, 0, 0, 0, {}, {} 880, LazuriteRobe, 5, 92000, 52000, 30, 0, 7, 0, 60, 0, 2, 512, 0, 90, 0, 0, {}, {set @bStat, Int; set @minbStatVal, 70; callfunc "RequireStat"; set @bStat, Vit; set @minbStatVal, 40; callfunc "RequireStat"; bonus bDef2Rate, -40; bonus bMdef, 60; bonus bVit, -1; bonus bInt, 7; bonus bLuk, -1; bonus bDex, -1; bonus bStr, -1;} diff --git a/world/map/db/item_db_foot.txt b/world/map/db/item_db_foot.txt index ac5264de..10f1d07c 100644 --- a/world/map/db/item_db_foot.txt +++ b/world/map/db/item_db_foot.txt @@ -7,7 +7,7 @@ 734, BlackBoots, 5, 20000, 3000, 110, 0, 3, 0, -10, 0, 2, 64, 0, 0, 0, 0, {}, {} 735, CottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, 0, {}, {} 757, AssassinBoots, 5, 7000, 2000, 10, 0, 3, 0, -3, 0, 2, 64, 0, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 4;} -792, BromenalBoots, 5, 8000, 500, 30, 0, 1, 0, -2, 0, 2, 64, 0, 0, 0, 0, {}, {} +792, BromenalBoots, 5, 8000, 500, 250, 0, 4, 0, -14, 0, 2, 64, 0, 0, 0, 0, {}, {} 876, WarlordBoots, 5, 19000, 2000, 550, 0, 5, 0, -22, 0, 2, 64, 0, 0, 0, 0, {}, {} 1188, RedStockings, 5, 7000, 2000, 10, 0, 1, 0, 2, 0, 2, 64, 0, 0, 0, 0, {}, {} 2150, RedCottonBoots, 5, 2000, 500, 10, 0, 1, 0, 1, 0, 2, 64, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_hand.txt b/world/map/db/item_db_hand.txt index 3e4e76f0..94a167d1 100644 --- a/world/map/db/item_db_hand.txt +++ b/world/map/db/item_db_hand.txt @@ -7,7 +7,7 @@ 563, WinterGloves, 5, 6000, 3000, 20, 0, 3, 0, -15, 0, 2, 4, 0, 0, 0, 0, {}, {} 741, CottonGloves, 5, 2000, 500, 10, 0, 1, 0, -10, 0, 2, 4, 0, 0, 0, 0, {}, {} 756, AssassinGloves, 5, 7000, 2000, 9, 0, 3, 0, -3, 0, 2, 4, 0, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 4;} -794, BromenalGloves, 5, 6000, 2000, 40, 0, 4, 0, -20, 0, 2, 4, 0, 0, 0, 0, {}, {} +794, BromenalGloves, 5, 6000, 2000, 40, 0, 5, 0, -25, 0, 2, 4, 0, 0, 0, 0, {}, {} 868, SilkGloves, 5, 5000, 2500, 4, 0, 1, 0, 0, 0, 2, 4, 0, 0, 0, 0, {}, {} 2160, RedCottonGloves, 5, 2000, 500, 20, 0, 1, 0, -10, 0, 2, 4, 0, 0, 0, 0, {}, {} 2161, GreenCottonGloves, 5, 2000, 500, 20, 0, 1, 0, -10, 0, 2, 4, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt index 7c4ae5d7..08a7b5c1 100644 --- a/world/map/db/item_db_head.txt +++ b/world/map/db/item_db_head.txt @@ -52,7 +52,7 @@ 769, GuyFawkesMask, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {} 770, FairyHat, 5, 2000, 1000, 20, 0, 5, 0, -10, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 3;} 781, WitchDoctorsMask, 5, 20000, 100, 20, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, 0, {}, {} -795, BromenalHelmet, 5, 15000, 1500, 400, 0, 15, 0, -30, 0, 2, 256, 0, 0, 0, 0, {}, {} +795, BromenalHelmet, 5, 15000, 1500, 400, 0, 16, 0, -30, 0, 2, 256, 0, 0, 0, 0, {}, {} 800, BowlerHatBrown, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, 0, {}, {} 801, PinkieHelmet, 5, 20000, 1500, 800, 0, 10, 0, -20, 0, 2, 256, 0, 0, 0, 0, {}, {bonus bLuk, 1;} 848, Earmuffs, 5, 1000, 500, 20, 0, 2, 0, -1, 0, 2, 256, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_leg.txt b/world/map/db/item_db_leg.txt index 3e23b810..6e15b47e 100644 --- a/world/map/db/item_db_leg.txt +++ b/world/map/db/item_db_leg.txt @@ -10,7 +10,7 @@ 731, AssassinPants, 5, 10000, 3000, 20, 0, 4, 0, -5, 0, 2, 1, 0, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 5;} 768, TerraniteLegs, 5, 10000, 3000, 30, 0, 5, 0, -8, 0, 2, 1, 0, 0, 0, 0, {}, {bonus bAgi, 1; bonus bMdef, 5;} 771, Miniskirt, 5, 1000, 500, 8, 0, 4, 0, -8, 0, 2, 1, 0, 1, 0, 0, {}, {} -796, BromenalLegs, 5, 2000, 1000, 150, 0, 6, 0, -12, 0, 2, 1, 0, 0, 0, 0, {}, {} +796, BromenalLegs, 5, 2000, 1000, 150, 0, 7, 0, -12, 0, 2, 1, 0, 0, 0, 0, {}, {} 857, LeatherTrousers, 5, 1000, 500, 25, 0, 5, 0, -4, 0, 2, 1, 0, 0, 0, 0, {}, {bonus bHit, 2;} 881, RaggedShorts, 5, 60, 1, 7, 0, 1, 0, -2, 0, 2, 1, 0, 1, 0, 0, {}, {} 1172, SilkPants, 5, 20000, 750, 10, 0, 2, 0, 0, 0, 2, 1, 0, 1, 0, 0, {}, {} diff --git a/world/map/db/item_db_offhand.txt b/world/map/db/item_db_offhand.txt index e3bb7485..39d5d4a4 100644 --- a/world/map/db/item_db_offhand.txt +++ b/world/map/db/item_db_offhand.txt @@ -6,5 +6,5 @@ 601, SteelShield, 5, 40000, 3000, 2500, 0, 20, 0, -200, 0, 2, 32, 0, 0, 0, 0, {}, {} 602, WoodenShield, 5, 10000, 2000, 1500, 0, 14, 0, -70, 0, 2, 32, 0, 0, 0, 0, {}, {} 603, LeatherShield, 5, 2000, 1000, 1300, 0, 7, 0, -35, 0, 2, 32, 0, 0, 0, 0, {}, {} -//797, BromenalShield, 5, 40000, 3000, 2500, 0, 20, 0, -200, 0, 2, 32, 0, 0, 0, 0, {}, {} +//797, BromenalShield, 5, 40000, 3000, 2000, 0, 18, 0, -160, 0, 2, 32, 0, 0, 0, 0, {}, {} 5285, DragonShield, 5, 40000, 3000, 2500, 0, 27, 0, -200, 0, 2, 32, 0, 0, 0, 0, {}, {} -- cgit v1.2.3-70-g09d2 From 81436cff429e0b05c04d640be122b2ad0daeca90 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 1 Jul 2024 22:15:30 +0200 Subject: stones and crystals --- world/map/db/const-aegis.txt | 8 +++ world/map/db/item_db.conf | 94 ++++++++++++++++++++++++++++++++++++ world/map/db/item_db_generic.txt | 4 ++ world/map/db/item_db_use.txt | 3 ++ world/map/npc/items/anchor_stone.txt | 56 +++++++++++++++++++++ world/map/npc/mobs/mob_points.txt | 4 +- world/map/npc/scripts.conf | 1 + 7 files changed, 169 insertions(+), 1 deletion(-) create mode 100644 world/map/npc/items/anchor_stone.txt (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index 3676decc..6ce13f20 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -387,6 +387,10 @@ JunglefowlFeather 5375 KingChonkyBirbFeather 5376 Honeycomb 5377 Beeswax 5378 +Stone 5380 +Brick 5381 +MountainCrystal 5384 +BlackQuarz 5385 LeatherShirt 523 DesertShirt 546 Turtleneck 564 @@ -1003,6 +1007,8 @@ ButterButterfly 5364 JunglefowlEgg 5373 KingChonkyBirbEgg 5374 Sauerkraut 5379 +AnchorStone 5382 +AnchoredAnchorStone 5383 CottonShorts 586 JeansShorts 610 CottonSkirt 632 @@ -1297,3 +1303,5 @@ SmallRubyBif 1221 SmallSapphireBif 1222 SmallTopazBif 1223 CoalGolem 1224 +StoneSlime 1225 +StoneGolem 1226 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 277b033e..644a9a9e 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -5860,6 +5860,50 @@ item_db: ( Refine: false ViewSprite: 5378 }, +{ + Id: 5380 + AegisName: "Stone" + Name: "Stone" + Type: "IT_ETC" + Buy: 1000 + Sell: 500 + Weight: 60 + Refine: false + ViewSprite: 5380 +}, +{ + Id: 5381 + AegisName: "Brick" + Name: "Brick" + Type: "IT_ETC" + Buy: 2000 + Sell: 1000 + Weight: 40 + Refine: false + ViewSprite: 5381 +}, +{ + Id: 5384 + AegisName: "MountainCrystal" + Name: "MountainCrystal" + Type: "IT_ETC" + Buy: 20000 + Sell: 10000 + Weight: 20 + Refine: false + ViewSprite: 5384 +}, +{ + Id: 5385 + AegisName: "BlackQuarz" + Name: "BlackQuarz" + Type: "IT_ETC" + Buy: 20000 + Sell: 10000 + Weight: 20 + Refine: false + ViewSprite: 5385 +}, /* Chest Armor */ { Id: 523 @@ -16670,6 +16714,56 @@ item_db: ( callfunc "itheal", 500, 0; "> }, +{ + Id: 5382 + AegisName: "AnchorStone" + Name: "AnchorStone" + Type: "IT_USABLE" + Buy: 90000 + Sell: 45000 + Weight: 40 + Refine: false + ViewSprite: 5382 + KeepAfterUse: true + Trade: { + notrade: true + nodrop: true + nocart: true + nomail: true + noauction: true + noselltonpc: true + Script: <" + set @StoneName$, "AnchorStone"; + callfunc "useAnchorStone"; + "> + } +}, +{ + Id: 5383 + AegisName: "AnchoredAnchorStone" + Name: "AnchoredAnchorStone" + Type: "IT_USABLE" + Buy: 0 + Sell: 0 + Weight: 40 + Refine: false + ViewSprite: 5383 + KeepAfterUse: true + Trade: { + notrade: true + nodrop: true + nocart: true + nomail: true + noauction: true + noselltonpc: true + nostorage: true + nogstorage: true + Script: <" + set @StoneName$, "AnchoredAnchorStone"; + callfunc "useAnchorStone"; + "> + } +}, /* Legs Armor */ { Id: 586 diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt index e7802111..731a2d33 100644 --- a/world/map/db/item_db_generic.txt +++ b/world/map/db/item_db_generic.txt @@ -304,3 +304,7 @@ 5376, KingChonkyBirbFeather, 3, 6000, 3000, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5377, Honeycomb, 3, 200, 100, 11, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5378, Beeswax, 3, 2000, 1000, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5380, Stone, 3, 1000, 500, 60, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5381, Brick, 3, 2000, 1000, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5384, MountainCrystal, 3, 20000, 10000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5385, BlackQuarz, 3, 20000, 10000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index e4783e41..2e7c33ca 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -147,3 +147,6 @@ 5373, JunglefowlEgg, 0, 400, 200, 4, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 300, 0, 1;}, {} 5374, KingChonkyBirbEgg, 0, 1500, 750, 22, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 800, 0, 1;}, {} 5379, Sauerkraut, 0, 250, 125, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 500, 0, 1;}, {} +5382, AnchorStone, 0, 90000, 45000, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 23, {set @StoneName$, "AnchorStone"; callfunc "useAnchorStone";}, {} +//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} +5383, AnchoredAnchorStone, 0, 0, 0, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 31, {set @StoneName$, "AnchoredAnchorStone"; callfunc "useAnchorStone";}, {} diff --git a/world/map/npc/items/anchor_stone.txt b/world/map/npc/items/anchor_stone.txt new file mode 100644 index 00000000..52c688f4 --- /dev/null +++ b/world/map/npc/items/anchor_stone.txt @@ -0,0 +1,56 @@ +function|script|useAnchorStone +{ + addtimer 0, "AS_Core::OnUse"; + return; +} + +-|script|AS_Core|32767 +{ + end; + +OnUse: + if ( @StoneName$ == "AnchorStone" ) goto L_AnchorStone; + if ( @StoneName$ == "AnchoredAnchorStone" ) goto L_AnchoredAnchorStone; + goto L_Close; + +L_AnchorStone: + mes "\"You really want to bind the [@@" + AnchorStone + "|@@] to this place?\""; + menu + "No", L_Close, + "Yes", L_AS_Yes; + +L_AS_Yes: + set AnchorStoneDest, getmaphash(getmap()); // since a hash could be negative I take a seperate variable for that since shifting would destroy the sign bit and create a different hash + set AnchorStoneDestCoord, gety() << AS_Y_SHIFT | getx() << AS_X_SHIFT; + + delitem AnchorStone, 1; + getitem AnchoredAnchorStone, 1; + close; + +L_AnchoredAnchorStone: + if ((AnchorStoneDest < 1) && (AnchorStoneDest > -1)) goto L_AAS_Error; + mes "\"You want to recall to the place the [@@" + AnchoredAnchorStone + "|@@] is bond to?\""; + menu + "No", L_Close, + "Yes", L_AAS_Yes; + +L_AAS_Yes: + warp getmapnamefromhash(AnchorStoneDest), (AnchorStoneDestCoord & AS_X_MASK >> AS_X_SHIFT), (AnchorStoneDestCoord & AS_Y_MASK >> AS_Y_SHIFT); + + goto L_AAStoAS; + +L_AAS_Error: + mes "\"Something went wrong the [@@" + AnchoredAnchorStone + "|@@] lost its destination and turns back to normal.\""; + goto L_AAStoAS; + +L_AAStoAS: + set AnchorStoneDest, 0; + set AnchorStoneDestCoord, 0; + + delitem AnchoredAnchorStone, 1; + getitem AnchorStone, 1; + close; + +L_Close: + close; +} diff --git a/world/map/npc/mobs/mob_points.txt b/world/map/npc/mobs/mob_points.txt index d0ede2f1..2589f1eb 100644 --- a/world/map/npc/mobs/mob_points.txt +++ b/world/map/npc/mobs/mob_points.txt @@ -232,7 +232,9 @@ function|script|MobPoints 1, // 1221 SmallRubyBif 1, // 1222 SmallSapphireBif 1, // 1223 SmallTopazBif - 200 // 1224 CoalGolem + 200, // 1224 CoalGolem + 25, // 1225 StoneSlime + 200 // 1226 StoneGolem ; // END // the following mobs where replaced by other mobs: diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf index 17045566..b0a5f0c2 100644 --- a/world/map/npc/scripts.conf +++ b/world/map/npc/scripts.conf @@ -64,6 +64,7 @@ npc: npc/items/underworld_troll.txt npc: npc/items/silver_bell.txt npc: npc/items/shovel.txt npc: npc/items/maps.txt +npc: npc/items/anchor_stone.txt // Mob Functions npc: npc/mobs/miner_mania.txt -- cgit v1.2.3-70-g09d2 From d0aa3ab70b9af9105a58f7ecb43cc8ca14ea30ce Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Mon, 1 Jul 2024 23:17:10 +0200 Subject: stones and crystals prices --- world/map/db/item_db.conf | 4 ++-- world/map/db/item_db_generic.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 644a9a9e..23913ef7 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -5888,7 +5888,7 @@ item_db: ( Name: "MountainCrystal" Type: "IT_ETC" Buy: 20000 - Sell: 10000 + Sell: 5000 Weight: 20 Refine: false ViewSprite: 5384 @@ -5899,7 +5899,7 @@ item_db: ( Name: "BlackQuarz" Type: "IT_ETC" Buy: 20000 - Sell: 10000 + Sell: 5000 Weight: 20 Refine: false ViewSprite: 5385 diff --git a/world/map/db/item_db_generic.txt b/world/map/db/item_db_generic.txt index 731a2d33..185ff414 100644 --- a/world/map/db/item_db_generic.txt +++ b/world/map/db/item_db_generic.txt @@ -306,5 +306,5 @@ 5378, Beeswax, 3, 2000, 1000, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5380, Stone, 3, 1000, 500, 60, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} 5381, Brick, 3, 2000, 1000, 40, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} -5384, MountainCrystal, 3, 20000, 10000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} -5385, BlackQuarz, 3, 20000, 10000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5384, MountainCrystal, 3, 20000, 5000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} +5385, BlackQuarz, 3, 20000, 5000, 20, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {}, {} -- cgit v1.2.3-70-g09d2 From 9b33b27743c9d2a46adfa665584066749105a306 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Wed, 3 Jul 2024 20:21:46 +0200 Subject: quarz to quartz --- world/map/db/const-aegis.txt | 2 +- world/map/db/item_db.conf | 4 ++-- world/map/db/mob_db.conf | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index 6ce13f20..c5c19c0f 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -390,7 +390,7 @@ Beeswax 5378 Stone 5380 Brick 5381 MountainCrystal 5384 -BlackQuarz 5385 +BlackQuartz 5385 LeatherShirt 523 DesertShirt 546 Turtleneck 564 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 23913ef7..5b72b8d7 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -5895,8 +5895,8 @@ item_db: ( }, { Id: 5385 - AegisName: "BlackQuarz" - Name: "BlackQuarz" + AegisName: "BlackQuartz" + Name: "BlackQuartz" Type: "IT_ETC" Buy: 20000 Sell: 5000 diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index fa8ba17c..d33b30c4 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -7895,9 +7895,9 @@ mob_db: ( MutationCount: 0 MutationStrength: 0 Drops: { - BlackQuarz: 400 - BlackQuarz: 200 - BlackQuarz: 100 + BlackQuartz: 400 + BlackQuartz: 200 + BlackQuartz: 100 Diamond: 50 Ruby: 50 Emerald: 50 -- cgit v1.2.3-70-g09d2 From 9c96675edb834d5b8c45e98f39cc4279122c5336 Mon Sep 17 00:00:00 2001 From: Ledmitz Date: Wed, 7 Aug 2024 21:36:52 -0300 Subject: Made tomatoes the same buy/sell ratio as the other best-heal items --- client-data | 2 +- world/map/db/item_db.conf | 4 ++-- world/map/db/item_db_use.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/client-data b/client-data index e97dcd76..2455cbf0 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit e97dcd76188549a4d440ae0b62f5128dde585f2b +Subproject commit 2455cbf0b8cf891f482c055184351ec5d22d8637 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 5b72b8d7..b8841cef 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -16190,8 +16190,8 @@ item_db: ( AegisName: "Tomato" Name: "Tomato" Type: "IT_USABLE" - Buy: 40 - Sell: 10 + Buy: 100 + Sell: 50 Weight: 7 Def: 0 Slots: 0 diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 2e7c33ca..162d97ae 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -110,7 +110,7 @@ 5235, TMWBirthdayGift, 0, 1000000, 50, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "TMWBirthdayGift";}, {} 5236, GumiCandy, 0, 10000, 250, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {set Sex, if_then_else(Sex == 3, rand(0, 1), if_then_else(rand(0,1), 3, !Sex));},{} 5237, CaramelCandy, 0, 700, 350, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 350, 0, 1;}, {} -5251, Tomato, 0, 40, 10, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {} +5251, Tomato, 0, 100, 50, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "LovePotion";}, {} //5277, XmasSeeds, 0, 9999, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {heal 150, 0, 1;}, {} 5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{} -- cgit v1.2.3-70-g09d2 From c99701a99de8d132377dd294980949f85f029a54 Mon Sep 17 00:00:00 2001 From: Ledmitz Date: Wed, 7 Aug 2024 22:00:55 -0300 Subject: Made weight match the description as was intended, once again... and made the price much lower to fall in line with reg and iron arrows. --- world/map/db/item_db.conf | 6 +++--- world/map/db/item_db_weapon.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index b8841cef..474abb90 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1234,9 +1234,9 @@ item_db: ( AegisName: "BoneArrows" Name: "BoneArrows" Type: "IT_AMMO" - Buy: 50 - Sell: 20 - Weight: 0 + Buy: 8 + Sell: 4 + Weight: 1 Atk: 55 Slots: 0 Loc: "EQP_AMMO" diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index 17fdcbf0..1c22799d 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -53,7 +53,7 @@ 1200, Bow, 4, 1000, 500, 20, 20, 0, 5, -2, 0, 2, 34, 1, 4, 11, 0, {}, {set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 1201, Knife, 4, 50, 25, 120, 5, 0, 1, 0, 0, 2, 2, 1, 1, 1, 0, {}, {} 1215, ToySabre, 4, 2000000, 25, 1, 1, 0, 1, 0, 0, 2, 2, 1, 1, 2, 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";} +1282, BoneArrows, 10, 8, 4, 1, 55, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 1; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 5260, Snowball, 10, 1, 0, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_XMAS; callfunc "CheckAmmo";} 5261, SnowLauncher, 4, 500, 50, 10, 20, 0, 3, 0, 0, 2, 2, 1, 1, 11, 0, {}, {set @LauncherType, AMMO_XMAS; callfunc "CheckLauncher";} 5284, Flintlock, 4, 150000, 500, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, 0, {}, {callfunc "RestrictedItem"; set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} -- cgit v1.2.3-70-g09d2 From d589ad4eca2c948d1ad2f325d6bb1d52ee17dc2d Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Wed, 7 Aug 2024 23:25:45 +0200 Subject: sc_phys_shield_item --- world/map/db/const.txt | 1 + world/map/db/item_db.conf | 4 ++-- world/map/db/item_db_use.txt | 2 +- world/map/npc/magic/level2-protect.txt | 5 +++++ 4 files changed, 9 insertions(+), 3 deletions(-) (limited to 'world/map/db/item_db.conf') diff --git a/world/map/db/const.txt b/world/map/db/const.txt index 24556b39..2e1aef15 100644 --- a/world/map/db/const.txt +++ b/world/map/db/const.txt @@ -142,6 +142,7 @@ SC_SLOWMOVE 133 SC_CANTMOVE 134 SC_ATKPOT 185 SC_MATKPOT 186 +SC_PHYS_SHIELD_ITEM 193 SC_SHEARED 194 SC_HIDE 194 SC_HALT_REGENERATE 195 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 474abb90..56d61dd2 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -16219,10 +16219,10 @@ item_db: ( callfunc("SC_Bonus", 60, SC_PLUSATTACKPOWER, 50); callfunc("SC_Bonus", 60, SC_ATTHASTE_POTION1, 45); //callfunc("SC_Bonus", 60, SC_PHYS_SHIELD, 40); //@EVOL2 - //callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD, 40); //@TMWA + //callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD_ITEM, 40); //@TMWA + //sc_end SC_PHYS_SHIELD; //@TMWA //misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA "> - // TODO: betsanc of Crazy Rum can be chanceled with detsanc so add SC_PHYS_SHIELD_ITEM to prevent this }, { Id: 5309 diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 162d97ae..2a2afa8b 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -113,7 +113,7 @@ 5251, Tomato, 0, 100, 50, 7, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {callfunc "LovePotion";}, {} //5277, XmasSeeds, 0, 9999, 0, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 7, {heal 150, 0, 1;}, {} -5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD, 60000, 40; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{} +5294, CrazyRum, 0, 40, 10, 2, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_POISON, 60000, 1; sc_start SC_ATKPOT, 60, 50; sc_start SC_SPEEDPOTION0, 60, 45; sc_start SC_PHYS_SHIELD_ITEM, 60000, 40; sc_end SC_PHYS_SHIELD; misceffect FX_MAGIC_SHIELD, strcharinfo(0);},{} 5309, ManaDust, 0, 125, 50, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 35, 15, 1;}, {} 5310, EnlighteningElixir, 0, 500, 250, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {sc_start SC_MATKPOT, 60, 100;}, {} 5312, Honey, 0, 300, 150, 10, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, {heal 200, 50, 1;}, {} diff --git a/world/map/npc/magic/level2-protect.txt b/world/map/npc/magic/level2-protect.txt index 7abc9a1a..4a642878 100644 --- a/world/map/npc/magic/level2-protect.txt +++ b/world/map/npc/magic/level2-protect.txt @@ -1,5 +1,6 @@ -|script|protect|32767 { + if (sc_check(SC_PHYS_SHIELD_ITEM)) goto L_Itsanc; // itsanc has top priority and cant be overwritten by betsanc if(call("magic_checks")) end; if (Sp < 14) end; set .@level, getskilllv(.school); @@ -44,6 +45,10 @@ OnEnd: misceffect FX_MAGIC_SHIELD_ENDS, strcharinfo(0); end; +L_Itsanc: + message strcharinfo(0), "Shield : You are still Itsanced this blocks your spell."; + end; + L_SpecialRules6: if ($@KIMARR_EVENT < 1) goto L_Pay; if (@target_id == BL_ID) goto L_Pay; -- cgit v1.2.3-70-g09d2