Merge branch 'master' into testservertestserver

3 files changed, 46 insertions, 2 deletions

diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index b264b6b09..9c9308d56 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -12,8 +12,22 @@ function	script	clientupdater	{
     if (getmap() ~= "000-0*") {
         UPDATE=gettimetick(2);
     }
+    // If you're in Jail, show a minor message
+    if (getmap() == "sec_pri") {
+        dispbottom l("You seem to be jailed. We cannot unjail offline players, so please don't logout.");
+        dispbottom l("You have the right to defend yourself if you believe we were wrong. If we find out it's true, you'll receive an apology gift.");
+        dispbottom l("Note: Unless you were doing something REALLY bad which is harmful to player community (eg. scamming, hacking, DDoS'ing, etc.)");
+        dispbottom l("Please contact a GM as soon as possible so we can make out a compromise. You should be liberated even if found guilty.");
+    }
 
     .@dg=0;
+    // ERROR fixing
+    if (UPDATE == 1565039378 && #UPDATE < 1565039378) {
+        getitem MysteriousFruit, 1;
+        UPDATE+=1;
+        #UPDATE=1565039378;
+        dispbottom l("Received one @@ as August daily login bug Token of Apology!", getitemlink(MysteriousFruit));
+    }
     // Update handler (use `date +%s` for this)
     // Current UPDATE value: Qui Jun  7 08:10:55 -03 2018
     if (Lang > 5 && UPDATE < 1528369855) {
@@ -574,6 +588,34 @@ function	script	clientupdater	{
         }
         // Update Crafting Score
         CRAFTING_SCORE_COMPLETE=CRAFTING_SCORE*39;
+        // Water bug
+        if (strcharinfo(0) == "JulieWarhawk") {
+            .@dg=true;
+
+            // Sell Bottles
+            if (countitem(BottleOfWoodlandWater) > 1) {
+                delitem BottleOfWoodlandWater, (countitem(BottleOfWoodlandWater)/2)+1;
+            }
+            if (countitem(EmptyBottle)) {
+                delitem EmptyBottle, countitem(EmptyBottle);
+            }
+            if (countitem(IcedBottle)) {
+                delitem IcedBottle, countitem(IcedBottle);
+            }
+            getitem ArcmageBoxset, 1;
+
+            // Unjail player
+            atcommand "@unjail "+strcharinfo(0);
+            mesn "Jesusalva";
+            mesq l("You're right, you never sold any Water Bottle ever. I'm unjailing you.");
+            mesc l("As an Apology Token, you're also receiving one @@.", getitemlink(ArcmageBoxset));
+            next;
+        }
+
+        // Bug reward (FF)
+        if (strcharinfo(0) == "seeds") {
+            getitembound LegendaryMouboo, 1, 1;
+        }
 
     }
     // Test Server Updates
diff --git a/npc/functions/game-rules.txt b/npc/functions/game-rules.txt
index cd528e333..baa60f14c 100644
--- a/npc/functions/game-rules.txt
+++ b/npc/functions/game-rules.txt
@@ -27,7 +27,9 @@ function	script	GameRules	{
         l("6. ##BDo not create multi accounts.##b A person may only hold one account and as many chars as allowed by the server/client. Staff members with special privileges in-game may have a second account without those privileges."),
         l("7. ##BAs long as you have an account, you agree with the [@@https://tmw2.org/legal|Terms Of Service@@]##b. Shall any rule conflict with these terms, the Terms Of Service provided on that link shall prevail."),
         l("8. ##BThe use of real money is prohibited##b for ingame stuff, except by sponsoring."),
-        l("9. ##BAdmit when you're wrong.##b Users trying to lie to or fool GMs will get no pity from them.");
+        l("9. ##BAdmit when you're wrong.##b Users trying to lie to or fool GMs will get no pity from them."),
+        l("10. ##BDo not logout##b at Botcheck area or at Jail. We cannot unjail an offline player. The opposite of rule 9: If you believe you're right, keep your ground and explain calmly what happened. We'll calmly analyse the situation. If you were jailed without guilt, an apology will be sent to you, provided this rule is not broken."),
+        l("11. If you believe you are Not Guilty, but the GM deemed you guilty, request a ##BCouncil Trial##b. It's your right. In a Council Trial, we'll have multiple people giving the veredict. Any player may be called to compose the council. All admins shall take part in it. An arragment relative to time, date, and number of counsellors is to be made.");
     return;
 }
 
diff --git a/npc/functions/refine.txt b/npc/functions/refine.txt
index 48535f91d..6275c042c 100644
--- a/npc/functions/refine.txt
+++ b/npc/functions/refine.txt
@@ -76,7 +76,7 @@ function	script	refineMaster	{
         case 1:
         case 2:
         case 3:
-            .@rg=Wurtizite; break;
+            .@rg=Wurtzite; break;
         case 4:
         case 5:
         case 6: