diff options
Diffstat (limited to 'world/map')
-rw-r--r-- | world/map/db/item_db_use.txt | 5 | ||||
-rw-r--r-- | world/map/db/mob_db.conf | 4 | ||||
-rw-r--r-- | world/map/npc/009-2/airlia.txt | 19 | ||||
-rw-r--r-- | world/map/npc/018-3/_mobs.txt | 2 | ||||
-rw-r--r-- | world/map/npc/043-3/_mobs.txt | 1 | ||||
-rw-r--r-- | world/map/npc/043-4/_mobs.txt | 1 | ||||
-rw-r--r-- | world/map/npc/annuals/tree_beard.txt | 9 | ||||
-rw-r--r-- | world/map/npc/functions/dailyquest.txt | 2 | ||||
-rw-r--r-- | world/map/npc/items/unreleased_item.txt | 11 | ||||
-rw-r--r-- | world/map/npc/magic/level2-make-bones.txt | 13 |
10 files changed, 60 insertions, 7 deletions
diff --git a/world/map/db/item_db_use.txt b/world/map/db/item_db_use.txt index 12019781..2de922c0 100644 --- a/world/map/db/item_db_use.txt +++ b/world/map/db/item_db_use.txt @@ -102,3 +102,8 @@ 5237, CaramelCandy, 0, 700, 350, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 350, 0, 1;}, {} 5251, Tomato, 0, 700, 350, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {heal 200, 5, 1;}, {} 5263, LovePotion, 0, 90000, 550, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "LovePotion";}, {} +5141, AlizarinScroll, 0, 3000, 1000, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} +5142, CobaltScroll, 0, 3000, 1000, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} +5143, GambogeScroll, 0, 3000, 1000, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} +5144, MauveScroll, 0, 3000, 1000, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} +5145, JoyplimScroll, 0, 3000, 1000, 5, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, {callfunc "UnreleasedScroll";}, {} diff --git a/world/map/db/mob_db.conf b/world/map/db/mob_db.conf index c0a6664a..8a54b980 100644 --- a/world/map/db/mob_db.conf +++ b/world/map/db/mob_db.conf @@ -1752,8 +1752,9 @@ mob_db: ( MutationCount: 2 MutationStrength: 30 Drops: { - DarkCrystal: 1000 PileOfAsh: 5000 + DarkCrystal: 1000 + Skull: 500 } }, { @@ -1799,6 +1800,7 @@ mob_db: ( MutationStrength: 20 Drops: { DarkCrystal: 1000 + Skull: 500 } }, { diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 71726331..8aaecd82 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -47,17 +47,17 @@ L_Caretaker: mes "[Airlia]"; - mes "\"Greetings. Do you need a housing permit, or to license your mount?\""; + mes "\"Greetings. Do you need a housing permit, or to license your shop?\""; next; if (QUEST_Graveyard_Caretaker < @Q_STATUS_RECIEVED_FIRST_LETTER) menu "Sorry, no.", L_Next, - "My what?", L_mount; + "Shop?", L_mount; if (QUEST_Graveyard_Caretaker == @Q_STATUS_RECIEVED_FIRST_LETTER) menu "Sorry, no.", L_Next, "I have a letter from your father.", L_first_reward, - "My what?", L_mount; + "Shop?", L_mount; goto L_Next; L_Next: @@ -66,8 +66,17 @@ L_Next: close; L_mount: - // The mention of mounts will certainly gather some interest from players, - // this section may be extended. + mes "[Airlia]"; + mesq l("Yes, some adventurers set up their own shops. However, unless they have citizenship, they're not allowed in Hurnscald without paying a symbolic monthly fee of 100,000,000 GP."); + next; + mes "[Airlia]"; + mesq l("This is a measure to protect Hurnscald domestic trade, I hope you understand. However, you can still set a shop in Tulimshar Bazaar, where [@@https://wiki.themanaworld.org/index.php/Classic:ManaMarket|ManaMarket@@] is."); + next; + mes "[Airlia]"; + mesq l("Anyone can set up their own shop in the Bazaar, but they'll be rate-limited, so there's a limit of trades it can do. You can also ask for official approval to be immune to this, I advise reading [@@https://forums.themanaworld.org/viewtopic.php?t=20882|these suggestions@@] which make more likely to acquire approval."); + next; + mes "[Airlia]"; + mesq l("But you pretty much must ask an admin and follow the game rules, and the team will decide. Ah, I fear if they don't lift this restriction I'll be without a job, but at least I'm not the Constable in charge of policing the town."); close; L_first_reward: diff --git a/world/map/npc/018-3/_mobs.txt b/world/map/npc/018-3/_mobs.txt index 57c48654..0065e354 100644 --- a/world/map/npc/018-3/_mobs.txt +++ b/world/map/npc/018-3/_mobs.txt @@ -24,3 +24,5 @@ 018-3,68,101,5,4|monster|CaveSnake|1021,4,60000ms,30000ms 018-3,153,96,18,17|monster|CaveMaggot|1056,4,100000ms,30000ms 018-3,99,99,17,17|monster|CaveMaggot|1056,4,100000ms,30000ms +018-3,98,75,1,2|monster|FireSkull|1023,1,120000ms,60000ms +018-3,100,75,1,2|monster|PoisonSkull|1024,1,120000ms,60000ms diff --git a/world/map/npc/043-3/_mobs.txt b/world/map/npc/043-3/_mobs.txt index 772c8921..b713eb69 100644 --- a/world/map/npc/043-3/_mobs.txt +++ b/world/map/npc/043-3/_mobs.txt @@ -10,3 +10,4 @@ 043-3,116,78,25,19|monster|AngryFireGoblin|1108,8,30000ms,30000ms 043-3,113,47,30,22|monster|RedSlime|1008,15,45000ms,35000ms 043-3,94,44,40,18|monster|GreenSlime|1005,5,30000ms,15000ms +043-3,20,20,120,120|monster|Bif|1172,15,30000ms,15000ms diff --git a/world/map/npc/043-4/_mobs.txt b/world/map/npc/043-4/_mobs.txt index 2d410126..c3b21963 100644 --- a/world/map/npc/043-4/_mobs.txt +++ b/world/map/npc/043-4/_mobs.txt @@ -23,3 +23,4 @@ 043-4,45,106,18,25|monster|Troll|1054,5,100000ms,50000ms 043-4,39,138,19,17|monster|BlackScorpion|1009,5,100000ms,50000ms 043-4,133,123,30,23|monster|Troll|1054,3,100000ms,50000ms +043-4,20,20,200,180|monster|Bif|1172,25,30000ms,15000ms diff --git a/world/map/npc/annuals/tree_beard.txt b/world/map/npc/annuals/tree_beard.txt index 8d24930c..46e059d3 100644 --- a/world/map/npc/annuals/tree_beard.txt +++ b/world/map/npc/annuals/tree_beard.txt @@ -68,6 +68,13 @@ end; } +099-7,90,27,0|script|Present#4|386 +{ + callfunc "XmasStates"; + callfunc "XmasMainItemReward"; + close; +} + function|script|SpawnMobs { donpcevent "XmasSpawnManager::OnCommandSpawnStart"; @@ -84,12 +91,14 @@ L_DeliverPresents: enablenpc "Present#1"; enablenpc "Present#2"; enablenpc "Present#3"; + enablenpc "Present#4"; goto L_Return; L_DisablePresents: disablenpc "Present#1"; disablenpc "Present#2"; disablenpc "Present#3"; + disablenpc "Present#4"; goto L_Return; L_Return: diff --git a/world/map/npc/functions/dailyquest.txt b/world/map/npc/functions/dailyquest.txt index 4bbe7800..5f2a5d85 100644 --- a/world/map/npc/functions/dailyquest.txt +++ b/world/map/npc/functions/dailyquest.txt @@ -58,6 +58,7 @@ L_Bonus: function|script|DailyQuest { + set @multipler, 0; callfunc "DailyQuestPoints"; if (BaseLevel < @dq_level) @@ -79,6 +80,7 @@ L_Next: L_Trade: if (countitem(@dq_name$) < @dq_count) goto L_Not_Enough; + set @multipler, 1; delitem @dq_name$, @dq_count; set Zeny, Zeny + @dq_money; diff --git a/world/map/npc/items/unreleased_item.txt b/world/map/npc/items/unreleased_item.txt index d8bb9e07..a04b0843 100644 --- a/world/map/npc/items/unreleased_item.txt +++ b/world/map/npc/items/unreleased_item.txt @@ -15,3 +15,14 @@ function|script|UnreleasedItem L_Return: return; } + + +function|script|UnreleasedScroll +{ + message strcharinfo(0), "You have difficulties using this item, as if it is not yet fully in this world."; + set Zeny, Zeny + 1000; // Force the sell + goto L_Return; + +L_Return: + return; +} diff --git a/world/map/npc/magic/level2-make-bones.txt b/world/map/npc/magic/level2-make-bones.txt index 3cd9989a..2cc3f922 100644 --- a/world/map/npc/magic/level2-make-bones.txt +++ b/world/map/npc/magic/level2-make-bones.txt @@ -4,8 +4,19 @@ if (Sp < 16) end; if (getskilllv(SKILL_MAGIC) < .level) end; if (getskilllv(.school) < .level) end; - if (countitem(Bone) < 1) end; + if (countitem(AnimalBones) > 0) goto L_Animal; + if (countitem(Bone) > 0) goto L_Normal; + end; + +L_Animal: + delitem AnimalBones, 1; + goto L_Resume; + +L_Normal: delitem Bone, 1; + goto L_Resume; + +L_Resume: set @_M_BLOCK, 1; // block casting, until the timer clears it addtimer 5000, "Magic Timer::OnClear"; // set the new debuff sc_start SC_COOLDOWN, 5000, 0, BL_ID; |