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

P3D/Network/GameJolt/GTS/GTSSetupScreen.vb

@@ -721,6 +721,7 @@
 
                             Core.SetScreen(selScreen)
                             CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
+                            CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
                         End If
                         If New Rectangle(700, 540, 32 * 3 + 64, 32).Contains(MouseHandler.MousePosition) = True Then
                             Me.GTSSetupScreen.loaded = False

P3D/Network/GameJolt/GTS/WonderTradeScreen.vb

@@ -207,6 +207,7 @@
 
                             Core.SetScreen(selScreen)
                             CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
+                            CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
                             Me.OpenedSelect = True
                         End If
                     Else

P3D/Network/Servers/DirectTradeScreen.vb

@@ -293,6 +293,7 @@
 
                 Core.SetScreen(selScreen)
                 CType(Core.CurrentScreen, PartyScreen).CanChooseHMPokemon = False
+                CType(Core.CurrentScreen, PartyScreen).CanChooseFusedPokemon = False
 
             Case 2
                 Me.QuitTrade()

P3D/P3D.vbproj

@@ -29,6 +29,21 @@
     <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'DebugNoContent'">
     <DebugSymbols>true</DebugSymbols>
@@ -13915,6 +13930,9 @@
     <Content Include="Content\Textures\club.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\EmbeddedTower.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Emblem\ancestor.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -26287,6 +26305,30 @@
     <None Include="Content\Data\maps\ecruteak\event.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="Content\Data\maps\embtower\BWStatic.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\FullGrayStatic.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\GrayIntoB&amp;W.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\GrayIntoBOnly.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\GrayIntoWOnly.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\main.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\OnlyBlackAnimated.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Data\maps\embtower\OnlyWhiteAnimated.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\maps\fortune\0.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26338,6 +26380,9 @@
     <Content Include="Content\Data\maps\poke\fortune\altering.poke">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Data\maps\pewter\museum2.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\maps\poke\cinnabar\main.poke">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26629,6 +26674,9 @@
     <None Include="Content\Data\Scripts\pallet\labmap.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <Content Include="Content\Data\Scripts\pewter\kyuremfuse.dat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <None Include="Content\Data\Scripts\tohjofalls\jjm.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -26785,6 +26833,9 @@
     <None Include="Content\Pokemon\Data\172_spiky-eared.dat">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="meta">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
     <None Include="Pokemon\Items\_itemList.txt" />
     <None Include="My Project\app.manifest" />
@@ -28463,7 +28514,13 @@
       <Name>GameDevCommon</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
   <Import Condition=" '$(Configuration)' != 'DebugNoContent' Or '$(Configuration)' != 'ReleaseNoContent' " Project="$(MSBuildExtensionsPath)\MonoGame\v3.0\MonoGame.Content.Builder.targets" />
   <PropertyGroup>

P3D/Screens/Pokemon/PartyScreen.vb

@@ -65,6 +65,7 @@ Public Class PartyScreen
     Public CanChooseFainted As Boolean = True
     Public CanChooseEgg As Boolean = True
     Public CanChooseHMPokemon As Boolean = True
+    Public CanChooseFusedPokemon As Boolean = True
 
     Public Delegate Sub DoStuff(ByVal PokeIndex As Integer)
     Dim ChoosePokemon As DoStuff
@@ -585,6 +586,13 @@ Public Class PartyScreen
                 Return False
             End If
         End If
+        If Me.CanChooseFusedPokemon = False Then
+            If p.OriginalNumber = 646 Then
+                If p.AdditionalData = "black" Or p.AdditionalData = "white" Then
+                    Return False
+                End If
+            End If
+        End If
         Return True
     End Function
 

P3D/Security/FileValidation.vb

@@ -6,8 +6,8 @@
         Shared _valid As Boolean = False
 
         Const RUNVALIDATION As Boolean = False
-        Const EXPECTEDSIZE As Integer = 46316258
+        Const EXPECTEDSIZE As Integer = 46506288
-        Const METAHASH As String = "OERBQURCRjlERUU1MTgzQTIwNzM4QTIzQkQ1QzZFNDM="
+        Const METAHASH As String = "REQ4OEREN0JBOUU0QTIyQkM1MjI0OEE5Q0VEQTE4NDM="
 
         Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
             Get

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

@@ -33,7 +33,7 @@
 
                         argument = argument.Remove(0, argument.IndexOf("{"))
 
-                        Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ","))
+                        Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",").Replace("«", "[").Replace("»", "]"))
                         Core.Player.Pokemons.Insert(insertIndex, p)
 
                         Dim pokedexType As Integer = 2
@@ -169,6 +169,20 @@
                             p.Attacks.RemoveAt(attackIndex)
                         End If
                     End If
+                Case "removeattackid"
+                    Dim Index As Integer = int(argument.GetSplit(0, ","))
+                    Dim attackId As Integer = int(argument.GetSplit(1, ","))
+
+                    If Core.Player.Pokemons.Count - 1 >= Index Then
+                        Dim p As Pokemon = Core.Player.Pokemons(Index)
+
+                        For a = 0 To (p.Attacks.Count - 1)
+                            If p.Attacks(a).ID = attackId Then
+                                p.Attacks.RemoveAt(a)
+                                Exit For
+                            End If
+                        Next
+                    End If
                 Case "clearattacks"
                     Dim Index As Integer = int(argument)
 
@@ -710,7 +724,7 @@
 
                         argument = argument.Remove(0, argument.IndexOf("{"))
 
-                        Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ","))
+                        Dim p As Pokemon = Pokemon.GetPokemonByData(argument.Replace("§", ",").Replace("«", "[").Replace("»", "]"))
                         StorageSystemScreen.DepositPokemon(p, insertIndex)
 
                         Dim pokedexType As Integer = 2

P3D/World/ActionScript/V2/ScriptConstructs/DoPokemon.vb

@@ -16,7 +16,7 @@
                     Return Core.Player.Pokemons(index).Number
                 Case "data"
                     Dim index As Integer = int(argument.GetSplit(0))
-                    Return Core.Player.Pokemons(index).GetSaveData().Replace(",", "§")
+                    Return Core.Player.Pokemons(index).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»")
                 Case "level"
                     Dim index As Integer = int(argument.GetSplit(0))
                     Return Core.Player.Pokemons(index).Level
@@ -274,16 +274,16 @@
                         Next
                     End If
 
-                    Return FrontierSpawner.GetPokemon(level, pokemon_class, IDPreset).GetSaveData().Replace(",", "§")
+                    Return FrontierSpawner.GetPokemon(level, pokemon_class, IDPreset).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»")
                 Case "spawnwild"
-                    Return Spawner.GetPokemon(Screen.Level.LevelFile, CType(int(argument), Spawner.EncounterMethods)).GetSaveData().Replace(",", "§")
+                    Return Spawner.GetPokemon(Screen.Level.LevelFile, CType(int(argument), Spawner.EncounterMethods)).GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»")
                 Case "spawn"
                     Dim ID As Integer = int(argument.GetSplit(0))
                     Dim level As Integer = int(argument.GetSplit(1))
 
                     Dim p As Pokemon = Pokemon.GetPokemonByID(ID)
                     p.Generate(level, True)
-                    Return p.GetSaveData().Replace(",", "§")
+                    Return p.GetSaveData().Replace(",", "§").Replace("[", "«").Replace("]", "»")
                 Case "otmatch"
                     ' Arguments: has: returns boolean, ID: returns Pokédex number, Name: returns name, maxhits: returns the maximum number of equal chars.