Merge branch 'master' into heroes_holdheroes_hold

1 files changed, 6 insertions, 1 deletions

diff --git a/npc/012-1/luffyx.txt b/npc/012-1/luffyx.txt
index 96ac80a96..d3f0adae1 100644
--- a/npc/012-1/luffyx.txt
+++ b/npc/012-1/luffyx.txt
@@ -27,7 +27,11 @@ L_SummerQuest:
     mesq l("Hey, do you know what is good on summer? @@!", getitemlink(LuffyxSummerShorts));
     next;
     mesn;
-    mesq l("What about you bring me 60 @@, 40 @@ and 20 @@? And a @@!", getitemlink(CactusCocktail), getitemlink(AppleCocktail), getitemlink(CherryCocktail), getitemlink(JeansShorts));
+    mes l("What about you bring me:");
+    mes l("@@/60 @@", countitem(CactusCocktail), getitemlink(CactusCocktail));
+    mes l("@@/40 @@", countitem(AppleCocktail), getitemlink(AppleCocktail));
+    mes l("@@/20 @@", countitem(CherryCocktail), getitemlink(CherryCocktail));
+    mes l("@@/1 @@", countitem(JeansShorts), getitemlink(JeansShorts));
     next;
     select
         l("Not now, thanks"),
@@ -49,6 +53,7 @@ L_SummerQuest:
         delitem CactusCocktail, 60;
         delitem JeansShorts, 1;
         getitem LuffyxSummerShorts, 1;
+        getexp 6500, 120;
         setq SQuest_Summer, 1;
         mesn;
         mesq l("Yay yay! Many thanks! Here, take the reward as promised!");