Change spaces job from lax to warn. It **will not** become strict.

15 files changed, 79 insertions, 78 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6552ad1c0..79db96782 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,7 +169,7 @@ newlines:
   script:
   - ./.tools/jobs/install.sh "dos2unix git-core"
   - ./.tools/jobs/newlines.sh
-  image: debian:unstable
+  image: debian:buster
   artifacts:
     untracked: true
     when: always
@@ -181,7 +181,8 @@ spaces:
   - ./.tools/jobs/install.sh "sed git-core"
   - cd npc
   - ../.tools/jobs/spaces.sh
-  image: debian:unstable
+  image: debian:buster
+  allow_failure: true
   artifacts:
     untracked: true
     when: always
diff --git a/.tools/jobs/spaces.sh b/.tools/jobs/spaces.sh
index 4e17a3eca..4460cfb78 100755
--- a/.tools/jobs/spaces.sh
+++ b/.tools/jobs/spaces.sh
@@ -7,5 +7,5 @@ if [[ -n "${RES}" ]]; then
     echo "Extra spaces before new lines detected in files:"
     git diff --name-only
     # I don't want this to be critical on TMW2
-    #exit 1
+    exit 1
 fi
diff --git a/npc/00000SAVE/misc/sagratha.txt b/npc/00000SAVE/misc/sagratha.txt
index d754e64b3..637963714 100644
--- a/npc/00000SAVE/misc/sagratha.txt
+++ b/npc/00000SAVE/misc/sagratha.txt
@@ -17,13 +17,13 @@
 //
 // Sagatha also has a specific list of good animals she cares about. You need to kill however the bad ones she doesn't like. The number (#) indicates how much it affects Sagatha. The "unhappiness" of Sagatha is limited to 15 so you don't have to kill a lot of bad monsters to make her happy.
 // For this we can just cause unhappiness for killing Holy/Nature, and recover happiness for all else. Shadow/Undead kills give double happiness.
-// 
+//
 // When talking to Pauline, if you have learned Astral Magic Skill, she will tell you about some painting she found in a cave. She will tell you the invocations to both the summon pinkie and the summon mouboo spells she found, but she doesn't know the right ingredients for the spells. Your task is to find those ingredients. She will give you a hint. The ingredients are somewhat similar to other Astral Spells.
-// 
+//
 // When you come back she will ask for this ingredients. Starting with the Mouboo spell you will have to type in the ingredients. The right ingredients for the Mouboo spell are one Root and a Mouboo Figurine. You have to type "Root" and "MoubooFigurine". The input is case sensitive and will not accept spaces. You also have to give her these items to complete the quest.
-// 
+//
 // Caution: You can type in any ingredient you want, if you have that with you she will take it and the item is gone. So do not give her any rare items just to play around. Items you give her trying to complete the Quest will be lost, and cannot be restored.
-// 
+//
 // Once you typed in and gave her the correct ingredients she will spawn a mouboo and give you 10.000EXP as a reward.
 
 
diff --git a/npc/003-0-1/professor.txt b/npc/003-0-1/professor.txt
index 7a736c89d..a4d7737b4 100644
--- a/npc/003-0-1/professor.txt
+++ b/npc/003-0-1/professor.txt
@@ -70,7 +70,7 @@ OnSpeeching:
                 MAGIC_RP+=getskilllv(TMW2_STUDY);
         }
 
-        // If you are learning TMW2_READANCIENTLANGUAGES    
+        // If you are learning TMW2_READANCIENTLANGUAGES
         if (ANCIENTLANGUAGEBOUNCER) {
             ANCIENTLANGUAGEBOUNCER-=1;
             if (ANCIENTLANGUAGEBOUNCER == 1) {
diff --git a/npc/003-2/_import.txt b/npc/003-2/_import.txt
index f355c5192..41a622ea3 100644
--- a/npc/003-2/_import.txt
+++ b/npc/003-2/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-2: Tulimshar Guild 
+// Map 003-2: Tulimshar Guild
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-2/_warps.txt",
 "npc/003-2/eistein.txt",
diff --git a/npc/006-2-1/server.txt b/npc/006-2-1/server.txt
index 8b14c143f..5375cb9e6 100644
--- a/npc/006-2-1/server.txt
+++ b/npc/006-2-1/server.txt
@@ -37,5 +37,5 @@ OnClock0003:
     restoreshopitem LettuceLeaf, 30, 15;
     restoreshopitem Bread, 46, 10;
     restoreshopitem Cheese, 55, 15;
-    
+
 }
diff --git a/npc/009-3/kevin.txt b/npc/009-3/kevin.txt
index 274702486..923ac1b94 100644
--- a/npc/009-3/kevin.txt
+++ b/npc/009-3/kevin.txt
@@ -33,7 +33,7 @@ L_Menu:
         case 2:
             goto L_Powder;
         case 3:
-            goto L_Dye;      
+            goto L_Dye;
         case 4:
             goto L_Quit;
     }
