Merge branch 'VoltorbFlip'

P3D/Content/Localization/Tokens_en.dat

@@ -401,6 +401,67 @@ black_out_screen_line3,to the nearest PokéCenter
 black_out_screen_line4,to prevent further injury
 black_out_screen_line5,to your Pokémon.
 ---
+Voltorb Flip:
+VoltorbFlip_LV.,LV.
+VoltorbFlip_CurrentCoins_Line1,Coins found
+VoltorbFlip_CurrentCoins_Line2,in this LV.
+VoltorbFlip_TotalCoins_Line1,Total Coins
+VoltorbFlip_TotalCoins_Line2,earned
+
+VoltorbFlip_MemoButton_Open_Line1,Open
+VoltorbFlip_MemoButton_Open_Line2,Memos
+VoltorbFlip_MemoButton_Close_Line1,Close
+VoltorbFlip_MemoButton_Close_Line2,Memos
+
+VoltorbFlip_QuitButton,Quit
+
+VoltorbFlip_QuitQuestion_Question_1,If you quit now, you will~receive
+VoltorbFlip_QuitQuestion_Question_2,Coin(s).*Will you quit?
+VoltorbFlip_QuitQuestion_AnswerYes,Yes
+VoltorbFlip_QuitQuestion_AnswerNo,No
+
+VoltorbFlip_BeforeNewLevel_Main_Question_1,Play Voltorb Flip Lv.
+VoltorbFlip_BeforeNewLevel_Main_Question_2,?
+VoltorbFlip_BeforeNewLevel_Main_Answer_Play,Play
+VoltorbFlip_BeforeNewLevel_Main_Answer_GameInfo,Game Info
+VoltorbFlip_BeforeNewLevel_Main_Answer_Quit,Quit
+VoltorbFlip_BeforeNewLevel_GameInfo_Question,Which set of info?
+VoltorbFlip_BeforeNewLevel_GameInfo_Answer_HowToPlay,How to Play
+VoltorbFlip_BeforeNewLevel_GameInfo_Answer_Hint,Hint!
+VoltorbFlip_BeforeNewLevel_GameInfo_Answer_AboutMemos,About Memos
+
+VoltorbFlip_GameWon_1,Game clear!~You've found all of the hidden x2 and x3 cards.*<player.name> received~
+VoltorbFlip_GameWon_2,Coin(s)!
+
+VoltorbFlip_GameLost,Oh no! You get 0 Coins!
+
+VoltorbFlip_MaxCoins,Your Coin Case can't fit~any more Coin(s)!
+
+VoltorbFlip_NewLevel_Lower1,Dropped to Game Lv.
+VoltorbFlip_NewLevel_Lower2,!
+VoltorbFlip_NewLevel_Same1,Ready to play Game Lv.
+VoltorbFlip_NewLevel_Same2,!
+VoltorbFlip_NewLevel_Higher1,Advanced to Game Lv.
+VoltorbFlip_NewLevel_Higher2,!
+
+VoltorbFlip_QuitGame_1,<player.name> received~
+VoltorbFlip_QuitGame_2,Coin(s)!
+
+VoltorbFlip_AfterGame_Won1,You've won
+VoltorbFlip_AfterGame_Won2,Coin(s)!
+VoltorbFlip_AfterGame_Lost,Too bad, you didn't win~any Coins!*Better luck next time!
+
+VoltorbFlip_BeforeGame_FullCoinCase,Your Coin Case is already full!
+VoltorbFlip_BeforeGame_NoCoinCase,You don't have a Coin Case!~Come back when you have one!
+
+VoltorbFlip_Tutorial_HowToPlay_Message,Voltorb Flip is a game in which~you flip over cards to find~numbers hidden beneath them.*The cards are hiding the~numbers 1 through 3...~and Voltorb as well.*The first number you flip over~will give you that many Coins.*From then on, the next number~you find will multiply the~total amount of Coins you've~collected by that number.*If it's a 2, your total will~be multiplied by "x2".*If it's a 3, your total will~be multiplied by "x3".*But if you flip over a~Voltorb, it's game over.*When that happens, you'll lose~all the Coins you've collected~in the current level.*If you select "Quit", you'll~withdraw from the level.*If you get to a difficult~spot, you might want to end~the game early.*Once you've found all the~hidden 2 and 3 cards,~you've cleared the game.*Once you've flipped over~all these cards, then you'll~advance to the next level.*As you move up in levels,~you will be able to receive~more Coins. Do your best!
+VoltorbFlip_Tutorial_Hint_Message,The numbers at the side~of the board give you a clue~about the numbers hidden on~the backs of the cards.*The larger the number, the~more likely it is that there~are many large numbers hidden~in that row or column.*In the same way, you can tell~how many Voltorb are hidden~in the row or column.*Consider the hidden number~totals and the Voltorb~totals carefully as you~flip over cards.
+VoltorbFlip_Tutorial_AboutMemos_Message,Select "Open Memo" or press~[<system.button(run)>] to open the~Memo Window.*You can mark the cards with~the numbers 1 through 3,~but also with a Voltorb mark.*When you have an idea of the~numbers hidden on the back~of the cards, open the Memo~Window, choose the type of~mark you want to use with~the Mouse Wheel or the~Gamepad's Shoulder Buttons~and then press [<system.button(enter1)>]~while highlighting the card~you want to mark.*If you want to remove a mark,~choose the type of mark you~want to remove with the~Mouse Wheel or the Gamepad's~Shoulder Buttons and then~press [<system.button(back1)>] while~highlighting the card you~want to remove the mark from.*You can also use the~mouse to select a~mark type or a card.
+VoltorbFlip_Tutorial_HowToPlay_Image1,If you flip the cards in this order, you'll collect: 3 x 1 x 2 x 1 x 3... A total of 18 Coins! And then...
+VoltorbFlip_Tutorial_HowToPlay_Image2,If you select "Quit", you'll keep those 18 Coins.
+VoltorbFlip_Tutorial_HowToPlay_Image3,But if you find Voltorb, you'll lose all your Coins!
+VoltorbFlip_Tutorial_Hint_Image,By looking at the numbers on the sides of the cards, you can see the hidden number and Voltorb totals.
+VoltorbFlip_Tutorial_AboutMemos_Image,Select "Open Memo" to open the Memo Window. Select the cards and press [<system.button(enter1)>] to add and [<system.button(back1)>] to remove marks.
 Battle:
 ---
 main:
