FIX THE PVP BUG

8 files changed, 15 insertions, 15 deletions

diff --git a/npc/000-0/sailors.txt b/npc/000-0/sailors.txt
index 3df6382b8..85fab4553 100644
--- a/npc/000-0/sailors.txt
+++ b/npc/000-0/sailors.txt
@@ -77,9 +77,7 @@ OnTouch:
         l("(Don't respond)");
     mes "";
 
-    Karma=100;
     if (@menu == 1) {
-        Karma=Karma-1;
         mesn l("Sailor");
         mesq l("What do you mean? Do you at least have a rowboat with you?!");
         next;
@@ -87,7 +85,7 @@ OnTouch:
         mesq l("We can't let you die from hunger! That wouldn't be cool at all! And I'm very cool!");
         next;
     } else if (@menu == 2) {
-        Karma=Karma+1;
+        mes ""; // You don't need to thank us!
     } else {
         mesn l("Sailor");
         mesq lg("Oh noes! She fainted! Quick, rescue her!!", "Oh noes! He fainted! Quick, rescue him!!");
diff --git a/npc/001-7/celestia_bossfight.txt b/npc/001-7/celestia_bossfight.txt
index d9e403241..66eddd809 100644
--- a/npc/001-7/celestia_bossfight.txt
+++ b/npc/001-7/celestia_bossfight.txt
@@ -35,11 +35,10 @@ L_Survivor:
         $YETIKING_WINNER$=strcharinfo(0);
         channelmes("#world", $YETIKING_WINNER$+" is the first player to finish Yeti King Quest!! GG, dude! %%N");
         announce "All hail ##B"+$YETIKING_WINNER$+"##b, first to complete the ##3Yeti King Quest!", bc_all|bc_npc;
-        Karma=Karma+1;
         getexp 0, 2000;
         getitem PrismGift, 1;
         mesc l("CONGRATULATIONS! You are the first player to finish Yeti King quest!!"), 2;
-        mesc l("You just gained a Karma point, a Prism Gift, and 2000 Job Exp for your bravery!"), 2;
+        mesc l("You just gained a Prism Gift, and 2000 Job Exp for your bravery!"), 2;
         next;
     }
     mesn col(l("The Yeti King"), 3);
diff --git a/npc/012-1/guards.txt b/npc/012-1/guards.txt
index 63d75200a..214ef3529 100644
--- a/npc/012-1/guards.txt
+++ b/npc/012-1/guards.txt
@@ -374,9 +374,7 @@ OnTimer240000:
     end;
 
 OnXtreem:
-    if (rand(0,100) <= 50)
-        Karma=Karma+1;
-    else
+    if (rand2(0,100) > 50)
         getitem StrangeCoin, 2;
     // Here, the drop is a Bronze Gift, based on living players and players nearby.
     // You have 0.1% of base chance, plus 0.2% each fighting player + 1% each near player.
diff --git a/npc/012-2/rakinorf.txt b/npc/012-2/rakinorf.txt
index daf2c9b32..d6dc1fd7a 100644
--- a/npc/012-2/rakinorf.txt
+++ b/npc/012-2/rakinorf.txt
@@ -155,10 +155,12 @@ L_MainStory:
                 l("Maybe you do, your jerk! Stop drinking! Lua told me that you could help me! DO YOUR JOB!!"),
                 l("Sorry, Mister Rakinorf, but it was Lua that said you could help me.");
             next;
+            /*
             if (@menu == 1)
-                Karma=Karma-1;
-            else
                 Karma=Karma+1;
+            else
+                Karma=Karma-1;
+            */
             setq2 General_Narrator, 4;
             mesn strcharinfo(0);
             mesq l("All she told me was that I needed to visit Halinarzo, but was too weak, and should look for you instead.");
diff --git a/npc/014-2/mouboo.txt b/npc/014-2/mouboo.txt
index 45f349723..b861465c8 100644
--- a/npc/014-2/mouboo.txt
+++ b/npc/014-2/mouboo.txt
@@ -102,7 +102,6 @@ L_Begin:
                 if (.@q2 > 1000) {
                     mesc l("This will be remembered."), 6;
                     setq HurnscaldQuest_InjuriedMouboo, 2;
-                    Karma=Karma+1;
                     getexp 800, 0;
                     close;
                 }
@@ -149,7 +148,6 @@ L_Begin:
                     mes l("Is... Dan... Ger... Ous...");
                     mes l("...Help... Me...");
                     setq HurnscaldQuest_InjuriedMouboo, 9;
-                    Karma=Karma-1;
                     getexp 800, 0;
                     next;
 
diff --git a/npc/018-2-2/main.txt b/npc/018-2-2/main.txt
index cfdf0bdb1..e0b2bf951 100644
--- a/npc/018-2-2/main.txt
+++ b/npc/018-2-2/main.txt
@@ -59,11 +59,10 @@ OnMasterBossKilled:
         $HEROESHOLD_WINNER$=strcharinfo(0);
         channelmes("#world", $HEROESHOLD_WINNER$+" is the first player to finish HEROES HOLD Master Dungeon!! GG, dude! %%N");
         announce "All hail ##B"+$HEROESHOLD_WINNER$+"##b, first to complete the ##3HEROES HOLD Master Dungeon!", bc_all|bc_npc;
-        Karma=Karma+1;
         getexp 0, 2000;
         getitem PrismGift, 1;
         mesc l("CONGRATULATIONS! You are the first player to finish Heroes Hold Master Dungeon!!"), 2;
-        mesc l("You just gained a Karma point, a Prism Gift, and 2000 Job Exp for your bravery!"), 2;
+        mesc l("You just gained a Prism Gift, and 2000 Job Exp for your bravery!"), 2;
     }
     DungeonClear();
     monster "018-2-5@Ma", any(52,188), any(29,196), "Master Dungeon Boss", MonsterKing, 1, "#HH_CONTROLLER01::OnMasterBossKilled";
diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt
index 9108e9689..e4f6a034b 100644
--- a/npc/functions/clientversion.txt
+++ b/npc/functions/clientversion.txt
@@ -526,6 +526,12 @@ function	script	clientupdater	{
 
         } // if ranking
     }
+    // Negative Karma = good. And positive karma allows PvP. So...
+    // sex ago  9 18:10:20 -03 201
+    if (UPDATE < 1565385020) {
+        UPDATE=1565385020;
+            Karma=0;
+    }
 
 
     // #ADD_LVL means the user have to right to get some levels. This is a sketch. The code might be deleted.
diff --git a/npc/functions/hub.txt b/npc/functions/hub.txt
index 553d0955a..eb535d9f6 100644
--- a/npc/functions/hub.txt
+++ b/npc/functions/hub.txt
@@ -117,7 +117,7 @@ function	script	HUB_Logout	{
                 sc_end SC_OVERLAPEXPUP;
                 sc_start SC_OVERLAPEXPUP, 300000, -20;
                 dispbottom l("For cowardingly killing in a \"secure\" area, you will be severely punished.");
-                Karma-=1;
+                //Karma+=1;
                 sc_start SC_STUN, 15000, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK;
                 addtimer(15000, "#mobptsys::OnUnlock");
                 percentheal -88, -100;