Merge branch 'connor-coal' into 'master'

Balance: Increase coal gotten from connor by  2 and other polishing

See merge request ml/serverdata!73

1 files changed, 14 insertions, 9 deletions

diff --git a/npc/020-7-2/connor.txt b/npc/020-7-2/connor.txt
index 9e8701ecb..42ec862d1 100644
--- a/npc/020-7-2/connor.txt
+++ b/npc/020-7-2/connor.txt
@@ -3,32 +3,37 @@
 //    Jesusalva
 //    TMW LoF (Paxel)
 // Description:
-//    Makes Raw Coal to fool the Blue Sage
+//    Gives Coal in exchange for Raw Logs daily
 
 020-7-2,72,23,0	script	Connor	NPC_LOF_FURNACE,{
     .@l=CONNOR_LASTDAY;
     .@t=gettimeparam(GETTIME_DAYOFMONTH);
     mesn;
-    mesq l("Meh, the Blue Sage is truly extravagant. We take @@ for the simplest things as keeping the house warm.", getitemlink(Coal));
+    mesq l("Meh, the Blue Sage is truly wasteful. We use %s even for the simplest things such as keeping the house warm.", getitemlink(Coal));
     next;
     mesn;
-    mesq l("But @@ is too valorous, you can only forge with it! So it sells well, about @@ GP.", getitemlink(Coal), getiteminfo(Coal, ITEMINFO_SELLPRICE));
-    if (.@t == .@l)
+    if (.@t == .@l) {
+        mesq l("But you have already given me firewood today. Come back tomorrow, pal.");
         close;
+    }
+    mesq l("But %s is too valuable to burn and there is no alternative fuel for forges. It sells for %d GP and we are just wasting it here.", getitemlink(Coal), getiteminfo(Coal, ITEMINFO_SELLPRICE));
     next;
     mesn;
-    mesq l("Well, I could burn @@ @@ to make Raw Coal and the Blue Sage would be none the wiser.", 15, getitemlink(RawLog));
+    mesq l("Yet, I could burn %d %s to keep the house just as warm, maybe even cozier, and the Blue Sage would be none the wiser. Fire is fire, warmth is warmth.", 15, getitemlink(RawLog));
     next;
     mesn;
-    mesq l("I can even share with you @@ @@, whaddaya say?", l("three"), getitemlink(Coal)); // ie. whaddaya say -> what do you say
+    mesq l("I can even give you the %s lumps of precious %s we would have burned. Whaddaya say, do we have a deal?", l("five"), getitemlink(Coal)); // ie. whaddaya say -> what do you say
     if (countitem(RawLog) < 15)
         close;
     if (askyesno() == ASK_YES) {
-        inventoryplace Coal, 3;
+        inventoryplace Coal, 5;
         delitem RawLog, 15;
-        getitem Coal, 3;
+        getitem Coal, 5;
         CONNOR_LASTDAY=.@t;
-        getexp getiteminfo(Coal, ITEMINFO_SELLPRICE)+BaseLevel+JobLevel, 15;
+        .@exp=getiteminfo(Coal, ITEMINFO_SELLPRICE)+BaseLevel+JobLevel;
+        .@jobexp=15+JobLevel;
+        getexp .@exp, .@jobexp;
+        mesc l("* Gained %d EXP and %d Job EXP", .@exp, .@jobexp);
         mes "";
         mesn;
         mesq l("Thanks, pal. See you tomorrow.");