@@ -1674,6 +1735,10 @@ item_name_673,Psychic Memory
 item_name_674,Rock Memory
 item_name_675,Steel Memory
 item_name_676,Water Memory
+
+Item Use Text:
+Key Items:
+item_use_54,Your coins:~
 -------------------
 Move Names:
 move_name_1,Pound

P3D/P3D.vbproj

@@ -18036,6 +18036,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Textures\battlepike.png">
+    <Content Include="Content\Sounds\VoltorbFlip\LoseGame.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sounds\VoltorbFlip\QuitGame.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sounds\VoltorbFlip\StartGame.wav">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Sounds\VoltorbFlip\WinGame.wav">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="Content\Textures\Battle\Flying\Gust.png">
@@ -28199,6 +28209,54 @@
     <Content Include="Content\Textures\viridianForest.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Background.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Board.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Cursor_Game.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Cursor_Memo.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\HUD.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Memo_Background.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Memo_Button.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Memo_Enabled.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Memo_Index.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Quit_Button.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tile_Back.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tile_Front.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tile_MemoIcons.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tutorial_AboutMemos.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tutorial_Hint.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+    <Content Include="Content\Textures\VoltorbFlip\Tutorial_HowToPlay.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Content\Textures\Weather\ash.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -31953,6 +32011,7 @@
     <Compile Include="Screens\Pokemon\HatchEggScreen.vb" />
     <Compile Include="Screens\Pokemon\LearnAttackScreen.vb" />
     <Compile Include="Screens\Pokemon\NameObjectScreen.vb" />
+    <Compile Include="Screens\VoltorbFlipScreen.vb" />
     <Compile Include="Screens\Pokemon\PartyScreen.vb" />
     <Compile Include="Screens\Pokemon\SummaryScreen.vb" />
     <Compile Include="Screens\Pokemon\TeachMovesScreen.vb" />

P3D/Pokemon/Items/KeyItems/CoinCase.vb

@@ -13,7 +13,7 @@ Namespace Items.KeyItems
         End Sub
 
         Public Overrides Sub Use()
-            Screen.TextBox.Show("Your coins:~" & Core.Player.Coins, {}, True, True)
+            Screen.TextBox.Show(Localization.GetString("item_use_54", "Your coins:~") & Core.Player.Coins, {}, True, True)
         End Sub
 
     End Class

P3D/Resources/FontContainer.vb

@@ -16,7 +16,7 @@ Public Class FontContainer
         Me._spriteFont = Font
 
         Select Case FontName.ToLower()
-            Case "braille"
+            Case "braille", "voltorbflipfont"
                 Me._spriteFont.DefaultCharacter = CChar(" ")
             Case Else
                 Me._spriteFont.DefaultCharacter = CChar("?")

P3D/Resources/FontManager.vb

@@ -116,6 +116,12 @@ Public Class FontManager
         End Get
     End Property
 
+    Public Shared ReadOnly Property VoltorbFlipFont() As SpriteFont
+        Get
+            Return GetFont("voltorbflipfont")
+        End Get
+    End Property
+
     Private Shared loadedGameJoltFont As SpriteFont = Nothing
     Private Shared hasLoadedGameJoltFont As Boolean = False
 