@@ -95,7 +95,7 @@ L_Powder:
 
 L_Dye:
     mesn;
-    mesq l("Actually, using a byproduct of my other works and a few additional ingredients, I could make a %s", 
+    mesq l("Actually, using a byproduct of my other works and a few additional ingredients, I could make a %s",
                       getitemlink(PinkDye));
     if (BaseLevel < 25) {
         mesq l("Hmm...actually, nevermind.");
@@ -109,9 +109,9 @@ L_Dye:
         goto L_Menu;
     }
     next;
-    mesq l("Bring me %d %s, %d %s, and %d %s and I can make it for you... oh and it will be %d GP for my work.", 
-                      1, getitemlink(BottleOfTonoriWater), 20, getitemlink(PinkBlobime), 30, getitemlink(Plushroom), 500); 
-    if (getq(HalinarzoQuest_Kevin) < 1) 
+    mesq l("Bring me %d %s, %d %s, and %d %s and I can make it for you... oh and it will be %d GP for my work.",
+                      1, getitemlink(BottleOfTonoriWater), 20, getitemlink(PinkBlobime), 30, getitemlink(Plushroom), 500);
+    if (getq(HalinarzoQuest_Kevin) < 1)
         setq HalinarzoQuest_Kevin, 1;
    next;
     select
@@ -138,7 +138,7 @@ L_Dye:
         if (getq(HalinarzoQuest_Kevin) == 1) {
             setq HalinarzoQuest_Kevin, 2;
             getexp 300, 0;
-        }   
+        }
         mesn;
         mesq l("Thanks! Here you go. Perhaps you want another one?");
         next;
@@ -153,7 +153,7 @@ L_Quit:
     closedialog;
     goodbye;
     close;
-    
+
 OnInit:
     .@npcId = getnpcid(.name$);
     setunitdata(.@npcId, UDT_HEADTOP, FancyHat);
diff --git a/npc/016-1/laranja.txt b/npc/016-1/laranja.txt
index d7de07224..f293fb370 100644
--- a/npc/016-1/laranja.txt
+++ b/npc/016-1/laranja.txt
@@ -25,14 +25,14 @@ L_Dye:
     mesq l("Thanks to pirate activity, dye has become more difficult to obtain lately.");
     mesq l("In fact, %s is considered by most to be rare these days.", getitemlink(OrangeDye));
     next;
-    if (BaseLevel < 45) { 
-        mesn; 
+    if (BaseLevel < 45) {
+        mesn;
         mesq l("Since supplies are limited, I currently prioritize orders placed by higher level players.");
         mesq l("Come back when you are stronger and we can trade.");
         next;
         goto L_Quit;
     }
-    
+
     mesn;
     mesq l("I can trade some with you. Just bring me the following cash payment and supplies:");
     mes "";
@@ -41,7 +41,7 @@ L_Dye:
     mesq l("%d/%d %s",countitem(GambogeHerb), 60, getitemlink(GambogeHerb));
     mesq l("%d/%d %s",countitem(AlizarinHerb), 70, getitemlink(AlizarinHerb));
     mesq l("%d/%d %s",countitem(Piberries), 5, getitemlink(Piberries));
-    mesq l("%d/%d %s",countitem(PileOfAsh), 5, getitemlink(PileOfAsh)); 
+    mesq l("%d/%d %s",countitem(PileOfAsh), 5, getitemlink(PileOfAsh));
     compareandsetq TulimsharQuest_Laranja, 0, 1;
     next;
     select
@@ -67,8 +67,8 @@ L_Dye:
         if (getq(TulimsharQuest_Laranja) == 1) {
             setq TulimsharQuest_Laranja, 2;
             getexp 9000, 0;
-        }   
-        
+        }
+
         mesn;
         mesq l("Pleasure doing business with you! Do you want any more?");
         next;
