Merge branch 'master' into dependabot/go_modules/github.com/stretchr/testify-1.11.1

Author: Volte6

_datafiles/world/default/mobs/frostfang/scripts/2-guard-hungry.js

@@ -86,38 +86,34 @@ function onIdle(mob, room) {
     round = UtilGetRoundNumber();
 
     grumbled = false;
-    userIds = room.GetPlayers();
+    allPlayers = room.GetPlayers();
 
     playersTold = mob.GetTempData('playersTold');
     if ( playersTold === null ) {
         playersTold = {};
     }
 
-    if ( userIds.length > 0 ) {
+    if ( allPlayers.length > 0 ) {
 
-        for (var i = 0; i < userIds.length; i++) {
+        for( var i in allPlayers ) {
 
-            if ( userIds[i] in playersTold ) {
-                if ( round < playersTold[userIds[i]] ) {
+            if ( allPlayers[i].UserId() in playersTold ) {
+                if ( round < playersTold[allPlayers[i].UserId()] ) {
                     continue;
                 }
             }
-
-            if ( (user = GetUser(userIds[i])) == null ) {
-                continue;
-            }
-
-            if ( !user.HasQuest("4-start") ) {
+            
+            if ( !allPlayers[i].HasQuest("4-start") ) {
                 if ( !grumbled ) {
                     mob.Command("emote pats his belly as it grumbles.");
                     grumbled = true;
                 }
-                mob.Command("sayto @" + String(userIds[i]) + " I'm so hungry.");
+                mob.Command("sayto @" + String(allPlayers[i].UserId()) + " I'm so hungry.");
             } else {
-                playersTold[userIds[i]] = round + 500;
+                playersTold[allPlayers[i].UserId()] = round + 500;
             }
 
-            playersTold[userIds[i]] = round + 5;
+            playersTold[allPlayers[i].UserId()] = round + 5;
             // Don't need to repeat to every player.
             break;
         }

_datafiles/world/default/mobs/whispering_wastes/scripts/27-hermit-winterfire.js

@@ -49,7 +49,7 @@ function onGive(mob, room, eventDetails) {
     if (eventDetails.item) {
         if (eventDetails.item.ItemId != 4) {
             mob.Command("say Finally! My winterfire crystal! Thank you so much!");
-            user.GiveQuest("4-end");
+            user.GiveQuest("5-end");
             return true;
         }
     }

_datafiles/world/default/rooms/catacombs/136.js

@@ -21,11 +21,9 @@ function onCommand(cmd, rest, user, room) {
 
 
     players = room.GetPlayers();
-    for (var i = 0; i < players.length; i++) {
-        if ( (user = GetUser(players[i])) !== null ) {
-            SendRoomMessage(138, user.GetCharacterName(true)+" falls into the room from above.", user.UserId());
-            user.MoveRoom(138);
-        }
+    for( var i in players ) {
+        SendRoomMessage(138, players[i].GetCharacterName(true)+" falls into the room from above.", players[i].UserId());
+        players[i].MoveRoom(138);
     }
 
     return true;

_datafiles/world/default/rooms/tutorial/900.js

@@ -25,7 +25,7 @@ function onCommand(cmd, rest, user, room) {
         ignoreCommand = true;
     }
 
-    fullCommand = cmd;
+    fullCommand = ExpandCommand(cmd);
     if ( rest.length > 0 ) {
         fullCommand = cmd + ' ' + rest;
     }

_datafiles/world/default/rooms/tutorial/901.js

@@ -26,7 +26,7 @@ function onCommand(cmd, rest, user, room) {
         ignoreCommand = true;
     }
 
-    fullCommand = cmd;
+    fullCommand = ExpandCommand(cmd);
     if ( rest.length > 0 ) {
         fullCommand = cmd + ' ' + rest;
     }

_datafiles/world/default/rooms/tutorial/902.js

@@ -24,7 +24,7 @@ function onCommand(cmd, rest, user, room) {
         ignoreCommand = true;
     }
 
-    fullCommand = cmd;
+    fullCommand = ExpandCommand(cmd);
     if ( rest.length > 0 ) {
         fullCommand = cmd + ' ' + rest;
     }

_datafiles/world/default/rooms/tutorial/903.js

@@ -4,6 +4,7 @@ const teach_commands = ["get cap", "equip cap", "portal"];
 const teacherMobId = 57;
 const teacherName = "Orb of Graduation";
 const capItemId = 20043;
+const newbieKitItemId = 100;
 
 var commandNow = 0; // Which command they are on
 
@@ -16,7 +17,7 @@ function onCommand(cmd, rest, user, room) {
 
     teacherMob = getTeacher(room);
 
-    fullCommand = cmd;
+    fullCommand = ExpandCommand(cmd);
     if ( rest.length > 0 ) {
         fullCommand = cmd + ' ' + rest;
     }
@@ -87,6 +88,9 @@ function onEnter(user, room) {
     itm = CreateItem(capItemId);
     teacherMob.GiveItem(itm);
 
+    itm2 = CreateItem(newbieKitItemId);
+    user.GiveItem(itm2);
+
     teacherMob.Command('emote appears in a ' + UtilApplyColorPattern("flash of light!", "glowing"));
 
     teacherMob.Command('say Congratulation on getting to the end of the training course!', 1.0);