P3D/Screens/MainMenu/PauseScreen.vb

@@ -295,6 +295,12 @@
 #End Region
 
     Private Sub QuitGame()
+        'Reset VoltorbFlipScreen's Variables
+        VoltorbFlip.VoltorbFlipScreen.CurrentLevel = 1
+        VoltorbFlip.VoltorbFlipScreen.PreviousLevel = 1
+        VoltorbFlip.VoltorbFlipScreen.ConsecutiveWins = 0
+        VoltorbFlip.VoltorbFlipScreen.TotalFlips = 0
+
         If JoinServerScreen.Online = True Then
             Core.ServersManager.ServerConnection.Disconnect()
         End If

P3D/Screens/Screen.vb

@@ -91,6 +91,7 @@ Public MustInherit Class Screen
         PressStartScreen
         CharacterSelectionScreen
         GameModeSelectionScreen
+        VoltorbFlipScreen
 
         'TEMPORARY, OLD
         PokemonScreen

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

@@ -275,6 +275,34 @@
                     Core.SetScreen(New SecretBaseScreen())
                     IsReady = True
 
+                    CanContinue = False
+                Case "voltorbflip"
+                    If Core.Player.Inventory.GetItemAmount(54) > 0 Then
+                        If Core.Player.Coins < 50000 Then
+                            If VoltorbFlip.VoltorbFlipScreen.TotalCoins = -1 Then
+                                Core.SetScreen(New VoltorbFlip.VoltorbFlipScreen(CurrentScreen))
+                            End If
+                            If CurrentScreen.Identification = Screen.Identifications.OverworldScreen Then
+                                If VoltorbFlip.VoltorbFlipScreen.TotalCoins > 0 Then
+                                    Screen.TextBox.Show(Localization.GetString("VoltorbFlip_AfterGame_Won1", "You've won") & " " & VoltorbFlip.VoltorbFlipScreen.TotalCoins & " " & Localization.GetString("VoltorbFlip_AfterGame_Won2", "Coins!"))
+                                    Core.Player.Coins += VoltorbFlip.VoltorbFlipScreen.TotalCoins
+                                    VoltorbFlip.VoltorbFlipScreen.TotalCoins = -1
+                                    IsReady = True
+                                Else
+                                    Screen.TextBox.Show(Localization.GetString("VoltorbFlip_AfterGame_Lost", "Too bad, you didn't win~any Coins!*Better luck next time!"))
+                                    VoltorbFlip.VoltorbFlipScreen.TotalCoins = -1
+                                    IsReady = True
+                                End If
+                            End If
+
+                        Else
+                            Screen.TextBox.Show(Localization.GetString("VoltorbFlip_BeforeGame_FullCoinCase", "Your Coin Case is already full!"))
+                            IsReady = True
+                        End If
+                    Else
+                        Screen.TextBox.Show(Localization.GetString("VoltorbFlip_BeforeGame_NoCoinCase", "You don't have a Coin Case!~Come back when you have one!"))
+                        IsReady = True
+                    End If
                     CanContinue = False
                 Case "skinselection"
                     If Screens.MainMenu.NewNewGameScreen.CharacterSelectionScreen.SelectedSkin <> "" Then

lib/P3D.ContentPipeline/Content/Content.mgcb

@@ -88,6 +88,15 @@
 /processorParam:TextureFormat=Color
 /build:Fonts/BMP/Unown.png
 
+#begin Fonts/BMP/VoltorbFlipFont.png
+/importer:LocalizedFontTextureImporter
+/processor:LocalizedFontTextureProcessor
+/processorParam:DefaultCharacter= 
+/processorParam:FirstCharacter=
+/processorParam:PremultiplyAlpha=True
+/processorParam:TextureFormat=Color
+/build:Fonts/BMP/VoltorbFlipFont.png
+
 #begin Models/BattlePike/BattlePike.fbx
 /importer:FbxImporter
 /processor:ModelProcessor

lib/P3D.ContentPipeline/Content/Fonts/BMP/VoltorbFlipFont.txt

@@ -0,0 +1 @@
+ 0123456789

lib/P3D.ContentPipeline/P3D.ContentPipeline.csproj

@@ -86,6 +86,8 @@
     <Content Include="Content\Fonts\BMP\TextFont.png" />
     <Content Include="Content\Fonts\BMP\TextFont.txt" />
     <Content Include="Content\Fonts\BMP\Unown.png" />
+    <Content Include="Content\Fonts\BMP\VoltorbFlipFont.png" />
+    <Content Include="Content\Fonts\BMP\VoltorbFlipFont.txt" />
     <Content Include="Content\Models\BattlePike\BattlePike.png" />
     <Content Include="Content\Models\boat2\Boat.png" />
     <Content Include="Content\Models\boat\SSAqua.png" />