Merge branch 'master' of https://github.com/P3D-Legacy/P3D-Legacy

P3D/Player/PlayerInventory.vb

@@ -78,6 +78,20 @@ Public Class PlayerInventory
         Next
 
         Me.Add(New ItemContainer(ID, Amount))
+
+        Dim item As Item = Item.GetItemByID(ID)
+        If item.IsMail = True AndAlso item.IsGameModeItem = False Then
+            Dim hasAllMail = True
+            For m = 300 To 323
+                If Core.Player.Inventory.GetItemAmount(m.ToString) = 0 Then
+                    hasAllMail = False
+                    Exit For
+                End If
+            Next
+            If hasAllMail = True Then
+                GameJolt.Emblem.AchieveEmblem("mailman")
+            End If
+        End If
     End Sub
 
     ''' <summary>

P3D/Pokemon/Monster/Pokemon.vb

@@ -1372,7 +1372,7 @@ Public Class Pokemon
 
         Dim Level As Integer = 5
         If Tags.ContainsKey("Level") = True Then
-            Level = CInt(Tags("Level"))
+            Level = CInt(ScriptConversion.ToInteger(ScriptVersion2.ScriptCommander.Parse(Tags("Level"))))
         End If
 
         Dim p As Pokemon = GetPokemonByID(PokemonID, NewAdditionalData)
@@ -1714,7 +1714,7 @@ Public Class Pokemon
                 Case "nickname"
                     Me.NickName = tagValue
                 Case "level"
-                    Me.Level = CInt(tagValue).Clamp(1, CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")))
+                    Me.Level = ScriptConversion.ToInteger(ScriptVersion2.ScriptCommander.Parse(tagValue)).Clamp(1, CInt(GameModeManager.GetGameRuleValue("MaxLevel", "100")))
                 Case "ot"
                     Me.OT = tagValue
                 Case "ability"

P3D/Screens/PC/MailSystemScreen.vb

@@ -814,6 +814,15 @@
             End If
         End If
 
+        Dim s As Screen = Core.CurrentScreen
+        While Not s.PreScreen Is Nothing And s.Identification <> Screen.Identifications.InventoryScreen
+            s = s.PreScreen
+        End While
+
+        If s.Identification = Screen.Identifications.InventoryScreen Then
+            CType(s, NewInventoryScreen).LoadItems()
+        End If
+
         Me.message = text
     End Sub
 

P3D/World/ActionScript/V2/ScriptCommands/DoItem.vb

@@ -36,18 +36,6 @@
                             amount = int(item.MaxStack - Core.Player.Inventory.GetItemAmount(_itemID)).Clamp(0, 999)
                         End If
                         Core.Player.Inventory.AddItem(_itemID, amount)
-                        If item.IsMail = True AndAlso item.IsGameModeItem = False Then
-                            Dim hasAllMail = True
-                            For m = 300 To 323
-                                If Core.Player.Inventory.GetItemAmount(m.ToString) = 0 Then
-                                    hasAllMail = False
-                                    Exit For
-                                End If
-                            Next
-                            If hasAllMail = True Then
-                                GameJolt.Emblem.AchieveEmblem("mailman")
-                            End If
-                        End If
                     End If
                 Case "remove"
                     Dim amount As Integer = 1