@@ -96,7 +96,7 @@ OnInit:
     .sex = G_FEMALE;
     .distance = 4;
     end;
-    
+
 OnInstanceInit:
     .@npcId = getnpcid(instance_npcname(.name$));
     setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
diff --git a/npc/017-6/axzell.txt b/npc/017-6/axzell.txt
index 8e512f0af..4148d533e 100644
--- a/npc/017-6/axzell.txt
+++ b/npc/017-6/axzell.txt
@@ -64,7 +64,7 @@ L_ConfirmReset:
 
 L_Dye:
     mesn;
-    mesq l("Since red is the official color of Land of Fire Village, I craft dye for players who will properly represent our town.", 
+    mesq l("Since red is the official color of Land of Fire Village, I craft dye for players who will properly represent our town.",
                       getitemlink(RedDye));
     if (BaseLevel < 50) {
         mesn;
@@ -77,10 +77,10 @@ L_Dye:
     }
     next;
     mesq l("Bring me %d %s, %d %s, %d %s, and %d %s, and I will make it for you. I also charge %d GP commission.",
-        1, getitemlink(BottleOfSewerWater), 
-        200, getitemlink(AlizarinHerb), 
-        20, getitemlink(Coral), 
-        10, getitemlink(SulfurPowder), 3500); 
+        1, getitemlink(BottleOfSewerWater),
+        200, getitemlink(AlizarinHerb),
+        20, getitemlink(Coral),
+        10, getitemlink(SulfurPowder), 3500);
     mesq l("Do you want one?");
     compareandsetq LoFQuest_Axzell, 0, 1;
    next;
@@ -112,7 +112,7 @@ L_Dye:
         if (getq(LoFQuest_Axzell) == 1) {
             setq LoFQuest_Axzell, 2;
             getexp 15000, 0;
-        }   
+        }
         mesn;
         mesq l("Thanks! Here you go. Perhaps you want another one?");
         next;
diff --git a/npc/018-1/george.txt b/npc/018-1/george.txt
index c09a961de..588f0cee0 100644
--- a/npc/018-1/george.txt
+++ b/npc/018-1/george.txt
@@ -167,7 +167,7 @@ L_NotEnoughOne:
     goto L_Close;
 
 L_NotEnoughTwo:
-    mesq l("Remember, I need %d %s, %d %s, and something interesting to read.", 
+    mesq l("Remember, I need %d %s, %d %s, and something interesting to read.",
            50, getitemlink(Potatoz),
            40, getitemlink(Dragonfruit));
     goto L_Close;
diff --git a/npc/018-7/raify.txt b/npc/018-7/raify.txt
index f2b37275f..332cc264f 100644
--- a/npc/018-7/raify.txt
+++ b/npc/018-7/raify.txt
@@ -37,7 +37,7 @@ L_Offer:
                       getitemlink(LimeDye));
     next;
     mesn;
