Added battle frontier shop with power items, QA pending. Fixed daycare texts and costs and other miscellaneous fixes.

This commit is contained in:
CaptainSegis 2017-01-04 08:23:43 -05:00
parent f54de70dd4
commit d73acbe056
17 changed files with 15 additions and 12 deletions

View File

@ -11,7 +11,7 @@ Namespace Items.Standard
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False
Public Sub New() Public Sub New()
_textureRectangle = New Rectangle(240, 384, 24, 24) _textureRectangle = New Rectangle(240, 288, 24, 24)
End Sub End Sub
End Class End Class

View File

@ -11,7 +11,7 @@ Namespace Items.Standard
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False
Public Sub New() Public Sub New()
_textureRectangle = New Rectangle(216, 384, 24, 24) _textureRectangle = New Rectangle(216, 288, 24, 24)
End Sub End Sub
End Class End Class

View File

@ -11,7 +11,7 @@ Namespace Items.Standard
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False
Public Sub New() Public Sub New()
_textureRectangle = New Rectangle(168, 384, 24, 24) _textureRectangle = New Rectangle(168, 288, 24, 24)
End Sub End Sub
End Class End Class

View File

@ -11,7 +11,7 @@ Namespace Items.Standard
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False
Public Sub New() Public Sub New()
_textureRectangle = New Rectangle(144, 384, 24, 24) _textureRectangle = New Rectangle(144, 288, 24, 24)
End Sub End Sub
End Class End Class

View File

@ -11,7 +11,7 @@ Namespace Items.Standard
Public Overrides ReadOnly Property CanBeUsed As Boolean = False Public Overrides ReadOnly Property CanBeUsed As Boolean = False
Public Sub New() Public Sub New()
_textureRectangle = New Rectangle(192, 384, 24, 24) _textureRectangle = New Rectangle(192, 288, 24, 24)
End Sub End Sub
End Class End Class

View File

@ -6,8 +6,8 @@
Shared _valid As Boolean = False Shared _valid As Boolean = False
Const RUNVALIDATION As Boolean = False Const RUNVALIDATION As Boolean = False
Const EXPECTEDSIZE As Integer = 42289870 Const EXPECTEDSIZE As Integer = 42302116
Const METAHASH As String = "OTEzQTRBRURFMjU2RkUyNDgxRjU0MEJDODMwMjk3Mzc=" Const METAHASH As String = "RThCNzQxMTA2MUIxNzlBQzdFMDNCNEM5N0IwNDIwQzk="
Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean Public Shared ReadOnly Property IsValid(ByVal ForceResult As Boolean) As Boolean
Get Get

View File

@ -24,14 +24,14 @@
CanContinue = False CanContinue = False
Case "trade" Case "trade"
Dim storeData As String = CStr(argument.GetSplit(0)) Dim storeData As String = CStr(argument.GetSplit(0)) 'e.g. Item ID
Dim canBuy As Boolean = CBool(argument.GetSplit(1)) Dim canBuy As Boolean = CBool(argument.GetSplit(1)) '
Dim canSell As Boolean = CBool(argument.GetSplit(2)) Dim canSell As Boolean = CBool(argument.GetSplit(2)) '
Dim currencyIndicator As String = "P" Dim currencyIndicator As String = "P"
If argument.CountSplits() > 3 Then If argument.CountSplits() > 3 Then
currencyIndicator = argument.GetSplit(3) currencyIndicator = argument.GetSplit(3) 'p for pokedollars, bp for battle points
End If End If
Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New TradeScreen(Core.CurrentScreen, storeData, canBuy, canSell, currencyIndicator), Color.Black, False)) Core.SetScreen(New TransitionScreen(Core.CurrentScreen, New TradeScreen(Core.CurrentScreen, storeData, canBuy, canSell, currencyIndicator), Color.Black, False))

View File

@ -49698,6 +49698,9 @@
#begin Scripts/frontier/frontier_cameraintro.dat #begin Scripts/frontier/frontier_cameraintro.dat
/copy:Scripts/frontier/frontier_cameraintro.dat /copy:Scripts/frontier/frontier_cameraintro.dat
#begin Scripts/frontier/frontier_shop.dat
/copy:Scripts/frontier/frontier_shop.dat
#begin Scripts/frontier/intro.dat #begin Scripts/frontier/intro.dat
/copy:Scripts/frontier/intro.dat /copy:Scripts/frontier/intro.dat

File diff suppressed because one or more lines are too long