Merge pull request #11 from raijenki/bugfixes-1.1

Bugfixes 1.1

Source/Bindings/ASFW/IO/FileHandler.vb

@@ -1,4 +1,6 @@
 Imports System.IO
+Imports System.Runtime.InteropServices
+Imports System.Text
 
 Namespace ASFW.IO.FileIO
     ''' <summary>
@@ -251,5 +253,18 @@ Namespace ASFW.IO.FileIO
                 File.WriteAllText(path, fBlock)
             End If
         End Sub
+
+        <DllImport("kernel32")>
+        Private Function WritePrivateProfileString(ByVal lpSectionName As String, ByVal lpKeyName As String, ByVal lpString As String, ByVal lpFileName As String) As Long
+        End Function
+
+        Public Function WriteOrCreate(filename As String, section As String, key As String, Optional defaultValue As String = "") As String
+            Dim sb As New StringBuilder(500)
+            If WritePrivateProfileString(section, key, defaultValue, filename) > 0 Then
+                Return sb.ToString
+            Else
+                Return defaultValue
+            End If
+        End Function
     End Module
 End Namespace

Source/Bindings/Configurations/Settings.vb

@@ -48,28 +48,19 @@ Friend Module modSettings
         Dim cf As String = Path.Config()
         If Not Directory.Exists(cf) Then
             Directory.CreateDirectory(cf)
-        End If : cf = cf & "\Settings.xml"
+        End If : cf = cf & "\Configurações.xml"
 
         If Not File.Exists(cf) Then
             File.Create(cf).Dispose()
             ASFW.IO.Serialization.SaveXml(Of SettingsDef)(cf, New SettingsDef)
         End If : Settings = ASFW.IO.Serialization.LoadXml(Of SettingsDef)(cf)
-
-#If CLIENT Then ' Update Gui
-        FrmOptions.optMOn.Checked = Settings.Music
-        FrmOptions.optSOn.Checked = Settings.Sound
-        FrmOptions.lblVolume.Text = "Volume: " & Settings.Volume
-        FrmOptions.scrlVolume.Value = Settings.Volume
-
-        FrmOptions.cmbScreenSize.SelectedIndex = Settings.ScreenSize
-#End If
     End Sub
 
     Friend Sub SaveSettings()
         Dim cf As String = Path.Config()
         If Not Directory.Exists(cf) Then
             Directory.CreateDirectory(cf)
-        End If : cf = cf & "\Settings.xml"
+        End If : cf = cf & "\Configurações.xml"
 
         ASFW.IO.Serialization.SaveXml(Of SettingsDef)(cf, Settings)
     End Sub

Source/Bindings/Globals/Paths.vb

@@ -11,27 +11,21 @@
         ''' <summary> Retorna o diretório de conteúdos </summary>
         Friend ReadOnly Property Contents As String
             Get
-                Return Application.StartupPath() & "\Dados"
+                Return Application.StartupPath() & "\Dados\"
             End Get
         End Property
 
         ''' <summary> Retorna o diretório do banco de dados </summary>
         Friend ReadOnly Property Database As String
             Get
-                Return Application.StartupPath() & "\Database\"
+                Return Application.StartupPath() & "\Dados\"
             End Get
         End Property
 
         ''' <summary> Retorna o diretório de configuração </summary>
         Friend ReadOnly Property Config As String
             Get
-#If CLIENT Then
-                Return Environment.GetFolderPath(
-                       Environment.SpecialFolder.ApplicationData) & "/" &
-                       Settings.GameName & "/"
-#ElseIf SERVER Then
-                Return Application.StartupPath() & "/Configs/"
-#End If
+                Return Application.StartupPath() & "/Dados/"
             End Get
         End Property
 
@@ -59,14 +53,14 @@
         ''' <summary> Retorna o diretório de músicas </summary>
         Friend ReadOnly Property Music As String
             Get
-                Return Contents & "\Audio\Musicas"
+                Return Contents & "\Audio\Musicas\"
             End Get
         End Property
 
         ''' <summary> Retorna o diretório de sons </summary>
         Friend ReadOnly Property Sounds As String
             Get
-                Return Contents & "\Audio\Efeitos"
+                Return Contents & "\Audio\Efeitos\"
             End Get
         End Property
 
@@ -75,7 +69,7 @@
         ''' <summary> Retorna diretório de contas </summary>
         Friend ReadOnly Property Accounts As String
             Get
-                Return Application.StartupPath() & "/Database/Contas/"
+                Return Application.StartupPath() & "/Dados/Contas/"
             End Get
         End Property
 
@@ -87,7 +81,7 @@
         ''' <summary> Retorna diretório de animações </summary>
         Friend ReadOnly Property Animations As String
             Get
-                Return Application.StartupPath() & "/Database/Animados/"
+                Return Application.StartupPath() & "/Dados/Animados/"
             End Get
         End Property
 
