diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..390753b04 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Universal Content Builder"] + path = Universal Content Builder + url = https://github.com/AGN-Pokemon-3D/Pokemon-3D-Universal-Content-Builder.git diff --git a/2.5DHero/2.5DHero/2.5DHero.vbproj b/2.5DHero/2.5DHero/2.5DHero.vbproj index 5fffe4db0..2cbe182d4 100644 --- a/2.5DHero/2.5DHero/2.5DHero.vbproj +++ b/2.5DHero/2.5DHero/2.5DHero.vbproj @@ -27,13 +27,13 @@ false My Project\app.manifest - + true bin\DesktopGL\Debug\ DEBUG,TRACE,WINDOWS full - + bin\DesktopGL\Release\ TRACE,WINDOWS true @@ -43,15 +43,18 @@ - - PreserveNewest - - - - $(MSBuildProgramFiles32)\MonoGame\v3.0\Assemblies\DesktopGL\OpenTK.dll + + + ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\MonoGame.Framework.dll + True - - $(MSBuildProgramFiles32)\MonoGame\v3.0\Assemblies\DesktopGL\MonoGame.Framework.dll + + ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\NVorbis.dll + True + + + ..\..\packages\MonoGame.Framework.DesktopGL.3.5.1.1679\lib\net40\OpenTK.dll + True @@ -1749,4 +1752,5 @@ + \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb index d4bd9c2e8..03f698573 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/Battle.vb @@ -4408,6 +4408,7 @@ .OwnPokemon.Status = Pokemon.StatusProblems.Fainted BattleScreen.OwnFaint = True If BattleScreen.IsRemoteBattle AndAlso BattleScreen.IsHost Then + Logger.Debug("[Battle]: The host's pokemon faints") Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleHostData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {BattleScreen.PartnerNetworkID.ToString(), "-HostFainted-"}.ToList())) End If @@ -4417,6 +4418,7 @@ .OppPokemon.Status = Pokemon.StatusProblems.Fainted BattleScreen.OppFaint = True If BattleScreen.IsRemoteBattle AndAlso BattleScreen.IsHost Then + Logger.Debug("[Battle]: The client's pokemon faints") Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleHostData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {BattleScreen.PartnerNetworkID.ToString(), "-ClientFainted-"}.ToList())) End If diff --git a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb index c90a292bf..0d08e3e69 100644 --- a/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb +++ b/2.5DHero/2.5DHero/Battle/BattleSystemV2/BattleScreen.vb @@ -1333,17 +1333,20 @@ nextIndex: Public LockData As String = "{}" Public ClientWonBattle As Boolean = True + 'Sends the decided step to the host Public Sub SendClientCommand(ByVal c As String) Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleClientData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {PartnerNetworkID.ToString(), c}.ToList())) Me.SentInput = True + Logger.Debug("[Battle]: Sent Client command") End Sub + 'Receives the current status of the battle from the host Public Shared Sub ReceiveHostEndRoundData(ByVal data As String) Dim newQueries As New List(Of String) Dim tempData As String = "" Dim cData As String = data - 'Converts the single string received as data into a list of queries (as string) + 'Converts the single string received as data into a list of string While cData.Length > 0 If cData(0).ToString() = "|" AndAlso tempData(tempData.Length - 1).ToString() = "}" Then newQueries.Add(tempData) @@ -1406,10 +1409,12 @@ nextIndex: End If Next + Logger.Debug("[Battle]: Received Host End Round data") CType(s, BattleScreen).ReceivedPokemonData = True End If End Sub + 'Receives the "movie" from the host, and stores it in the BattleQuery list. Also checks for After Fainting Switch conditions. Public Shared Sub ReceiveHostData(ByVal data As String) Dim newQueries As New List(Of String) Dim tempData As String = "" @@ -1420,10 +1425,12 @@ nextIndex: End While If s.Identification = Identifications.BattleScreen Then If data = "-HostFainted-" Then + Logger.Debug("[Battle]: The host's pokemon faints") OppFaint = True Exit Sub End If If data = "-ClientFainted-" Then + Logger.Debug("[Battle]: The client's pokemon faints") OwnFaint = True Exit Sub End If @@ -1461,7 +1468,7 @@ nextIndex: End If Next End If - + Logger.Debug("[Battle]: Received Host data (movie)") ReceivedQuery = data End Sub @@ -1473,7 +1480,9 @@ nextIndex: Public SentHostData As Boolean = False Public Shared ReceivedInput As String = "" + 'After the client has decided its next step, the host receives the information about this step, so it can now decide his own. Public Shared Sub ReceiveClientData(ByVal data As String) + Logger.Debug("[Battle]: Received Client data") ReceivedInput = data Dim s As Screen = Core.CurrentScreen @@ -1491,6 +1500,7 @@ nextIndex: End If End Sub + 'Sends some variables that let the client know the current state of the battle Public Sub SendEndRoundData() Dim lockData As String = "{}" Dim oppStep As Battle.RoundConst = Battle.GetOppStep(Me, Battle.OwnStep) @@ -1520,10 +1530,11 @@ nextIndex: End If d &= p.GetSaveData() Next - + Logger.Debug("[Battle]: Sent End Round data") Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattlePokemonData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {PartnerNetworkID.ToString(), d}.ToList())) End Sub + 'Sends the "movie" to the client Public Sub SendHostQuery() Dim d As String = "" @@ -1544,6 +1555,7 @@ nextIndex: Next Me.TempPVPBattleQuery.Clear() + Logger.Debug("[Battle]: Sent Host Query") Core.ServersManager.ServerConnection.SendPackage(New Servers.Package(Servers.Package.PackageTypes.BattleHostData, Core.ServersManager.ID, Servers.Package.ProtocolTypes.TCP, {PartnerNetworkID.ToString(), d}.ToList())) SentHostData = True End Sub diff --git a/2.5DHero/2.5DHero/CurrentVersion.dat b/2.5DHero/2.5DHero/CurrentVersion.dat deleted file mode 100644 index bc27f0b4c..000000000 --- a/2.5DHero/2.5DHero/CurrentVersion.dat +++ /dev/null @@ -1 +0,0 @@ -0.54.1a \ No newline at end of file diff --git a/2.5DHero/2.5DHero/Debug/ObjectDump.vb b/2.5DHero/2.5DHero/Debug/ObjectDump.vb index 0822445a7..36c051527 100644 --- a/2.5DHero/2.5DHero/Debug/ObjectDump.vb +++ b/2.5DHero/2.5DHero/Debug/ObjectDump.vb @@ -1,137 +1,202 @@ +Imports System.Collections +Imports System.Reflection + ''' ''' A class to access the dump of variables of an object. ''' Public Class ObjectDump - Private _dump As String = "" - Private _nullReferenceError As Boolean = False + Public ReadOnly Property Dump As String = "" - Public ReadOnly Property Dump() As String - Get - Return _dump - End Get - End Property - - Public ReadOnly Property NullReferenceError() As Boolean - Get - Return _nullReferenceError - End Get - End Property - - ''' - ''' Creates a new instance of the ObjectDump class and performs a dump on the passed object. - ''' - Public Sub New(ByVal obj As Object) - CreateDump(obj) - End Sub - - ''' - ''' Creates a dump. - ''' - ''' The object to create a dump from. - Private Sub CreateDump(ByVal obj As Object) - If obj Is Nothing Then - _nullReferenceError = True - _dump = "Object reference not set to an instance of an object." + Public Sub New(ByVal sender As Object) + If sender Is Nothing Then + Dump = "Object reference not set to an instance of an object." Else - Dim t As Type = obj.GetType() + Dim fields() As FieldInfo = sender.GetType().GetFields(BindingFlags.Public Or BindingFlags.NonPublic Or BindingFlags.Instance Or BindingFlags.Static) + Dim properties() As PropertyInfo = sender.GetType().GetProperties(BindingFlags.Public Or BindingFlags.NonPublic Or BindingFlags.Instance Or BindingFlags.Static) - Dim fields As Reflection.FieldInfo() = t.GetFields(Reflection.BindingFlags.Public Or - Reflection.BindingFlags.NonPublic Or - Reflection.BindingFlags.Instance Or - Reflection.BindingFlags.Static) + Dump = + "--------------------------------------------------" & vbNewLine & + "Generated Fields:" & vbNewLine & + "--------------------------------------------------" & vbNewLine - Dim dump As String = "" - - For Each field As Reflection.FieldInfo In fields - If dump <> "" Then - dump &= vbNewLine + For Each field As FieldInfo In fields + If Dump <> "" Then + Dump &= vbNewLine End If - Dim accessToken As String = "" - Dim valueToken As String = "Nothing" - Dim fieldToken As String = field.Name - Dim typeToken As String = field.FieldType.Name + Dim fieldAccessToken As String = "" + Dim fieldNameToken As String = "" + Dim fieldTypeToken As String = "" + Dim fieldValueToken As String = "" - If field.IsPublic = True Then - accessToken = "Public " - End If - If field.IsPrivate = True Then - accessToken = "Private " - End If - If field.IsFamily = True Then - accessToken = "Protected " - End If - If field.IsStatic = True Then - accessToken &= "Shared " + If field.IsPublic Then + fieldAccessToken = "Public " + ElseIf field.IsPrivate Then + fieldAccessToken = "Private " + ElseIf field.IsFamily Then + fieldAccessToken = "Protected " End If - Dim valueObj As Object = field.GetValue(obj) - If valueObj IsNot Nothing Then - If typeToken.EndsWith("[]") = True Then - 'Type is array, ToString wont return maintainable material, so we get its content: - valueToken = GetArrayDump(valueObj) - ElseIf typeToken = "List`1" Then - 'Type is a list, ToString wont return maintainable material, so we get its content: - valueToken = GetListDump(valueObj) - typeToken = GetListTypeToken(valueObj) - Else - valueToken = valueObj.ToString() + If field.IsStatic Then + fieldAccessToken &= "Shared " + End If + + fieldNameToken = field.Name + fieldTypeToken = field.FieldType.Name + + If field.FieldType.IsArray Then + fieldValueToken = DumpArray(field.GetValue(sender)) + ElseIf field.FieldType.IsGenericType Then + If field.FieldType.Name = "List`1" Then + fieldTypeToken = $"List(Of {field.FieldType.GetGenericArguments()(0).Name})" + fieldValueToken = DumpGenericArray(field.GetValue(sender), "List`1") + ElseIf field.FieldType.Name = "Dictionary`2" Then + fieldTypeToken = $"Dictionary(Of {field.FieldType.GetGenericArguments()(0).Name}, {field.FieldType.GetGenericArguments()(1).Name})" + fieldValueToken = DumpGenericArray(field.GetValue(sender), "Dictionary`2") End If + ElseIf field.FieldType.Name = "Texture2D" Then + fieldValueToken = DumpTexture2D(field.GetValue(sender)) + Else + fieldValueToken = DumpObject(field.GetValue(sender)) End If - dump &= " " & accessToken & fieldToken & " As " & typeToken & " = " & valueToken + Dump &= fieldAccessToken & fieldNameToken & " As " & fieldTypeToken & " = " & fieldValueToken Next - _dump = dump + Dump &= vbNewLine & vbNewLine & + "--------------------------------------------------" & vbNewLine & + "Generated Property:" & vbNewLine & + "--------------------------------------------------" & vbNewLine + + For Each [property] As PropertyInfo In properties + If [property].CanRead Then + If Dump <> "" Then + Dump &= vbNewLine + End If + + Dim propertyNameToken As String = "" + Dim propertyTypeToken As String = "" + Dim propertyValueToken As String = "" + + propertyNameToken = [property].Name + propertyTypeToken = [property].PropertyType.Name + + If [property].PropertyType.IsArray Then + propertyValueToken = DumpArray([property].GetValue(sender)) + ElseIf [property].PropertyType.IsGenericType Then + If [property].PropertyType.Name = "List`1" Then + propertyTypeToken = $"List(Of {[property].PropertyType.GetGenericArguments()(0).Name})" + propertyValueToken = DumpGenericArray([property].GetValue(sender), "List`1") + ElseIf [property].PropertyType.Name = "Dictionary`2" Then + propertyTypeToken = $"Dictionary(Of {[property].PropertyType.GetGenericArguments()(0).Name}, {[property].PropertyType.GetGenericArguments()(1).Name})" + propertyValueToken = DumpGenericArray([property].GetValue(sender), "Dictionary`2") + End If + ElseIf [property].PropertyType.Name = "Texture2D" Then + propertyValueToken = DumpTexture2D([property].GetValue(sender)) + Else + propertyValueToken = DumpObject([property].GetValue(sender)) + End If + + Dump &= "Property " & propertyNameToken & " As " & propertyTypeToken & " = " & propertyValueToken + End If + Next End If End Sub - Private Function GetArrayDump(ByVal valueObj As Object) As String - Dim listDump As String = "" - - Dim valueArray As Array = CType(valueObj, Array) - For i = 0 To valueArray.Length - 1 - If listDump <> "" Then - listDump &= ", " - End If - If valueArray.GetValue(i) Is Nothing Then - listDump &= "Nothing" + Private Function DumpArray(ByVal obj As Object) As String + Try + If obj IsNot Nothing Then + Dim listValue As Array = CType(obj, Array) + If listValue.Length = 0 Then + Return "{}" + Else + Return "{" & String.Join(", ", listValue.Cast(Of Object).Select(Function(a) + Return a.ToString() + End Function).ToArray()) & "}" + End If Else - listDump &= valueArray.GetValue(i).ToString() + Return "Nothing" End If - Next - listDump = "{" & listDump & "}" - Return listDump + Catch ex As Exception + Return "Array too complex to dump." + End Try End Function - Private Function GetListDump(ByVal valueObj As Object) As String - 'Grab the type of the list (List`1): - Dim listType As Type = Type.GetType(valueObj.ToString()) - 'Get the ToArray method of the list: - Dim method As Reflection.MethodInfo = listType.GetMethod("ToArray", Reflection.BindingFlags.Public Or Reflection.BindingFlags.Instance) + Private Function DumpGenericArray(ByVal obj As Object, ByVal genericType As String) As String + Try + If obj IsNot Nothing Then + If genericType = "List`1" Then + Dim listValue As Array = CType(obj.GetType().GetMethod("ToArray").Invoke(obj, Nothing), Array) + If listValue.Length = 0 Then + Return "{}" + Else + Return "{" & String.Join(", ", listValue.Cast(Of Object).Select(Function(a) + Return a.ToString() + End Function).ToArray()) & "}" + End If + ElseIf genericType = "Dictionary`2" Then + Dim dictionaryKeys As Array = CType(obj.GetType().GetProperty("Keys").GetValue(obj), IEnumerable).Cast(Of Object).ToArray() + Dim dictonaryValues As Array = CType(obj.GetType().GetProperty("Values").GetValue(obj), IEnumerable).Cast(Of Object).ToArray() - Dim listDump As String = "" - - 'Create an array from the list by invoking its ToArray method. The array is not a generic type anymore, which means we can iterate through it: - Dim valueArray As Array = CType(method.Invoke(valueObj, {}), Array) - For i = 0 To valueArray.Length - 1 - If listDump <> "" Then - listDump &= ", " - End If - If valueArray.GetValue(i) Is Nothing Then - listDump &= "Nothing" + If dictionaryKeys.Length = 0 OrElse dictonaryValues.Length = 0 Then + Return "{}" + Else + Dim result As String = "" + For i As Integer = 0 To dictionaryKeys.Length - 1 + If i > 0 Then + result &= ", " + End If + result &= "{" & dictionaryKeys.Cast(Of Object)()(i).ToString() & ", " & dictonaryValues.Cast(Of Object)()(i).ToString() & "}" + Next + Return "{" & result & "}" + End If + Else + Return "Generic Type too complex to dump." + End If Else - listDump &= valueArray.GetValue(i).ToString() + Return "Nothing" End If - Next - listDump = "{" & listDump & "}" - Return listDump + Catch ex As Exception + Return "Generic Type too complex to dump." + End Try End Function - Private Function GetListTypeToken(ByVal valueObj As Object) As String - Dim listType As Type = Type.GetType(valueObj.ToString()) - Return "List<" & listType.GetGenericArguments()(0).Name & ">[]" + Private Function DumpTexture2D(ByVal obj As Object) As String + Try + If obj IsNot Nothing Then + Dim textureName As String = "" + Dim width As Integer = Convert.ToInt32(obj.GetType().GetProperty("Width").GetValue(obj)) + Dim height As Integer = Convert.ToInt32(obj.GetType().GetProperty("Height").GetValue(obj)) + + If String.IsNullOrEmpty((obj.GetType().GetProperty("Name").GetValue(obj)?.ToString())) Then + textureName = """""" + Else + textureName = obj.GetType().GetProperty("Name").GetValue(obj)?.ToString() + End If + + Return $"{{Name = {textureName}, Width = {width}, Height = {height}}}" + Else + Return "Nothing" + End If + Catch ex As Exception + Return "Texture2D too complex to dump." + End Try End Function -End Class + Private Function DumpObject(ByVal obj As Object) As String + Try + If obj IsNot Nothing Then + If String.IsNullOrEmpty(obj.ToString()) Then + Return """""" + Else + Return obj.ToString() + End If + Else + Return "Nothing" + End If + Catch ex As Exception + Return "Object too complex to dump." + End Try + End Function +End Class \ No newline at end of file diff --git a/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets new file mode 100644 index 000000000..64afbbaaa --- /dev/null +++ b/2.5DHero/2.5DHero/MonoGame.Content.Builder_Jian_New.targets @@ -0,0 +1,99 @@ + + + + + + + + + + + + true + + + + + + + $(ProjectDir)..\2.5DHeroContent\bin\$(MonoGamePlatform) + $(ProjectDir)..\2.5DHeroContent\obj\$(MonoGamePlatform) + + + /Library/Frameworks/Mono.framework/Versions/Current/bin/mono + /usr/local/bin/mono + /usr/bin/mono + mono + + $(ProjectDir)..\..\Universal Content Builder\Universal Content Builder\bin\Release\MGCB_Tool.exe + "$(MonoGameContentBuilderExe)" + $(MonoExe) $(MonoGameContentBuilderCmd) + + Resources\ + Assets\ + + + + + + + + + + + + + + + + + + + + + BuildContent; + $(BuildDependsOn); + + + + + + + + + + + + + + + + + + + + diff --git a/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb b/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb index 6cae88874..bbf920929 100644 --- a/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb +++ b/2.5DHero/2.5DHero/Network/Profiles/GamejoltSave.vb @@ -186,22 +186,22 @@ Namespace GameJolt End Get End Property - Private _apricorns As String = "" - Private _berries As String = "" - Private _box As String = "" - Private _daycare As String = "" - Private _itemData As String = "" - Private _items As String = "" - Private _NPC As String = "" - Private _options As String = "" - Private _party As String = "" - Private _player As String = "" - Private _pokedex As String = "" - Private _register As String = "" - Private _hallOfFame As String = "" - Private _secretBase As String = "" - Private _roamingPokemon As String = "" - Private _statistics As String = "" + Public _apricorns As String = "" + Public _berries As String = "" + Public _box As String = "" + Public _daycare As String = "" + Public _itemData As String = "" + Public _items As String = "" + Public _NPC As String = "" + Public _options As String = "" + Public _party As String = "" + Public _player As String = "" + Public _pokedex As String = "" + Public _register As String = "" + Public _hallOfFame As String = "" + Public _secretBase As String = "" + Public _roamingPokemon As String = "" + Public _statistics As String = "" Public AchievedEmblems As New List(Of String) Public DownloadedSprite As Texture2D = Nothing diff --git a/2.5DHero/2.5DHero/Player/Player.vb b/2.5DHero/2.5DHero/Player/Player.vb index 0feeef3fb..66a6b9995 100644 --- a/2.5DHero/2.5DHero/Player/Player.vb +++ b/2.5DHero/2.5DHero/Player/Player.vb @@ -568,528 +568,6 @@ Entity.MakeShake = Name.ToLower() = "drunknilllzz" - ''' Backup Save module - ''' 1. Encrypted OverWrite Save. - ''' 2. OverWrite Save. - ''' 3. Backup Save. - If filePrefix = "GAMEJOLTSAVE" AndAlso Core.GameOptions.Extras.Contains("Backup Save") Then - If Not Directory.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID) Then - Directory.CreateDirectory(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID) - End If - - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Encrypted\Encrypted.dat")) Then - Dim Items() As String = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID.ToString() & "\Encrypted\Encrypted.dat").Split(CChar("|")) - Dim Hash As String = String.Join("|", Items.Take(16)) - - Try - If Items.Count = 17 AndAlso String.Equals(Hash, Encryption.DecryptString(Items.Last, StringObfuscation.Obfuscate(GameJoltSave.GameJoltID))) Then - Core.Player.ApricornData = Encryption.DecryptString(Items(0), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.BerryData = Encryption.DecryptString(Items(1), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.BoxData = Encryption.DecryptString(Items(2), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.DaycareData = Encryption.DecryptString(Items(3), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.HallOfFameData = Encryption.DecryptString(Items(4), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.ItemData = Encryption.DecryptString(Items(5), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - - Inventory.Clear() - Mails.Clear() - Dim Data As String = Encryption.DecryptString(Items(6), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - If Not String.IsNullOrWhiteSpace(Data) Then - For Each ItemDat As String In Data.SplitAtNewline() - If Not String.IsNullOrWhiteSpace(ItemDat) Then - If ItemDat.StartsWith("{") AndAlso ItemDat.EndsWith("}") AndAlso ItemDat.Contains("|") Then - Dim ItemID As String = ItemDat.Remove(0, ItemDat.IndexOf("{") + 1) - ItemID = ItemID.Remove(ItemID.IndexOf("}")) - - Dim amount As Integer = CInt(ItemID.Remove(0, ItemID.IndexOf("|") + 1)) - ItemID = ItemID.Remove(ItemID.IndexOf("|")) - - Inventory.AddItem(CInt(ItemID), amount) - ElseIf ItemDat.StartsWith("Mail|") Then - Dim mailData As String = ItemDat.Remove(0, 5) - Mails.Add(Game.Items.MailItem.GetMailDataFromString(mailData)) - End If - End If - Next - End If - - Core.Player.NPCData = Encryption.DecryptString(Items(7), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - - Data = Encryption.DecryptString(Items(8), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - For Each Line As String In Data.SplitAtNewline() - If Line.Contains("|") Then - Dim ID As String = Line.Remove(Line.IndexOf("|")) - Dim Value As String = Line.Remove(0, Line.IndexOf("|") + 1) - Select Case ID.ToLower() - Case "fov" - startFOV = CSng(Value.Replace(".", GameController.DecSeparator)).Clamp(1, 179) - Case "textspeed" - TextBox.TextSpeed = CInt(Value) - Case "mousespeed" - startRotationSpeed = CInt(Value) - End Select - End If - Next - - Pokemons.Clear() - Dim PokeData As String = Encryption.DecryptString(Items(9), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - For Each Line As String In PokeData.SplitAtNewline() - If Line.StartsWith("{") AndAlso Line.EndsWith("}") Then - Dim p As Pokemon = Pokemon.GetPokemonByData(Line) - If p.IsEgg() = False Then - If p.IsShiny = True Then - PokedexData = Pokedex.ChangeEntry(PokedexData, p.Number, 3) - Else - PokedexData = Pokedex.ChangeEntry(PokedexData, p.Number, 2) - End If - End If - Pokemons.Add(p) - End If - Next - - Data = Encryption.DecryptString(Items(10), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Screen.Level.Riding = False - For Each Line As String In Data.SplitAtNewline() - If Not String.IsNullOrWhiteSpace(Line) AndAlso Line.Contains("|") Then - Dim ID As String = Line.Remove(Line.IndexOf("|")) - Dim Value As String = Line.Remove(0, Line.IndexOf("|") + 1) - Select Case ID.ToLower() - Case "name" - Name = CType(IIf(IsGameJoltSave, GameJolt.API.username, Value), String) - Case "position" - Dim v() As String = Value.Split(CChar(",")) - startPosition.X = CSng(v(0).Replace(".", GameController.DecSeparator)) - startPosition.Y = CSng(v(1).Replace(".", GameController.DecSeparator)) - startPosition.Z = CSng(v(2).Replace(".", GameController.DecSeparator)) - Case "lastpokemonposition" - Dim v() As String = Value.Split(CChar(",")) - LastPokemonPosition.X = CSng(v(0).Replace(".", GameController.DecSeparator)) - LastPokemonPosition.Y = CSng(v(1).Replace(".", GameController.DecSeparator)) - LastPokemonPosition.Z = CSng(v(2).Replace(".", GameController.DecSeparator)) - Case "mapfile" - startMap = Value - Case "rivalname" - RivalName = Value - Case "money" - Money = CInt(Value) - Case "badges" - Badges.Clear() - If Value = "0" Then - Badges = New List(Of Integer) - Else - If Value.Contains(",") = False Then - Badges = {CInt(Value)}.ToList() - Else - Dim l As List(Of String) = Value.Split(CChar(",")).ToList() - For i = 0 To l.Count - 1 - Badges.Add(CInt(l(i))) - Next - End If - End If - Case "rotation" - startRotation = CSng(Value.Replace(".", GameController.DecSeparator)) - Case "Gender" - If Value = "Male" Then - Male = True - Else - Male = False - End If - Case "playtime" - Dim dd() As String = Value.Split(CChar(",")) - If dd.Count >= 4 Then - PlayTime = New TimeSpan(CInt(dd(3)), CInt(dd(0)), CInt(dd(1)), CInt(dd(2))) - Else - PlayTime = New TimeSpan(CInt(dd(0)), CInt(dd(1)), CInt(dd(2))) - End If - Case "ot" - OT = CStr(CInt(Value).Clamp(0, 99999)) - Case "points" - Points = CInt(Value) - Case "haspokedex" - HasPokedex = CBool(Value) - Case "haspokegear" - HasPokegear = CBool(Value) - Case "freecamera" - startFreeCameraMode = CBool(Value) - Case "thirdperson" - startThirdPerson = CBool(Value) - Case "skin" - Skin = Value - Case "battleanimations" - ShowBattleAnimations = CInt(Value) - Case "boxamount" - BoxAmount = CInt(Value) - Case "lastrestplace" - LastRestPlace = Value - Case "lastrestplaceposition" - LastRestPlacePosition = Value - Case "diagonalmovement" - If GameController.IS_DEBUG_ACTIVE = True Then - DiagonalMovement = CBool(Value) - Else - DiagonalMovement = False - End If - Case "repelsteps" - RepelSteps = CInt(Value) - Case "lastsaveplace" - LastSavePlace = Value - Case "lastsaveplaceposition" - LastSavePlacePosition = Value - Case "difficulty" - DifficultyMode = CInt(Value) - Case "battlestyle" - BattleStyle = CInt(Value) - Case "savecreated" - SaveCreated = Value - Case "autosave" - If IsGameJoltSave = False Then - newFilePrefix = Value - AutosaveUsed = True - End If - Case "daycaresteps" - DaycareSteps = CInt(Value) - Case "gamemode" - GameMode = Value - Case "pokefiles" - If Value <> "" Then - If Value.Contains(",") = True Then - PokeFiles.AddRange(Value.Split(CChar(","))) - Else - PokeFiles.Add(Value) - End If - End If - Case "visitedmaps" - VisitedMaps = Value - Case "tempsurfskin" - TempSurfSkin = Value - Case "surfing" - startSurfing = CBool(Value) - Screen.Level.Surfing = CBool(Value) - Case "bp" - BP = CInt(Value) - Case "gtsstars" - GTSStars = CInt(Value) - Case "showmodels" - ShowModelsInBattle = CBool(Value) - Case "sandboxmode" - SandBoxMode = CBool(Value) - Case "earnedachievements" - If Value <> "" Then - EarnedAchievements = Value.Split(CChar(",")).ToList() - End If - End Select - Else - Logger.Log(Logger.LogTypes.Warning, "Player.vb: The line """ & Line & """ is either empty or does not conform the player.dat file rules.") - End If - Next - If IsGameJoltSave = True And Screen.Level.Surfing = False Then - Skin = GameJolt.Emblem.GetPlayerSpriteFile(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender) - Select Case GameJoltSave.Gender - Case "0" - Male = True - Case "1" - Male = False - Case Else - Male = True - End Select - End If - GameStart = Date.Now - - Core.Player.PokedexData = Encryption.DecryptString(Items(11), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.RegisterData = Encryption.DecryptString(Items(12), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.RoamingPokemonData = Encryption.DecryptString(Items(13), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - Core.Player.SecretBaseData = Encryption.DecryptString(Items(14), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - PlayerStatistics.Load(Encryption.DecryptString(Items(15), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID))) - Else - Logger.Log(Logger.LogTypes.Warning, "Backup save have been tempered with. Unable to load.") - End If - Catch ex As Exception - Logger.Log(Logger.LogTypes.Warning, "Backup save have been tempered with. Unable to load.") - End Try - End If - -#If DEBUG Then - If Not Directory.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite") Then - Directory.CreateDirectory(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite") - End If - - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Apricorns.dat")) Then - Core.Player.ApricornData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Apricorns.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Apricorns.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Berries.dat")) Then - Core.Player.BerryData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Berries.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Berries.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Box.dat")) Then - Core.Player.BoxData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Box.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Box.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Daycare.dat")) Then - Core.Player.DaycareData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Daycare.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Daycare.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\HallOfFame.dat")) Then - Core.Player.HallOfFameData = IO.File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\HallOfFame.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\HallOfFame.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\ItemData.dat")) Then - Core.Player.ItemData = IO.File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\ItemData.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\ItemData.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Items.dat")) Then - Inventory.Clear() - Mails.Clear() - Dim Data As String = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Items.dat") - If Not String.IsNullOrWhiteSpace(Data) Then - For Each ItemDat As String In Data.SplitAtNewline() - If Not String.IsNullOrWhiteSpace(ItemDat) Then - If ItemDat.StartsWith("{") AndAlso ItemDat.EndsWith("}") AndAlso ItemDat.Contains("|") Then - Dim ItemID As String = ItemDat.Remove(0, ItemDat.IndexOf("{") + 1) - ItemID = ItemID.Remove(ItemID.IndexOf("}")) - - Dim amount As Integer = CInt(ItemID.Remove(0, ItemID.IndexOf("|") + 1)) - ItemID = ItemID.Remove(ItemID.IndexOf("|")) - - Inventory.AddItem(CInt(ItemID), amount) - ElseIf ItemDat.StartsWith("Mail|") Then - Dim mailData As String = ItemDat.Remove(0, 5) - Mails.Add(Items.MailItem.GetMailDataFromString(mailData)) - End If - End If - Next - End If - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Items.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\NPC.dat")) Then - Core.Player.NPCData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\NPC.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\NPC.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Options.dat")) Then - Dim Data As String = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Options.dat") - For Each Line As String In Data.SplitAtNewline() - If Line.Contains("|") Then - Dim ID As String = Line.Remove(Line.IndexOf("|")) - Dim Value As String = Line.Remove(0, Line.IndexOf("|") + 1) - Select Case ID.ToLower() - Case "fov" - startFOV = CSng(Value.Replace(".", GameController.DecSeparator)).Clamp(1, 179) - Case "textspeed" - TextBox.TextSpeed = CInt(Value) - Case "mousespeed" - startRotationSpeed = CInt(Value) - End Select - End If - Next - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Options.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Party.dat")) Then - Pokemons.Clear() - Dim PokeData As String = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Party.dat") - For Each Line As String In PokeData.SplitAtNewline() - If Line.StartsWith("{") AndAlso Line.EndsWith("}") Then - Dim p As Pokemon = Pokemon.GetPokemonByData(Line) - If p.IsEgg() = False Then - If p.IsShiny = True Then - PokedexData = Pokedex.ChangeEntry(PokedexData, p.Number, 3) - Else - PokedexData = Pokedex.ChangeEntry(PokedexData, p.Number, 2) - End If - End If - Pokemons.Add(p) - End If - Next - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Party.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Player.dat")) Then - Dim Data As String = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Player.dat") - Screen.Level.Riding = False - For Each Line As String In Data.SplitAtNewline() - If Not String.IsNullOrWhiteSpace(Line) AndAlso Line.Contains("|") Then - Dim ID As String = Line.Remove(Line.IndexOf("|")) - Dim Value As String = Line.Remove(0, Line.IndexOf("|") + 1) - Select Case ID.ToLower() - Case "name" - Name = CType(IIf(IsGameJoltSave, GameJolt.API.username, Value), String) - Case "position" - Dim v() As String = Value.Split(CChar(",")) - startPosition.X = CSng(v(0).Replace(".", GameController.DecSeparator)) - startPosition.Y = CSng(v(1).Replace(".", GameController.DecSeparator)) - startPosition.Z = CSng(v(2).Replace(".", GameController.DecSeparator)) - Case "lastpokemonposition" - Dim v() As String = Value.Split(CChar(",")) - LastPokemonPosition.X = CSng(v(0).Replace(".", GameController.DecSeparator)) - LastPokemonPosition.Y = CSng(v(1).Replace(".", GameController.DecSeparator)) - LastPokemonPosition.Z = CSng(v(2).Replace(".", GameController.DecSeparator)) - Case "mapfile" - startMap = Value - Case "rivalname" - RivalName = Value - Case "money" - Money = CInt(Value) - Case "badges" - Badges.Clear() - If Value = "0" Then - Badges = New List(Of Integer) - Else - If Value.Contains(",") = False Then - Badges = {CInt(Value)}.ToList() - Else - Dim l As List(Of String) = Value.Split(CChar(",")).ToList() - For i = 0 To l.Count - 1 - Badges.Add(CInt(l(i))) - Next - End If - End If - Case "rotation" - startRotation = CSng(Value.Replace(".", GameController.DecSeparator)) - Case "Gender" - If Value = "Male" Then - Male = True - Else - Male = False - End If - Case "playtime" - Dim dd() As String = Value.Split(CChar(",")) - If dd.Count >= 4 Then - PlayTime = New TimeSpan(CInt(dd(3)), CInt(dd(0)), CInt(dd(1)), CInt(dd(2))) - Else - PlayTime = New TimeSpan(CInt(dd(0)), CInt(dd(1)), CInt(dd(2))) - End If - Case "ot" - OT = CStr(CInt(Value).Clamp(0, 99999)) - Case "points" - Points = CInt(Value) - Case "haspokedex" - HasPokedex = CBool(Value) - Case "haspokegear" - HasPokegear = CBool(Value) - Case "freecamera" - startFreeCameraMode = CBool(Value) - Case "thirdperson" - startThirdPerson = CBool(Value) - Case "skin" - Skin = Value - Case "battleanimations" - ShowBattleAnimations = CInt(Value) - Case "boxamount" - BoxAmount = CInt(Value) - Case "lastrestplace" - LastRestPlace = Value - Case "lastrestplaceposition" - LastRestPlacePosition = Value - Case "diagonalmovement" - If GameController.IS_DEBUG_ACTIVE = True Then - DiagonalMovement = CBool(Value) - Else - DiagonalMovement = False - End If - Case "repelsteps" - RepelSteps = CInt(Value) - Case "lastsaveplace" - LastSavePlace = Value - Case "lastsaveplaceposition" - LastSavePlacePosition = Value - Case "difficulty" - DifficultyMode = CInt(Value) - Case "battlestyle" - BattleStyle = CInt(Value) - Case "savecreated" - SaveCreated = Value - Case "autosave" - If IsGameJoltSave = False Then - newFilePrefix = Value - AutosaveUsed = True - End If - Case "daycaresteps" - DaycareSteps = CInt(Value) - Case "gamemode" - GameMode = Value - Case "pokefiles" - If Value <> "" Then - If Value.Contains(",") = True Then - PokeFiles.AddRange(Value.Split(CChar(","))) - Else - PokeFiles.Add(Value) - End If - End If - Case "visitedmaps" - VisitedMaps = Value - Case "tempsurfskin" - TempSurfSkin = Value - Case "surfing" - startSurfing = CBool(Value) - Screen.Level.Surfing = CBool(Value) - Case "bp" - BP = CInt(Value) - Case "gtsstars" - GTSStars = CInt(Value) - Case "showmodels" - ShowModelsInBattle = CBool(Value) - Case "sandboxmode" - SandBoxMode = CBool(Value) - Case "earnedachievements" - If Value <> "" Then - EarnedAchievements = Value.Split(CChar(",")).ToList() - End If - End Select - Else - Logger.Log(Logger.LogTypes.Warning, "Player.vb: The line """ & Line & """ is either empty or does not conform the player.dat file rules.") - End If - Next - If IsGameJoltSave = True And Screen.Level.Surfing = False Then - Skin = GameJolt.Emblem.GetPlayerSpriteFile(GameJolt.Emblem.GetPlayerLevel(GameJoltSave.Points), GameJoltSave.GameJoltID, GameJoltSave.Gender) - Select Case GameJoltSave.Gender - Case "0" - Male = True - Case "1" - Male = False - Case Else - Male = True - End Select - End If - GameStart = Date.Now - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Player.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Pokedex.dat")) Then - Core.Player.PokedexData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Pokedex.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Pokedex.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Register.dat")) Then - Core.Player.RegisterData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Register.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Register.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\RoamingPokemon.dat")) Then - Core.Player.RoamingPokemonData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\RoamingPokemon.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\RoamingPokemon.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\SecretBase.dat")) Then - Core.Player.SecretBaseData = File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\SecretBase.dat") - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\SecretBase.dat") - End If - If (File.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Statistics.dat")) Then - PlayerStatistics.Load(File.ReadAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Statistics.dat")) - File.Delete(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\OverWrite\Statistics.dat") - End If -#End If - - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Apricorns.dat", GameJoltSave.Apricorns) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Berries.dat", GameJoltSave.Berries) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Box.dat", GameJoltSave.Box) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Daycare.dat", GameJoltSave.Daycare) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\HallOfFame.dat", GameJoltSave.HallOfFame) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\ItemData.dat", GameJoltSave.ItemData) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Items.dat", GameJoltSave.Items) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\NPC.dat", GameJoltSave.NPC) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Options.dat", GameJoltSave.Options) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Party.dat", GameJoltSave.Party) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Player.dat", GameJoltSave.Player) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Pokedex.dat", GameJoltSave.Pokedex) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Register.dat", GameJoltSave.Register) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\RoamingPokemon.dat", GameJoltSave.RoamingPokemon) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\SecretBase.dat", GameJoltSave.SecretBase) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Statistics.dat", GameJoltSave.Statistics) - End If - ''' Indev 0.54 Removal List ''' 1. All Mega Stones. [ID: 507 - 553] ''' 2. Shiny Candy [ID: 501] @@ -1152,6 +630,63 @@ ActionScript.RegisterID("PokemonIndev054Update") End If + ''' Indev 0.54.2 OT Fix List. + If Not ActionScript.IsRegistered("PokemonIndev0542Update") Then + ' Check Party Pokemon. + For Each Pokemon As Pokemon In Pokemons + If String.Equals(Pokemon.CatchTrainerName, Core.Player.Name, StringComparison.OrdinalIgnoreCase) AndAlso Pokemon.OT <> GameJoltSave.GameJoltID Then + Pokemon.OT = GameJoltSave.GameJoltID + End If + Next + + ' Check PC Boxes. + If Not String.IsNullOrWhiteSpace(BoxData) Then + Dim TempBoxData As New List(Of String) + TempBoxData.AddRange(BoxData.SplitAtNewline()) + + For Each item As String In TempBoxData + If Not String.IsNullOrWhiteSpace(item) AndAlso Not item.StartsWith("BOX") Then + Dim TempString As String = item.Remove(item.IndexOf("{")) + Dim TempPokemon As Pokemon = Pokemon.GetPokemonByData(item.Remove(0, item.IndexOf("{"))) + + If String.Equals(TempPokemon.CatchTrainerName, Core.Player.Name, StringComparison.OrdinalIgnoreCase) AndAlso TempPokemon.OT <> GameJoltSave.GameJoltID Then + TempPokemon.OT = GameJoltSave.GameJoltID + End If + + item = TempString & TempPokemon.ToString() + End If + Next + + BoxData = String.Join(vbNewLine, TempBoxData) + End If + + ' Check Day Care. + If Not String.IsNullOrWhiteSpace(DaycareData) Then + Dim TempDaycareData As New List(Of String) + TempDaycareData.AddRange(DaycareData.SplitAtNewline()) + + For Each item As String In TempDaycareData + If Not String.IsNullOrWhiteSpace(item) AndAlso item.Contains("{") Then + Dim TempString As String = ItemData.Remove(item.IndexOf("{")) + Dim TempPokemon As Pokemon = Pokemon.GetPokemonByData(item.Remove(0, item.IndexOf("{"))) + + If String.Equals(TempPokemon.CatchTrainerName, Core.Player.Name, StringComparison.OrdinalIgnoreCase) AndAlso TempPokemon.OT <> GameJoltSave.GameJoltID Then + TempPokemon.OT = GameJoltSave.GameJoltID + End If + + item = TempString & TempPokemon.ToString() + End If + Next + + DaycareData = String.Join(vbNewLine, TempDaycareData) + End If + + ' Remove Duplicate data. + Core.Player.PokeFiles = Core.Player.PokeFiles.Distinct().ToList() + + ActionScript.RegisterID("PokemonIndev0542Update") + End If + loadedSave = True End Sub @@ -1584,8 +1119,8 @@ If IsGameJoltSave = True Then If Core.GameOptions.Extras.Contains("Backup Save") Then - If Not Directory.Exists(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Encrypted") Then - Directory.CreateDirectory(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Encrypted") + If Not Directory.Exists(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Encrypted") Then + Directory.CreateDirectory(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Encrypted") End If Dim OriginalHASH As String = @@ -1606,8 +1141,31 @@ Encryption.EncryptString(GetSecretBaseData, StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) & "|" & Encryption.EncryptString(GetStatisticsData, StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) - File.WriteAllText(GameController.GamePath & "\Backup Save\" & GameJoltSave.GameJoltID & "\Encrypted\Encrypted.dat", + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Encrypted/Encrypted.dat", OriginalHASH & "|" & Encryption.EncryptString(OriginalHASH, StringObfuscation.Obfuscate(GameJoltSave.GameJoltID))) + + Dim timestamp As String = Date.Now.ToString("yyyy-MM-dd_HH.mm.ss") + + If Not Directory.Exists(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp) Then + Directory.CreateDirectory(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp) + End If + + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Apricorns.dat", GetApricornsData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Berries.dat", GetBerriesData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Box.dat", GetBoxData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Daycare.dat", GetDaycareData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/HallOfFame.dat", GetHallOfFameData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/ItemData.dat", GetItemDataData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Items.dat", GetItemsData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/NPC.dat", GetNPCDataData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Options.dat", GetOptionsData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Party.dat", GetPartyData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Player.dat", GetPlayerData(False)) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Pokedex.dat", GetPokedexData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Register.dat", GetRegisterData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/RoamingPokemon.dat", GetRoamingPokemonData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/SecretBase.dat", GetSecretBaseData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Statistics.dat", GetStatisticsData) End If Dim APICallSave As New GameJolt.APICall(AddressOf SaveGameHelpers.CompleteGameJoltSave) diff --git a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb index d5dc6a250..6e53410c9 100644 --- a/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb +++ b/2.5DHero/2.5DHero/Resources/Sound/MusicManager.vb @@ -286,9 +286,7 @@ IntroStarted = False If Not s Is Nothing Then - If CanPlayMusic() = True Then - MediaPlayer.Play(s.Song) - End If + MediaPlayer.Play(s.Song) If MediaPlayer.IsMuted = True Then MediaPlayer.Pause() @@ -431,56 +429,8 @@ Return Not IsNothing(s) End Function - Private Declare Function GetAudioOutputDevices Lib "winmm.dll" Alias "waveOutGetNumDevs" () As Integer - - Private Shared Function CanPlayMusic() As Boolean - Dim errorMessage As String = "" - - Dim audioDeviceCount As Integer = GetAudioOutputDevices() - If audioDeviceCount > 0 Then - Try - Dim r As String = My.Computer.Registry.GetValue("HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\MediaPlayer\PlayerUpgrade", "PlayerVersion", Nothing).ToString() - If r <> "" And r.Contains(",") = True Then - Dim version As String = r.Remove(r.IndexOf(",")) - If IsNumeric(version) = True Then - If CInt(version) >= 11 Then - Return True - Else - errorMessage = "The installed version of the WindowsMediaPlayer (" & r & ") is smaller than 12." - End If - Else - errorMessage = "The registry string doesn't start with a numeric value." - End If - Else - errorMessage = "The registry string doesn't contain "","" or is empty." - End If - Catch - errorMessage = "Unknown error" - End Try - Else - errorMessage = "No audio output device is connected to the computer." - End If - - Logger.Log(Logger.LogTypes.Warning, "MusicManager.vb: An error occurred trying to play music: " & errorMessage) - - If Core.GameOptions.ForceMusic = True Then - Logger.Log(Logger.LogTypes.Message, "MusicManager.vb: Forced music to play and ignore the error occuring in music validation. Set ForceMusic to ""0"" in the options file to disable this.") - Return True - End If - - Return False - End Function - Public Shared Sub ForceVolumeUpdate() - #If WINDOWS Then - Try - MediaPlayer.Volume = Volume * MasterVolume - Catch ex As NullReferenceException - ' song changed while changing volume - End Try - #Else MediaPlayer.Volume = Volume * MasterVolume - #End If LastVolume = Volume * MasterVolume End Sub diff --git a/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb b/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb index 3af3ffb07..f9f0a0a54 100644 --- a/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb +++ b/2.5DHero/2.5DHero/Screens/MainMenu/MainMenuScreen.vb @@ -900,6 +900,216 @@ Public Class MainMenuScreen If Controls.Accept(True, True) = True Then If Core.GameInstance.IsMouseVisible = False And loadGameJoltIndex = 0 Or Core.ScaleScreenRec(New Rectangle(CInt(Core.ScreenSize.Width / 2) - 256, 300, 512, 128)).Contains(MouseHandler.MousePosition) = True And Core.GameInstance.IsMouseVisible = True Then Core.Player.IsGameJoltSave = True + + ' Backup Save module + ' 1. Load Encrypted.dat file. + ' 2. Load OverWrite folder + ' 3. Apply Extra Fixes. + + ' Enable Backup Save functionality. + If (Core.GameOptions.Extras.Contains("Backup Save")) Then + ' Make a copy of last known good gamejolt save! + Dim timestamp As String = Date.Now.ToString("yyyy-MM-dd_HH.mm.ss") + + If Not Directory.Exists(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp) Then + Directory.CreateDirectory(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp) + End If + + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Apricorns.dat", Core.GameJoltSave.Apricorns) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Berries.dat", Core.GameJoltSave.Berries) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Box.dat", Core.GameJoltSave.Box) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Daycare.dat", Core.GameJoltSave.Daycare) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/HallOfFame.dat", Core.GameJoltSave.HallOfFame) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/ItemData.dat", Core.GameJoltSave.ItemData) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Items.dat", Core.GameJoltSave.Items) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/NPC.dat", Core.GameJoltSave.NPC) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Options.dat", Core.GameJoltSave.Options) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Party.dat", Core.GameJoltSave.Party) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Player.dat", Core.GameJoltSave.Player) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Pokedex.dat", Core.GameJoltSave.Pokedex) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Register.dat", Core.GameJoltSave.Register) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/RoamingPokemon.dat", Core.GameJoltSave.RoamingPokemon) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/SecretBase.dat", Core.GameJoltSave.SecretBase) + File.WriteAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID & "/" & timestamp & "/Statistics.dat", Core.GameJoltSave.Statistics) + + If Directory.Exists(GameController.GamePath & "/Backup Save/" & Core.GameJoltSave.GameJoltID.ToString() & "/Encrypted/") Then + If File.Exists(GameController.GamePath & "/Backup Save/" & Core.GameJoltSave.GameJoltID.ToString() & "/Encrypted/Encrypted.dat") Then + Dim Items() As String = File.ReadAllText(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Encrypted/Encrypted.dat").Split(CChar("|")) + Dim Hash As String = String.Join("|", Items.Take(16)) + + ' Ensure that the items count is 17. Last index is for validation purpose. + If Items.Count() = 17 Then + ' Try using the new algorithm. + Try + If String.Equals(Hash, Encryption.DecryptString(Items.Last(), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID))) Then + Core.GameJoltSave._apricorns = Encryption.DecryptString(Items(0), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._berries = Encryption.DecryptString(Items(1), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._box = Encryption.DecryptString(Items(2), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._daycare = Encryption.DecryptString(Items(3), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._hallOfFame = Encryption.DecryptString(Items(4), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._itemData = Encryption.DecryptString(Items(5), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._items = Encryption.DecryptString(Items(6), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._NPC = Encryption.DecryptString(Items(7), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._options = Encryption.DecryptString(Items(8), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._party = Encryption.DecryptString(Items(9), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._player = Encryption.DecryptString(Items(10), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._pokedex = Encryption.DecryptString(Items(11), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._register = Encryption.DecryptString(Items(12), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._roamingPokemon = Encryption.DecryptString(Items(13), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._secretBase = Encryption.DecryptString(Items(14), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + Core.GameJoltSave._statistics = Encryption.DecryptString(Items(15), StringObfuscation.Obfuscate(GameJoltSave.GameJoltID)) + End If + Catch ex As Exception + + End Try + + ' Try again using the old algorithm. + Try + If String.Equals(Hash, Encryption.DecryptString(Items.Last(), StringObfuscation.Obfuscate("TheDialgaTeam"))) Then + ' Ensure that you are not cheating. + Dim PlayerData() As String = Items(10).SplitAtNewline() + If (PlayerData.Any(Function(a) + Return String.Equals(a, "OT|" & GameJoltSave.GameJoltID) + End Function)) Then + Core.GameJoltSave._apricorns = Encryption.DecryptString(Items(0), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._berries = Encryption.DecryptString(Items(1), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._box = Encryption.DecryptString(Items(2), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._daycare = Encryption.DecryptString(Items(3), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._hallOfFame = Encryption.DecryptString(Items(4), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._itemData = Encryption.DecryptString(Items(5), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._items = Encryption.DecryptString(Items(6), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._NPC = Encryption.DecryptString(Items(7), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._options = Encryption.DecryptString(Items(8), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._party = Encryption.DecryptString(Items(9), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._player = Encryption.DecryptString(Items(10), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._pokedex = Encryption.DecryptString(Items(11), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._register = Encryption.DecryptString(Items(12), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._roamingPokemon = Encryption.DecryptString(Items(13), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._secretBase = Encryption.DecryptString(Items(14), StringObfuscation.Obfuscate("TheDialgaTeam")) + Core.GameJoltSave._statistics = Encryption.DecryptString(Items(15), StringObfuscation.Obfuscate("TheDialgaTeam")) + Else + MsgBox("The game detected that you are trying to load the legacy Backup Save from Indev 0.53.3 Patch Update 6/7. Due to the nature of cloning account via Backup Save, we are unable to load this save." & vbNewLine & vbNewLine & "Please contact jianmingyong at http://pokemon3d.net/forum/ for more detail.", MsgBoxStyle.OkOnly, "Error") + End If + End If + Catch ex As Exception + + End Try + + ' Disable the older support for security reason. + Try + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Apricorns.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Berries.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Box.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Daycare.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/HallOfFame.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/ItemData.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Items.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/NPC.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Options.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Party.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Player.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Pokedex.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Register.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/RoamingPokemon.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/SecretBase.dat") AndAlso + File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Encrypted/Statistics.dat") Then + MsgBox("The game detected that you are trying to load the legacy Backup Save from Indev 0.53.3 Patch Update 5 and below. Due to the nature of cloning account via Backup Save, we are unable to load this save." & vbNewLine & vbNewLine & "Please contact jianmingyong at http://pokemon3d.net/forum/ for more detail.", MsgBoxStyle.OkOnly, "Error") + End If + Catch ex As Exception + + End Try + End If + End If + End If +#If DEBUG Then + If Not Directory.Exists(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Overwrite") Then + Directory.CreateDirectory(GameController.GamePath & "/Backup Save/" & GameJoltSave.GameJoltID.ToString() & "/Overwrite") + End If + + If Directory.Exists(GameController.GamePath & "/Backup Save/" & Core.GameJoltSave.GameJoltID.ToString() & "/Overwrite/") Then + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Apricorns.dat") Then + Core.GameJoltSave._apricorns = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Apricorns.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Apricorns.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Berries.dat") Then + Core.GameJoltSave._berries = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Berries.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Berries.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Box.dat") Then + Core.GameJoltSave._box = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Box.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Box.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Daycare.dat") Then + Core.GameJoltSave._daycare = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Daycare.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Daycare.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/HallOfFame.dat") Then + Core.GameJoltSave._hallOfFame = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/HallOfFame.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/HallOfFame.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/ItemData.dat") Then + Core.GameJoltSave._itemData = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/ItemData.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/ItemData.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Items.dat") Then + Core.GameJoltSave._items = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Items.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Items.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/NPC.dat") Then + Core.GameJoltSave._NPC = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/NPC.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/NPC.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Options.dat") Then + Core.GameJoltSave._options = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Options.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Options.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Party.dat") Then + Core.GameJoltSave._party = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Party.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Party.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Player.dat") Then + Core.GameJoltSave._player = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Player.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Player.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Pokedex.dat") Then + Core.GameJoltSave._pokedex = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Pokedex.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Pokedex.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Register.dat") Then + Core.GameJoltSave._register = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Register.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Register.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/RoamingPokemon.dat") Then + Core.GameJoltSave._roamingPokemon = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/RoamingPokemon.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/RoamingPokemon.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/SecretBase.dat") Then + Core.GameJoltSave._secretBase = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/SecretBase.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/SecretBase.dat") + End If + + If File.Exists(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Statistics.dat") Then + Core.GameJoltSave._statistics = File.ReadAllText(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Statistics.dat") + File.Delete(GameController.GamePath + "/Backup Save/" + Core.GameJoltSave.GameJoltID.ToString() + "/Overwrite/Statistics.dat") + End If + End If +#End If + End If + Core.Player.LoadGame("GAMEJOLTSAVE") Core.SetScreen(New JoinServerScreen(Me)) diff --git a/2.5DHero/2.5DHero/Screens/Screen.vb b/2.5DHero/2.5DHero/Screens/Screen.vb index 9a1ed0491..eb4204fd9 100644 --- a/2.5DHero/2.5DHero/Screens/Screen.vb +++ b/2.5DHero/2.5DHero/Screens/Screen.vb @@ -1,4 +1,4 @@ -''' +''' ''' The base class for all screens in the game. ''' Public MustInherit Class Screen @@ -108,6 +108,16 @@ Public MustInherit Class Screen ''' A global level instance, that carries over screen instances. ''' Public Shared Property Level() As Level + Get + Return _globalLevel + End Get + Set(value As Level) + If _globalLevel IsNot Nothing Then + _globalLevel.StopOffsetMapUpdate() + End If + _globalLevel = value + End Set + End Property ''' ''' A global BasicEffect instance, that carries over screen instances. diff --git a/2.5DHero/2.5DHero/Updater.exe b/2.5DHero/2.5DHero/Updater.exe deleted file mode 100644 index 444016e4a..000000000 Binary files a/2.5DHero/2.5DHero/Updater.exe and /dev/null differ diff --git a/2.5DHero/2.5DHero/World/Level.vb b/2.5DHero/2.5DHero/World/Level.vb index 3a66e1736..4a6992cec 100644 --- a/2.5DHero/2.5DHero/World/Level.vb +++ b/2.5DHero/2.5DHero/World/Level.vb @@ -1,3 +1,4 @@ +Imports System.Threading ''' ''' A class that manages the collection of entities to represent a map. ''' @@ -29,7 +30,7 @@ Public Class Level Private _offsetMapUpdateDelay As Integer = 50 ' Ticks until the next Offset Map update occurs. ' Map properties: - Private _terrain As Terrain = New Terrain(net.Pokemon3D.Game.Terrain.TerrainTypes.Plain) + Private _terrain As Terrain = New Terrain(Terrain.TerrainTypes.Plain) Private _mapName As String = "" Private _musicLoop As String = "" Private _levelFile As String = "" @@ -686,7 +687,7 @@ Public Class Level Public Sub StopOffsetMapUpdate() Me._offsetTimer.Stop() While Me._isUpdatingOffsetMaps - System.Threading.Thread.Sleep(1) + Thread.Sleep(1) End While Logger.Debug("Stopped Offset map update") @@ -713,7 +714,7 @@ Public Class Level End If ' Create own player entity and OverworldPokémon entity and add them to the entity enumeration: - OwnPlayer = New OwnPlayer(0, 0, 0, {net.Pokemon3D.Game.TextureManager.DefaultTexture}, Core.Player.Skin, 0, 0, "", "Gold", 0) + OwnPlayer = New OwnPlayer(0, 0, 0, {TextureManager.DefaultTexture}, Core.Player.Skin, 0, 0, "", "Gold", 0) OverworldPokemon = New OverworldPokemon(Screen.Camera.Position.X, Screen.Camera.Position.Y, Screen.Camera.Position.Z + 1) OverworldPokemon.ChangeRotation() Entities.AddRange({OwnPlayer, OverworldPokemon}) @@ -797,13 +798,16 @@ Public Class Level If LevelLoader.IsBusy = False Then For i = 0 To Entities.Count - 1 If i <= Entities.Count - 1 Then - If Entities.Count - 1 >= i AndAlso Entities(i).CanBeRemoved = True Then + If Entities.Count - 1 >= i AndAlso Entities(i).CanBeRemoved Then Entities.RemoveAt(i) i -= 1 Else - If Entities(i).NeedsUpdate = True Then + If Entities(i).NeedsUpdate Then Entities(i).Update() End If + + ' UpdateEntity for all entities: + Me.Entities(i).UpdateEntity() End If Else Exit For @@ -811,13 +815,6 @@ Public Class Level Next End If - ' UpdateEntity for all entities: - For i = 0 To Me.Entities.Count - 1 - If i <= Me.Entities.Count - 1 Then - Me.Entities(i).UpdateEntity() - End If - Next - ' UpdateEntity for all floors: For i = 0 To Me.Floors.Count - 1 If i <= Me.Floors.Count - 1 Then @@ -953,7 +950,7 @@ Public Class Level Me.Surfing = Core.Player.startSurfing ' Set the Surfing property after map switch. ' Create player and Pokémon entities: - OwnPlayer = New OwnPlayer(0, 0, 0, {net.Pokemon3D.Game.TextureManager.DefaultTexture}, Core.Player.Skin, 0, 0, "", "Gold", 0) + OwnPlayer = New OwnPlayer(0, 0, 0, {TextureManager.DefaultTexture}, Core.Player.Skin, 0, 0, "", "Gold", 0) OwnPlayer.SetTexture(Core.Player.Skin, usingGameJoltTexture) OverworldPokemon = New OverworldPokemon(Screen.Camera.Position.X, Screen.Camera.Position.Y, Screen.Camera.Position.Z + 1) diff --git a/2.5DHero/2.5DHero/packages.config b/2.5DHero/2.5DHero/packages.config new file mode 100644 index 000000000..777c5e44b --- /dev/null +++ b/2.5DHero/2.5DHero/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/2.5DHero/2.5DHeroContent/Content/Models/Environment/Test_floor/Test_floor.X b/2.5DHero/2.5DHeroContent/Content/Models/Environment/Test_floor/Test_floor.X index d949d5731..7e9060879 100644 --- a/2.5DHero/2.5DHeroContent/Content/Models/Environment/Test_floor/Test_floor.X +++ b/2.5DHero/2.5DHeroContent/Content/Models/Environment/Test_floor/Test_floor.X @@ -175,137 +175,4 @@ Frame Plane001 { 0.990000;0.990000;; } } -} - -AnimationSet Anim-1 { - - - Animation Anim-Plane001 { - - { Plane001 } - - AnimationKey { - 4; - 119; - 0;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 160;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 320;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 480;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 640;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 800;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 960;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1120;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1280;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1440;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1600;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1760;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 1920;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2080;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2240;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2400;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2560;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2720;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 2880;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3040;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3200;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3360;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3520;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3680;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 3840;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4000;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4160;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4320;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4480;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4640;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4800;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 4960;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5120;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5280;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5440;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5600;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5760;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 5920;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6080;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6240;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6400;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6560;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6720;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 6880;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7040;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7200;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7360;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7520;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7680;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 7840;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8000;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8160;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8320;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8480;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8640;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8800;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 8960;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9120;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9280;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9440;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9600;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9760;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 9920;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10080;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10240;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10400;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10560;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10720;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 10880;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11040;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11200;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11360;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11520;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11680;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 11840;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12000;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12160;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12320;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12480;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12640;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12800;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 12960;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13120;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13280;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13440;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13600;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13760;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 13920;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14080;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14240;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14400;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14560;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14720;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 14880;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15040;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15200;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15360;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15520;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15680;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 15840;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16000;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16160;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16320;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16480;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16640;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16800;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 16960;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17120;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17280;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17440;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17600;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17760;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 17920;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18080;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18240;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18400;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18560;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18720;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;, - 18880;16;1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,0.000000,0.000000,0.000000,1.000000,0.000000,2.096027,0.000000,-10.437111,1.000000;;; - } - } } \ No newline at end of file diff --git a/2.5DHero/2.5DHeroContent/Content/Models/Environment/arena_colleseum.X b/2.5DHero/2.5DHeroContent/Content/Models/Environment/arena_colleseum.X index cf3ffdad2..31bf4a2dd 100644 --- a/2.5DHero/2.5DHeroContent/Content/Models/Environment/arena_colleseum.X +++ b/2.5DHero/2.5DHeroContent/Content/Models/Environment/arena_colleseum.X @@ -3008,266 +3008,4 @@ Frame Box004 { 1.000000;0.836242;; } } -} - -AnimationSet Anim-1 { - - - Animation Anim-Plane002 { - - { Plane002 } - - AnimationKey { - 4; - 119; - 0;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 160;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 320;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 480;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 640;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 800;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 960;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1120;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1280;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1440;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1600;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1760;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 1920;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2080;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2240;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2400;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2560;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2720;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 2880;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3040;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3200;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3360;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3520;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3680;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 3840;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4000;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4160;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4320;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4480;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4640;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4800;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 4960;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5120;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5280;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5440;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5600;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5760;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 5920;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6080;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6240;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6400;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6560;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6720;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 6880;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7040;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7200;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7360;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7520;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7680;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 7840;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8000;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8160;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8320;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8480;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8640;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8800;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 8960;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9120;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9280;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9440;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9600;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9760;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 9920;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10080;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10240;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10400;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10560;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10720;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 10880;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11040;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11200;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11360;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11520;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11680;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 11840;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12000;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12160;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12320;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12480;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12640;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12800;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 12960;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13120;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13280;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13440;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13600;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13760;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 13920;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14080;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14240;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14400;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14560;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14720;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 14880;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15040;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15200;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15360;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15520;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15680;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 15840;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16000;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16160;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16320;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16480;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16640;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16800;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 16960;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17120;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17280;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17440;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17600;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17760;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 17920;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18080;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18240;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18400;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18560;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18720;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;, - 18880;16;0.314200,0.000000,0.000000,0.000000,0.000000,0.295854,0.000000,0.000000,0.000000,0.000000,0.316640,0.000000,0.000000,7.144531,0.000000,1.000000;;; - } - } - - Animation Anim-Box004 { - - { Box004 } - - AnimationKey { - 4; - 119; - 0;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 1920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 2880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 3840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 4960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 5920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 6880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 7840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 8960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 9920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 10880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 11840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 12960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 13920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 14880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 15840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 16960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 17920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;, - 18880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.784600,0.000000,0.000000,0.000000,0.000000,0.810360,0.000000,-305.546624,231.671987,183.057664,1.000000;;; - } - } } \ No newline at end of file diff --git a/2.5DHero/2.5DHeroContent/Content/Models/boat/Ship.X b/2.5DHero/2.5DHeroContent/Content/Models/boat/Ship.X index b77714df6..e3ce90bae 100644 --- a/2.5DHero/2.5DHeroContent/Content/Models/boat/Ship.X +++ b/2.5DHero/2.5DHeroContent/Content/Models/boat/Ship.X @@ -1336,137 +1336,4 @@ Frame Plane001 { 0.010085;0.133645;; } } -} - -AnimationSet Anim-1 { - - - Animation Anim-Plane001 { - - { Plane001 } - - AnimationKey { - 4; - 119; - 0;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 160;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 320;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 480;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 640;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 800;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 960;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1120;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1280;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1440;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1600;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1760;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 1920;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2080;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2240;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2400;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2560;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2720;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 2880;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3040;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3200;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3360;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3520;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3680;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 3840;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4000;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4160;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4320;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4480;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4640;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4800;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 4960;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5120;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5280;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5440;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5600;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5760;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 5920;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6080;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6240;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6400;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6560;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6720;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 6880;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7040;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7200;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7360;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7520;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7680;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 7840;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8000;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8160;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8320;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8480;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8640;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8800;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 8960;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9120;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9280;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9440;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9600;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9760;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 9920;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10080;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10240;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10400;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10560;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10720;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 10880;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11040;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11200;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11360;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11520;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11680;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 11840;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12000;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12160;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12320;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12480;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12640;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12800;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 12960;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13120;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13280;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13440;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13600;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13760;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 13920;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14080;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14240;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14400;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14560;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14720;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 14880;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15040;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15200;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15360;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15520;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15680;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 15840;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16000;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16160;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16320;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16480;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16640;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16800;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 16960;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17120;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17280;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17440;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17600;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17760;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 17920;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18080;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18240;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18400;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18560;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18720;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;, - 18880;16;-0.000000,0.000000,-1.000000,0.000000,-1.000000,-0.000000,0.000000,0.000000,-0.000000,1.000000,0.000000,0.000000,-0.759530,1.485295,-27.328125,1.000000;;; - } - } } \ No newline at end of file diff --git a/2.5DHero/2.5DHeroContent/Content/Models/boat/ferry.X b/2.5DHero/2.5DHeroContent/Content/Models/boat/ferry.X index 9d4c7b05a..d131fe9bb 100644 --- a/2.5DHero/2.5DHeroContent/Content/Models/boat/ferry.X +++ b/2.5DHero/2.5DHeroContent/Content/Models/boat/ferry.X @@ -5258,119 +5258,4 @@ Frame Plane001 { 0.010000;0.903591;; } } -} - -AnimationSet Anim-1 { - - - Animation Anim-Plane001 { - - { Plane001 } - - AnimationKey { - 4; - 101; - 0;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 1920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 2880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 3840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 4960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 5920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 6880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 7840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 8960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 9920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 10880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 11840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12160;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12320;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12480;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12640;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12800;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 12960;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13120;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13280;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13440;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13600;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13760;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 13920;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14080;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14240;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14400;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14560;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14720;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 14880;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15040;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15200;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15360;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15520;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15680;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 15840;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;, - 16000;16;1.000000,0.000000,0.000000,0.000000,0.000000,0.000000,-1.000000,0.000000,0.000000,1.000000,0.000000,0.000000,17.794170,12.235772,-0.000001,1.000000;;; - } - } } \ No newline at end of file diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/229_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/229_mega.png new file mode 100644 index 000000000..a388e2294 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/229_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362.png index 7e23ac301..dcd1bc20b 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362_mega.png new file mode 100644 index 000000000..edc9ccb30 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Normal/362_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/229_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/229_mega.png new file mode 100644 index 000000000..415525ca8 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/229_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362.png index 69adbea7f..c6e444d78 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362_mega.png new file mode 100644 index 000000000..564212d32 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Overworld/Shiny/362_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gengar_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gengar_mega.png index bc03d4386..7e745630f 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gengar_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gengar_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Glalie_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Glalie_mega.png new file mode 100644 index 000000000..ff43559c8 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Glalie_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gyarados_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gyarados_mega.png index f005a3e7e..69b1a7f1f 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gyarados_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Gyarados_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Houndoom_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Houndoom_mega.png index 9b1ea63b3..2c57c54e4 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Houndoom_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Houndoom_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latias_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latias_mega.png index c32494868..6bf440223 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latias_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latias_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latios_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latios_mega.png index c32494868..d335d004e 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latios_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Latios_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Manectric_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Manectric_mega.png index 0a6db6b23..604081618 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Manectric_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Manectric_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mawile_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mawile_mega.png index e73522b82..9d3646aaf 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mawile_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mawile_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mewtwo_mega_y.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mewtwo_mega_y.png index ec846f3e4..e12c8c2cc 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mewtwo_mega_y.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Mewtwo_mega_y.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Pinsir_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Pinsir_mega.png index 369480225..918b81f7e 100644 Binary files a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Pinsir_mega.png and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Pinsir_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Rayquaza_mega.png b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Rayquaza_mega.png new file mode 100644 index 000000000..2323dd515 Binary files /dev/null and b/2.5DHero/2.5DHeroContent/Content/Pokemon/Sprites/Rayquaza_mega.png differ diff --git a/2.5DHero/2.5DHeroContent/maps/battle/underwatercave/underwater.dat b/2.5DHero/2.5DHeroContent/maps/battle/underwatercave/underwater.dat index e624b69e2..ccbc915d3 100644 --- a/2.5DHero/2.5DHeroContent/maps/battle/underwatercave/underwater.dat +++ b/2.5DHero/2.5DHeroContent/maps/battle/underwatercave/underwater.dat @@ -1,37 +1,37 @@ {"Level"{LEV[{"Name"{str[Underwater Path]}}{"MusicLoop"{str[darkcave]}}{"WildPokemon"{bool[1]}}{"OverworldPokemon"{bool[0]}}]}} -{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}]}} +{"Actions"{LEV[{"CanTeleport"{bool[1]}}{"CanDig"{bool[0]}}{"RideType"{int[1]}}{"CanFly"{bool[0]}}{"EnviromentType"{int[4]}}{"Weather"{int[4]}}{"Lightning"{int[3]}}{"SurfingBattleMap"{str[underwatercave\underwater.dat,-7,0,14]}}]}} \\Internal Part: Floor: Normal Floor: - {"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,-0.25,-1]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[4,-0.25,11]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,6]}}{"Position"{sngArr[5,-0.25,13]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,-0.25,-1]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[4,-0.25,11]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,6]}}{"Position"{sngArr[5,-0.25,13]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Inverted Floor - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,-1]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,7]}}{"Position"{sngArr[5,1.75,13]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[5,2.75,10]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,1]}}{"Position"{sngArr[4,2.75,1]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[9,2.75,5]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[8,2.75,7]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[5,1]}}{"Position"{sngArr[3,2.75,8]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,1]}}{"Position"{sngArr[4,2.75,9]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[2,2.75,7]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[1,2.75,5]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,160,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,-1]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,7]}}{"Position"{sngArr[5,1.75,13]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[5,2.75,10]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,1]}}{"Position"{sngArr[4,2.75,1]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[9,2.75,5]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[8,2.75,7]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[5,1]}}{"Position"{sngArr[3,2.75,8]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,1]}}{"Position"{sngArr[4,2.75,9]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[2,2.75,7]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[1,2.75,5]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} Dive: To the cave: - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,4]}}{"Position"{sngArr[4,-0.24,3]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,4]}}{"Position"{sngArr[4,-0.24,3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[3,4]}}{"Position"{intArr[4,3,3]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[3,-0.24,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[3,-0.24,4]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[1,2]}}{"Position"{intArr[3,3,4]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[7,-0.24,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[7,-0.24,4]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[1,2]}}{"Position"{intArr[7,3,4]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} To the boat: - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[5,2]}}{"Position"{sngArr[3,-0.24,29]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,1]}}{"Position"{sngArr[4,-0.24,28]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[5,2]}}{"Position"{sngArr[3,-0.24,29]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,1]}}{"Position"{sngArr[4,-0.24,28]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} Walls: Normal walls @@ -251,16 +251,16 @@ Grass: \\External Part: Floor: - {"EntityField"{ENT[{"Size"{intArr[26,14]}}{"Position"{sngArr[-7,-0.25,19]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[96,160,16,16][96,160,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[0,0.75,20]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[-2,2.75,17]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[16,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[18,-0.25,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[8,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,3]}}{"Position"{sngArr[-11,-0.25,29]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[-6,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[5,6]}}{"Position"{sngArr[19,-0.25,16]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[7,8]}}{"Position"{sngArr[-14,-0.25,14]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[26,14]}}{"Position"{sngArr[-7,-0.25,19]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[0,0.75,20]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[-2,2.75,17]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[16,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[18,-0.25,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[8,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,3]}}{"Position"{sngArr[-11,-0.25,29]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[-6,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[5,6]}}{"Position"{sngArr[19,-0.25,16]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[7,8]}}{"Position"{sngArr[-14,-0.25,14]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Normal walls: {"EntityField"{ENT[{"EntityID"{str[WallBlock]}}{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,18]}}{"Rotation"{int[3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -398,8 +398,8 @@ Walls: \\ Distant part \\East part: Floor: - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[19,1.75,28]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[20,1.75,27]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[19,1.75,28]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[20,1.75,27]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[19,-0.25,22]}}{"Rotation"{int[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -435,13 +435,13 @@ Walls: \\South part: Floor: - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[-3,0.75,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[11,0.75,34]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,34]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-10,0.75,32]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[11,1.75,36]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-9,1.75,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[-3,0.75,33]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[11,0.75,34]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,34]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-10,0.75,32]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[11,1.75,36]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,35]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-9,1.75,35]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2,-0.25,33]}}{"Rotation"{int[0]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -532,7 +532,7 @@ Walls: \\West part: Floor: - {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"Position"{sngArr[-7,0.75,23]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[routes,48,160,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"Position"{sngArr[-7,0.75,23]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[-6,-0.25,23]}}{"Rotation"{int[3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -693,4 +693,3 @@ Boat Shader: - diff --git a/2.5DHero/2.5DHeroContent/maps/underwatercave/underwater.dat b/2.5DHero/2.5DHeroContent/maps/underwatercave/underwater.dat index edb6d8478..b294f2d9b 100644 --- a/2.5DHero/2.5DHeroContent/maps/underwatercave/underwater.dat +++ b/2.5DHero/2.5DHeroContent/maps/underwatercave/underwater.dat @@ -6,10 +6,10 @@ Floor: Normal Floor: - {"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,-0.25,-1]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[4,-0.25,11]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,6]}}{"Position"{sngArr[5,-0.25,13]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[11,11]}}{"Position"{sngArr[0,-0.25,0]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,-0.25,-1]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[4,-0.25,11]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,6]}}{"Position"{sngArr[5,-0.25,13]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Inverted Floor {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,-1]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} {"EntityField"{ENT[{"Size"{intArr[1,7]}}{"Position"{sngArr[5,1.75,13]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} @@ -23,15 +23,15 @@ Floor: {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[1,2.75,5]}}{"EntityID"{str[Water]}}{"RotationXYZ"{sngArr[0,0,3.1415]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16][16,0,16,16]]}}{"TextureIndex"{intArr[1,1,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}]}} Dive: To the cave: - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,4]}}{"Position"{sngArr[4,-0.24,3]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,4]}}{"Position"{sngArr[4,-0.24,3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[3,4]}}{"Position"{intArr[4,3,3]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[3,-0.24,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[3,-0.24,4]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[1,2]}}{"Position"{intArr[3,3,4]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[7,-0.24,4]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[1,2]}}{"Position"{sngArr[7,-0.24,4]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[1]}}{"AdditionalValue"{str[underwatercave\main.dat,~+13,5.1,~+33,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} {"Shader"{SHA[{"Shader"{sngArr[1.5,1.5,1.5]}}{"Size"{intArr[1,2]}}{"Position"{intArr[7,3,4]}}{"StopOnContact"{bool[1]}}{"ObjectSize"{sngArr[1,1]}}]}} To the boat: - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[5,2]}}{"Position"{sngArr[3,-0.24,29]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} - {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,1]}}{"Position"{sngArr[4,-0.24,28]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[5,2]}}{"Position"{sngArr[3,-0.24,29]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} + {"EntityField"{ENT[{"EntityID"{str[DiveTile]}}{"Size"{intArr[3,1]}}{"Position"{sngArr[4,-0.24,28]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,240,16,16]]}}{"TextureIndex"{intArr[0,0]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[2]}}{"AdditionalValue"{str[underwatercave\surface.dat,~+5,0.1,~-22,0]}}{"Rotation"{int[0]}}{"Visible"{bool[0]}}]}} Walls: Normal walls @@ -251,16 +251,16 @@ Grass: \\External Part: Floor: - {"EntityField"{ENT[{"Size"{intArr[26,14]}}{"Position"{sngArr[-7,-0.25,19]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[96,160,16,16][96,160,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[0,0.75,20]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[-2,2.75,17]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[16,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[18,-0.25,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[8,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,3]}}{"Position"{sngArr[-11,-0.25,29]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[-6,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[5,6]}}{"Position"{sngArr[19,-0.25,16]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[7,8]}}{"Position"{sngArr[-14,-0.25,14]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[26,14]}}{"Position"{sngArr[-7,-0.25,19]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[0,0.75,20]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[-2,2.75,17]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[3,2]}}{"Position"{sngArr[16,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[18,-0.25,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[8,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,3]}}{"Position"{sngArr[-11,-0.25,29]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,2]}}{"Position"{sngArr[-6,-0.25,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[5,6]}}{"Position"{sngArr[19,-0.25,16]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[7,8]}}{"Position"{sngArr[-14,-0.25,14]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Normal walls: {"EntityField"{ENT[{"EntityID"{str[WallBlock]}}{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,18]}}{"Rotation"{int[3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,0,0,-1,-1,-1,-1,-1,-1]}}{"Collision"{bool[1]}}{"ModelID"{int[1]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -398,8 +398,8 @@ Walls: \\ Distant part \\East part: Floor: - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[19,1.75,28]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[20,1.75,27]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[19,1.75,28]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[20,1.75,27]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[19,-0.25,22]}}{"Rotation"{int[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -435,13 +435,13 @@ Walls: \\South part: Floor: - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[-3,0.75,33]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[11,0.75,34]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,34]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-10,0.75,32]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[11,1.75,36]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} - {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-9,1.75,35]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[-3,0.75,33]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[11,0.75,34]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[2,1]}}{"Position"{sngArr[2,0.75,34]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-10,0.75,32]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[4,1]}}{"Position"{sngArr[11,1.75,36]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,1]}}{"Position"{sngArr[5,1.75,35]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,2]}}{"Position"{sngArr[-9,1.75,35]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[5,1]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[2,-0.25,33]}}{"Rotation"{int[0]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} @@ -532,7 +532,7 @@ Walls: \\West part: Floor: - {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"Position"{sngArr[-7,0.75,23]}}{"EntityID"{str[Water]}}{"Visible"{bool[1]}}{"TexturePath"{str[Routes]}}{"Textures"{recArr[[0,0,16,16][0,0,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} + {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"Position"{sngArr[-7,0.75,23]}}{"EntityID"{str[WallBlock]}}{"Visible"{bool[1]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[0,128,16,16][0,128,16,16]]}}{"TextureIndex"{intArr[0,0,1,1]}}{"Collision"{bool[0]}}{"ModelID"{int[0]}}{"Action"{int[0]}}{"AdditionalValue"{str[UnderwaterCave,0,128,16,16]}}{"Rotation"{int[0]}}]}} Walls: Slants: {"EntityField"{ENT[{"Size"{intArr[1,3]}}{"EntityID"{str[WallBlock]}}{"Position"{sngArr[-6,-0.25,23]}}{"Rotation"{int[3]}}{"TexturePath"{str[UnderwaterCave]}}{"Textures"{recArr[[16,0,16,16]]}}{"TextureIndex"{intArr[-1,-1,-1,-1,0,0]}}{"Collision"{bool[1]}}{"ModelID"{int[2]}}{"Action"{int[0]}}{"AdditionalValue"{str[]}}]}} diff --git a/2.5DHero_Jian_MGCB.sln b/2.5DHero_Jian_MGCB.sln new file mode 100644 index 000000000..4c43cd970 --- /dev/null +++ b/2.5DHero_Jian_MGCB.sln @@ -0,0 +1,39 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26228.9 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "2.5DHero", "2.5DHero\2.5DHero\2.5DHero.vbproj", "{2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}" + ProjectSection(ProjectDependencies) = postProject + {EE057806-FAE2-4F37-B85B-A5DE693E6E79} = {EE057806-FAE2-4F37-B85B-A5DE693E6E79} + EndProjectSection +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Universal Content Builder", "Universal Content Builder\Universal Content Builder\Universal Content Builder.csproj", "{EE057806-FAE2-4F37-B85B-A5DE693E6E79}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + DebugJian|MonoGame 3.5.1 = DebugJian|MonoGame 3.5.1 + DebugNoContent|MonoGame 3.5.1 = DebugNoContent|MonoGame 3.5.1 + ReleaseJian|MonoGame 3.5.1 = ReleaseJian|MonoGame 3.5.1 + ReleaseNoContent|MonoGame 3.5.1 = ReleaseNoContent|MonoGame 3.5.1 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.ActiveCfg = DebugJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugJian|MonoGame 3.5.1.Build.0 = DebugJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = DebugNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.DebugNoContent|MonoGame 3.5.1.Build.0 = DebugNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = ReleaseJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseJian|MonoGame 3.5.1.Build.0 = ReleaseJianNew|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = ReleaseNoContent|Any CPU + {2AAF65BE-C81D-4663-ABF4-E2E09B16E12F}.ReleaseNoContent|MonoGame 3.5.1.Build.0 = ReleaseNoContent|Any CPU + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.DebugNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseJian|MonoGame 3.5.1.Build.0 = MonoGame|3.5.1 + {EE057806-FAE2-4F37-B85B-A5DE693E6E79}.ReleaseNoContent|MonoGame 3.5.1.ActiveCfg = MonoGame|3.5.1 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Universal Content Builder b/Universal Content Builder new file mode 160000 index 000000000..7f3efac44 --- /dev/null +++ b/Universal Content Builder @@ -0,0 +1 @@ +Subproject commit 7f3efac44a447bf18c95197aa980b030dde10d47