From 78eaa2c3f9bb6c81a531dbfe5d4d9d20e970b254 Mon Sep 17 00:00:00 2001 From: HoraK-FDF Date: Sat, 29 Jan 2022 11:21:10 +0100 Subject: Lucca Weigth Check (#602) --- world/map/npc/002-1/luca.txt | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/world/map/npc/002-1/luca.txt b/world/map/npc/002-1/luca.txt index 4a05b757..f866ebad 100644 --- a/world/map/npc/002-1/luca.txt +++ b/world/map/npc/002-1/luca.txt @@ -257,11 +257,11 @@ L_teachmore: if (!(@mallard && @brawling && @speed && @poison && @astralsoul && @raging) || (FLAGS & FLAG_LUCA_GOT_SIX_SKILLS)) goto L_Check2Skills; mes "[Luca the Hunter]"; - mes "I've heard you learned all six Focus Skills."; - mes "For that, the other teachers and I want to give you a reward!"; + mes "\"I've heard you learned all six Focus Skills."; + mes "For that, the other teachers and I want to give you a reward!\""; next; getinventorylist; - if (@inventorylist_count == 100) goto L_InvFull; + if ((checkweight(@luca_reward_item_id[0], 1) == 0) || (@inventorylist_count == 100)) goto L_InvFull; mes "Here take the [@@" + @luca_reward_item_id[0] + "|@@]."; mes "[" + @luca_reward_exp[0] + " experience points]"; getitem @luca_reward_item_id[0], 1; @@ -273,11 +273,11 @@ L_teachmore: L_Check2Skills: if (@lvl9skills < 2 || (FLAGS & FLAG_LUCA_2SKILLS_MAXED)) goto L_Check4Skills; mes "[Luca the Hunter]"; - mes "I sense you have maxed out two Focus Skills!"; - mes "For that I give you a reward!"; + mes "\"I sense you have maxed out two Focus Skills!"; + mes "For that I give you a reward!\""; next; getinventorylist; - if (@inventorylist_count == 100) goto L_InvFull; + if ((checkweight(@luca_reward_item_id[1], 1) == 0) || (@inventorylist_count == 100)) goto L_InvFull; mes "Here take the [@@" + @luca_reward_item_id[1] + "|@@]."; mes "[" + @luca_reward_exp[1] + " experience points]"; getitem @luca_reward_item_id[1], 1; @@ -289,11 +289,11 @@ L_Check2Skills: L_Check4Skills: if (@lvl9skills < 4 || (FLAGS & FLAG_LUCA_4SKILLS_MAXED)) goto L_Check6Skills; mes "[Luca the Hunter]"; - mes "I sense you have maxed out four Focus Skills!"; - mes "For that I give the next reward!"; + mes "\"I sense you have maxed out four Focus Skills!"; + mes "For that I give the next reward!\""; next; getinventorylist; - if (@inventorylist_count == 100) goto L_InvFull; + if ((checkweight(@luca_reward_item_id[2], 1) == 0) || (@inventorylist_count == 100)) goto L_InvFull; mes "Here take the [@@" + @luca_reward_item_id[2] + "|@@]."; mes "[" + @luca_reward_exp[2] + " experience points]"; getitem @luca_reward_item_id[2], 1; @@ -305,11 +305,11 @@ L_Check4Skills: L_Check6Skills: if (@lvl9skills < 6 || (FLAGS & FLAG_LUCA_6SKILLS_MAXED)) goto L_CheckSkillsEnd; mes "[Luca the Hunter]"; - mes "I sense you have maxed out six Focus Skills!"; - mes "For that I give the final reward!"; + mes "\"I sense you have maxed out six Focus Skills!"; + mes "For that I give the final reward!\""; next; getinventorylist; - if (@inventorylist_count == 100) goto L_InvFull; + if ((checkweight(@luca_reward_item_id[3], 1) == 0) || (@inventorylist_count == 100)) goto L_InvFull; mes "Here take the [@@" + @luca_reward_item_id[3] + "|@@]."; mes "[" + @luca_reward_exp[3] + " experience points]"; getitem @luca_reward_item_id[3], 1; @@ -320,8 +320,8 @@ L_Check6Skills: L_InvFull: mes "[Luca the Hunter]"; - mes "Looks like your bag is full!"; - mes "To get your reward you must make some room first!"; + mes "\"Looks like your bag is full!"; + mes "To get your reward you must make some room first!\""; next; goto L_CheckSkillsEnd; -- cgit v1.2.3-60-g2f50