-    mesq l("I think that %d %s and %d %s should be enough for now.", 
+    mesq l("I think that %d %s and %d %s should be enough for now.",
                     50, getitemlink(ForestPiouFeathers),
                     50, getitemlink(ManaPiouFeathers));
     mesq l("I will also need %d %s to make the mixture and %s GP as a fee.",
@@ -50,7 +50,7 @@ L_Offer:
 
 L_Menu:
     next;
-    mesn;     
+    mesn;
     mesq l("So what do you say? You in?");
     next;
     select
@@ -102,7 +102,7 @@ L_Dye:
     if (@menu == 2)
         goto L_Quit;
 
-    if (@menu == 3) 
+    if (@menu == 3)
         goto L_Offer;
 
 L_DyeLoop:
diff --git a/npc/020-3/mede.txt b/npc/020-3/mede.txt
index bf92ba7d8..697a7866b 100644
--- a/npc/020-3/mede.txt
+++ b/npc/020-3/mede.txt
@@ -32,7 +32,7 @@ L_Menu:
         case 2:
             goto L_MonsterPot;
         case 3:
-            goto L_Dye; 
+            goto L_Dye;
         case 4:
             goto L_Quit;
     }
@@ -56,7 +56,7 @@ L_MonsterPot:
 
 L_Dye:
     mesn;
-    mesq l("I used to make dyes for Agostine but he hasn't bought any in a while. I could make you a %s if you bring me the right items.", 
+    mesq l("I used to make dyes for Agostine but he hasn't bought any in a while. I could make you a %s if you bring me the right items.",
                       getitemlink(TealDye));
     next;
     if (BaseLevel < 35) {
@@ -70,9 +70,9 @@ L_Dye:
     mesq l("Bring me %d %s, %d %s, %d %s, and %d %s, and I will make it for you. I also charge %d GP as commission.",
                       1, getitemlink(IcedBottle),
                       25, getitemlink(BlueCoral),
-                      60, getitemlink(CobaltHerb), 
+                      60, getitemlink(CobaltHerb),
                       5, getitemlink(IceCube),
-                      1500); 
+                      1500);
     compareandsetq NivalisQuest_Mede, 0, 1;
     next;
     select
@@ -103,7 +103,7 @@ L_DyeLoop:
         if (getq(NivalisQuest_Mede) == 1) {
             setq NivalisQuest_Mede, 2;
             getexp 1500, 0;
-        }   
+        }
         mesn;
         mesq l("Thanks! Here you go. Perhaps you want another one?");
         next;
diff --git a/npc/027-1/students2.txt b/npc/027-1/students2.txt
index 3de614a4d..82357b98a 100644
--- a/npc/027-1/students2.txt
+++ b/npc/027-1/students2.txt
@@ -17,104 +17,104 @@ OnInit:
     initpath "wait", 1, 0,
              "move", 134, 121,
              "dir", DOWN, 0,
-             "wait", 2, 0, 
-             "move", 131, 123,  
              "wait", 2, 0,
-             "move", 124, 121, 
-             "wait", 1, 0, 
+             "move", 131, 123,
+             "wait", 2, 0,
+             "move", 124, 121,
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 121, 123,
              "wait", 2, 0,
              "move", 114, 121,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 111, 123,
              "wait", 2, 0,
              "move", 103, 121,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 2, 0,
              "move", 111, 117,
              "wait", 2, 0,
              "move", 104, 111,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 111, 113,
              "wait", 2, 0,
              "move", 114, 111,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 121, 113,
              "wait", 2, 0,
              "move", 124, 111,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 131, 113,
              "wait", 1, 0,
              "move", 134, 111,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 131, 103,
              "wait", 1, 0,
              "move", 134, 101,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 131, 103,
              "wait", 1, 0,
              "move", 124, 101,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 121, 103,
              "wait", 1, 0,
              "move", 114, 101,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 111, 103,
              "wait", 1, 0,
              "move", 103, 101,
-             "wait", 1, 0, 
+             "wait", 1, 0,
              "class", NPC_HIDDEN, 0,
-             "wait", 2, 0, 
-             "dir", DOWN, 0, 
+             "wait", 2, 0,
+             "dir", DOWN, 0,
              "class", NPC_ACADEMY_HF, 0,
              "wait", 1, 0,
              "move", 111, 103,
diff --git a/npc/042-10/ctrl.txt b/npc/042-10/ctrl.txt
index d257c3e16..fd99e6427 100644
--- a/npc/042-10/ctrl.txt
+++ b/npc/042-10/ctrl.txt
@@ -311,7 +311,7 @@ OnTimer60000:
         .@g=0;
     }
 
-    // Estimate 
+    // Estimate
     .@pc=$KAMELOT_PC[.@g]+1;
     .@pow=rand2(.@pc);
 
@@ -394,7 +394,7 @@ OnTimer60000:
         .@g=0;
     }
 
-    // Estimate 
+    // Estimate
     .@pc=$KAMELOT_PC[.@g]+1;
     .@pow=rand2(.@pc);
 
diff --git a/npc/magic/guild.txt b/npc/magic/guild.txt
index 29482c5d7..e538b7186 100644
--- a/npc/magic/guild.txt
+++ b/npc/magic/guild.txt
@@ -5,7 +5,7 @@
 //
 // Guild Magic
 // Reserved SCs: SC_INCALLSTATUS SC_ANGELUS SC_BLESSING SC_IMPOSITIO SC_KAIZEL SC_MAGNIFICAT
-// For testing: SC_TWOHANDQUICKEN 
+// For testing: SC_TWOHANDQUICKEN
 // BROKEN: SC_ASSNCROS
 
 /*