diff options
| author | Jesusaves <cpntb1@ymail.com> | 2018-07-07 21:12:12 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2018-07-07 21:12:12 -0300 |
| commit | 7715ef42037ad35155eb228666776df6d859943e (patch) | |
| tree | af4c3dc2914cbdd86cc666c65a5aa0a291869548 /npc/012-1 | |
| parent | 7d5f630745276ce8f457547f2e1b8fd926144f18 (diff) | |
| parent | d1256756676bc59bba39f2cde886fd5916861577 (diff) | |
| download | serverdata-7715ef42037ad35155eb228666776df6d859943e.tar.gz serverdata-7715ef42037ad35155eb228666776df6d859943e.tar.bz2 serverdata-7715ef42037ad35155eb228666776df6d859943e.tar.xz serverdata-7715ef42037ad35155eb228666776df6d859943e.zip | |
Merge branch 'master' into heroes_holdheroes_hold
Diffstat (limited to 'npc/012-1')
| -rw-r--r-- | npc/012-1/jack.txt | 2 | ||||
| -rw-r--r-- | npc/012-1/luffyx.txt | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/npc/012-1/jack.txt b/npc/012-1/jack.txt index c1bb45e5b..c66a1a820 100644 --- a/npc/012-1/jack.txt +++ b/npc/012-1/jack.txt @@ -106,7 +106,7 @@ L_Loop: delitem RawLog, 1; .@success=rand(6,26)-.@k; // You will never need more than 20 logs nor less than 5 logs - if (.@success == 1) { + if (.@success <= 1) { mesc l("The wood bends a little, but doesn't breaks."); getexp 295, 100; // 10% of max exp setq2 HurscaldQuest_ForestBow, 99; 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!"); |