@@ -99,7 +93,7 @@
         ''' <summary> Retorna diretório de itens </summary>
         Friend ReadOnly Property Items As String
             Get
-                Return Application.StartupPath() & "/Database/Itens/"
+                Return Application.StartupPath() & "/Dados/Itens/"
             End Get
         End Property
 
@@ -118,7 +112,7 @@
         ''' <summary> Retorna diretório de mapas </summary>
         Friend ReadOnly Property Maps As String
             Get
-                Return Application.StartupPath() & "/Database/Mapas/"
+                Return Application.StartupPath() & "/Dados/Mapas/"
             End Get
         End Property
 
@@ -130,7 +124,7 @@
         ''' <summary> Retorna diretório de npcs </summary>
         Friend ReadOnly Property Npcs As String
             Get
-                Return Application.StartupPath() & "/Database/Npcs/"
+                Return Application.StartupPath() & "/Dados/Npcs/"
             End Get
         End Property
 
@@ -142,7 +136,7 @@
         ''' <summary> Retorna diretório de pets </summary>
         Friend ReadOnly Property Pets As String
             Get
-                Return Application.StartupPath() & "/Database/Pets/"
+                Return Application.StartupPath() & "/Dados/Pets/"
             End Get
         End Property
 
@@ -154,7 +148,7 @@
         ''' <summary> Retorna diretório de projeteis </summary>
         Friend ReadOnly Property Projectiles As String
             Get
-                Return Application.StartupPath() & "/Database/Projeteis/"
+                Return Application.StartupPath() & "/Dados/Projeteis/"
             End Get
         End Property
 
@@ -166,7 +160,7 @@
         ''' <summary> Retorna diretório de quests </summary>
         Friend ReadOnly Property Quests As String
             Get
-                Return Application.StartupPath() & "/Database/Tarefas/"
+                Return Application.StartupPath() & "/Dados/Tarefas/"
             End Get
         End Property
 
@@ -178,7 +172,7 @@
         ''' <summary> Retorna diretório de receitas </summary>
         Friend ReadOnly Property Recipes As String
             Get
-                Return Application.StartupPath() & "/Database/Receitas/"
+                Return Application.StartupPath() & "/Dados/Receitas/"
             End Get
         End Property
 
@@ -190,7 +184,7 @@
         ''' <summary> Retorna diretório de recursous </summary>
         Friend ReadOnly Property Resources As String
             Get
-                Return Application.StartupPath() & "/Database/Recursos/"
+                Return Application.StartupPath() & "/Dados/Recursos/"
             End Get
         End Property
 
@@ -202,7 +196,7 @@
         ''' <summary> Retorna diretório de lojas </summary>
         Friend ReadOnly Property Shops As String
             Get
-                Return Application.StartupPath() & "/Database/Lojas/"
+                Return Application.StartupPath() & "/Dados/Lojas/"
             End Get
         End Property
 
@@ -214,7 +208,7 @@
         ''' <summary> Retorna diretório de habilidades </summary>
         Friend ReadOnly Property Skills As String
             Get
-                Return Application.StartupPath() & "/Database/Habilidades/"
+                Return Application.StartupPath() & "/Dados/Habilidades/"
             End Get
         End Property
 

Source/Bindings/Network/Packets.vb

@@ -30,7 +30,6 @@
         CBanDestroy
         CBanPlayer
         CRequestEditMap
-
         CSetAccess
         CWhosOnline
         CSetMotd
@@ -39,7 +38,6 @@
         CCast
         CQuit
         CSwapInvSlots
-
         CCheckPing
         CUnequip
         CRequestPlayerData
@@ -48,7 +46,6 @@
         CRequestResources
         CSpawnItem
         CTrainStat
-
         CRequestAnimations
         CRequestSkills
         CRequestShops
@@ -62,14 +59,12 @@
         CWithdrawItem
         CCloseBank
         CAdminWarp
-
         CTradeInvite
         CTradeInviteAccept
         CAcceptTrade
         CDeclineTrade
         CTradeItem
         CUntradeItem
-
         CAdmin
 
         'tarefas

Source/Client/Client.vbproj

@@ -196,6 +196,7 @@
     </Compile>
     <Compile Include="Source\Modules\C_AutoMap.vb" />
     <Compile Include="Source\Modules\C_Editors.vb" />
+    <Compile Include="Source\Modules\Framework\ArrayExt.vb" />
     <Compile Include="Source\Modules\Network\C_Binder.vb" />
     <Compile Include="Source\Modules\Network\C_Serialization.vb" />
     <Compile Include="Source\Modules\Objects\C_Animations.vb" />

Source/Client/Dados/AutoMapper.ini

@@ -160,4 +160,23 @@ Layer5Tileset=0
 Layer5X=0
 Layer5Y=0
 Layer5Autotile=0
-Type=1
+Type=1
+
+[Detail0]
+Prefab=1
+Tileset=1
+StartX=0
+StartY=13
+EndX=4
+EndY=0
+
+[Detail1]
+Prefab=2
+Tileset=0
+StartX=0
+StartY=0
+EndX=7
+EndY=7
+
+[Details]
+DetailCount=2