diff --git a/P3D/Battle/BattleSystemV2/Battle.vb b/P3D/Battle/BattleSystemV2/Battle.vb
index 6a0fac397..79973e1f5 100644
--- a/P3D/Battle/BattleSystemV2/Battle.vb
+++ b/P3D/Battle/BattleSystemV2/Battle.vb
@@ -1720,7 +1720,7 @@
If op.Ability.Name.ToLower() = "flash fire" AndAlso moveUsed.GetAttackType(own, BattleScreen).Type = Element.Types.Fire AndAlso moveWorks = True Then
If BattleScreen.FieldEffects.CanUseAbility(Not own, BattleScreen) = True Then
moveWorks = False
- ChangeCameraAngel(2, own, BattleScreen)
+ ChangeCameraAngle(2, own, BattleScreen)
BattleScreen.BattleQuery.Add(New TextQueryObject(op.GetDisplayName() & "'s Flash Fire made " & moveUsed.Name & " useless!"))
If own = True Then
BattleScreen.FieldEffects.OppFlashFire = 1
diff --git a/P3D/Content/Textures/Battle/Cloud.png b/P3D/Content/Textures/Battle/Cloud.png
index 2db03a207..9082d7b83 100644
Binary files a/P3D/Content/Textures/Battle/Cloud.png and b/P3D/Content/Textures/Battle/Cloud.png differ
diff --git a/P3D/Content/Textures/Battle/Fire/Ember.png b/P3D/Content/Textures/Battle/Fire/Ember.png
new file mode 100644
index 000000000..3ca6e2e66
Binary files /dev/null and b/P3D/Content/Textures/Battle/Fire/Ember.png differ
diff --git a/P3D/Content/Textures/Battle/Fire/EmberBall.png b/P3D/Content/Textures/Battle/Fire/EmberBall.png
deleted file mode 100644
index db7c3519b..000000000
Binary files a/P3D/Content/Textures/Battle/Fire/EmberBall.png and /dev/null differ
diff --git a/P3D/Content/Textures/Battle/Fire/Fire.png b/P3D/Content/Textures/Battle/Fire/Fire.png
deleted file mode 100644
index 3aad7c791..000000000
Binary files a/P3D/Content/Textures/Battle/Fire/Fire.png and /dev/null differ
diff --git a/P3D/Content/Textures/Battle/Fire/FireBall.png b/P3D/Content/Textures/Battle/Fire/FireBall.png
new file mode 100644
index 000000000..3348c1ad1
Binary files /dev/null and b/P3D/Content/Textures/Battle/Fire/FireBall.png differ
diff --git a/P3D/Content/Textures/Battle/Fire/Smoke.png b/P3D/Content/Textures/Battle/Fire/Smoke.png
new file mode 100644
index 000000000..a0f250213
Binary files /dev/null and b/P3D/Content/Textures/Battle/Fire/Smoke.png differ
diff --git a/P3D/Content/Textures/Battle/Normal/Growl.png b/P3D/Content/Textures/Battle/Normal/Growl.png
new file mode 100644
index 000000000..1f5ff9cbb
Binary files /dev/null and b/P3D/Content/Textures/Battle/Normal/Growl.png differ
diff --git a/P3D/Content/Textures/Battle/Normal/Pound.png b/P3D/Content/Textures/Battle/Normal/Pound.png
new file mode 100644
index 000000000..4fa4fb0cc
Binary files /dev/null and b/P3D/Content/Textures/Battle/Normal/Pound.png differ
diff --git a/P3D/Content/Textures/Battle/Normal/Tackle.png b/P3D/Content/Textures/Battle/Normal/Tackle.png
new file mode 100644
index 000000000..d05b75c2a
Binary files /dev/null and b/P3D/Content/Textures/Battle/Normal/Tackle.png differ
diff --git a/P3D/Content/Textures/Battle/Physical/Particle.png b/P3D/Content/Textures/Battle/Physical/Particle.png
deleted file mode 100644
index 826e8443f..000000000
Binary files a/P3D/Content/Textures/Battle/Physical/Particle.png and /dev/null differ
diff --git a/P3D/Content/Textures/Battle/Physical/Tackle.png b/P3D/Content/Textures/Battle/Physical/Tackle.png
deleted file mode 100644
index e767056e9..000000000
Binary files a/P3D/Content/Textures/Battle/Physical/Tackle.png and /dev/null differ
diff --git a/P3D/Content/Textures/Battle/Poison/Bubble.png b/P3D/Content/Textures/Battle/Poison/Bubble.png
new file mode 100644
index 000000000..5d45ad64d
Binary files /dev/null and b/P3D/Content/Textures/Battle/Poison/Bubble.png differ
diff --git a/P3D/Content/Textures/Battle/Poison/Stinger.png b/P3D/Content/Textures/Battle/Poison/Stinger.png
new file mode 100644
index 000000000..68fa6e649
Binary files /dev/null and b/P3D/Content/Textures/Battle/Poison/Stinger.png differ
diff --git a/P3D/Content/Textures/Battle/StatChange/Heal.png b/P3D/Content/Textures/Battle/StatChange/Heal.png
index 2c6d07aac..d9c516217 100644
Binary files a/P3D/Content/Textures/Battle/StatChange/Heal.png and b/P3D/Content/Textures/Battle/StatChange/Heal.png differ
diff --git a/P3D/Content/Textures/Battle/StatChange/statDown.png b/P3D/Content/Textures/Battle/StatChange/statDown.png
index 19a28fc43..44e7ba040 100644
Binary files a/P3D/Content/Textures/Battle/StatChange/statDown.png and b/P3D/Content/Textures/Battle/StatChange/statDown.png differ
diff --git a/P3D/Content/Textures/Battle/StatChange/statUp.png b/P3D/Content/Textures/Battle/StatChange/statUp.png
index 0eabe3c22..5b4326ff0 100644
Binary files a/P3D/Content/Textures/Battle/StatChange/statUp.png and b/P3D/Content/Textures/Battle/StatChange/statUp.png differ
diff --git a/P3D/P3D.vbproj b/P3D/P3D.vbproj
index 1eeee953a..fb02c9f9d 100644
--- a/P3D/P3D.vbproj
+++ b/P3D/P3D.vbproj
@@ -14653,6 +14653,84 @@
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -15217,12 +15295,81 @@
PreserveNewest
+
+ PreserveNewest
+
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
+
+ PreserveNewest
+
+
+ PreserveNewest
+
PreserveNewest
@@ -23824,60 +23971,18 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -26062,9 +26167,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -26074,21 +26176,9 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -26098,12 +26188,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -26113,9 +26197,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -26125,9 +26206,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest
@@ -26173,12 +26251,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -26188,12 +26260,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -27428,6 +27494,11 @@
PreserveNewest
+
+
+
+
+
@@ -29735,7 +29806,7 @@
-
+
diff --git a/P3D/Player/PlayerInventory.vb b/P3D/Player/PlayerInventory.vb
index e7d20f7bb..fcd5ba673 100644
--- a/P3D/Player/PlayerInventory.vb
+++ b/P3D/Player/PlayerInventory.vb
@@ -44,21 +44,21 @@ Public Class PlayerInventory
Public Function GetItemPocketChar(ByVal Item As Item) As String
Select Case Item.ItemType
Case Items.ItemTypes.Standard
- Return StringHelper.GetChar(128)
+ Return "€"
Case Items.ItemTypes.BattleItems
- Return StringHelper.GetChar(135)
+ Return "↔"
Case Items.ItemTypes.KeyItems
- Return StringHelper.GetChar(129)
+ Return "№"
Case Items.ItemTypes.Machines
- Return StringHelper.GetChar(130)
+ Return "™"
Case Items.ItemTypes.Mail
- Return StringHelper.GetChar(131)
+ Return "←"
Case Items.ItemTypes.Medicine
- Return StringHelper.GetChar(132)
+ Return "↑"
Case Items.ItemTypes.Plants
- Return StringHelper.GetChar(133)
+ Return "→"
Case Items.ItemTypes.Pokéballs
- Return StringHelper.GetChar(134)
+ Return "↓"
End Select
Return ""
diff --git a/P3D/Pokemon/Attacks/Attack.vb b/P3D/Pokemon/Attacks/Attack.vb
index 5934a7e5b..69b10c8bd 100644
--- a/P3D/Pokemon/Attacks/Attack.vb
+++ b/P3D/Pokemon/Attacks/Attack.vb
@@ -265,7 +265,7 @@
Case 10
returnMove = New Moves.Normal.Scratch()
Case 11
- returnMove = New Moves.Normal.ViseGrip()
+ returnMove = New Moves.Normal.ViceGrip()
Case 12
returnMove = New Moves.Normal.Guillotine()
Case 13
@@ -1844,8 +1844,8 @@
'returnMove = New Moves.Fighting.MeteorAssault()
'Case 795
'returnMove = New Moves.Dragon.Eternabeam()
- Case 796
- returnMove = New Moves.Steel.SteelBeam()
+ 'Case 796
+ 'returnMove = New Moves.Steel.SteelBeam()
'Case 797
'Blank
Case 999
@@ -2163,23 +2163,37 @@
#Region "Animation"
- Public Sub UserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen)
+ Public Sub UserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean)
If Core.Player.ShowBattleAnimations = 1 Then
- Me.InternalUserPokemonMoveAnimation(BattleScreen)
+ Dim CurrentPokemon As Pokemon = BattleScreen.OwnPokemon
+ Dim CurrentEntity As NPC = BattleScreen.OwnPokemonNPC
+ Dim CurrentModel As ModelEntity = BattleScreen.OwnPokemonModel
+ If own = False Then
+ CurrentEntity = BattleScreen.OppPokemonNPC
+ CurrentModel = BattleScreen.OppPokemonModel
+ End If
+ Me.InternalUserPokemonMoveAnimation(BattleScreen, own, CurrentPokemon, CurrentEntity, CurrentModel)
End If
End Sub
- Public Overridable Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen)
+ Public Overridable Sub InternalUserPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
'Override this method in the attack class to insert the move animation query objects into the queue.
End Sub
- Public Sub OpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen)
+ Public Sub OpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean)
If Core.Player.ShowBattleAnimations = 1 Then
- Me.InternalOpponentPokemonMoveAnimation(BattleScreen)
+ Dim CurrentPokemon As Pokemon = BattleScreen.OppPokemon
+ Dim CurrentEntity As NPC = BattleScreen.OppPokemonNPC
+ Dim CurrentModel As ModelEntity = BattleScreen.OppPokemonModel
+ If own = False Then
+ CurrentEntity = BattleScreen.OwnPokemonNPC
+ CurrentModel = BattleScreen.OwnPokemonModel
+ End If
+ Me.InternalOpponentPokemonMoveAnimation(BattleScreen, own, CurrentPokemon, CurrentEntity, CurrentModel)
End If
End Sub
- Public Overridable Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen)
+ Public Overridable Sub InternalOpponentPokemonMoveAnimation(ByVal BattleScreen As BattleScreen, ByVal own As Boolean, ByVal CurrentPokemon As Pokemon, ByVal CurrentEntity As NPC, ByVal CurrentModel As ModelEntity)
'Override this method in the attack class to insert the move animation query objects into the queue.
End Sub
diff --git a/P3D/Pokemon/Attacks/Normal/ViseGrip.vb b/P3D/Pokemon/Attacks/Normal/ViceGrip.vb
similarity index 98%
rename from P3D/Pokemon/Attacks/Normal/ViseGrip.vb
rename to P3D/Pokemon/Attacks/Normal/ViceGrip.vb
index 322b2e7b9..35d58b05a 100644
--- a/P3D/Pokemon/Attacks/Normal/ViseGrip.vb
+++ b/P3D/Pokemon/Attacks/Normal/ViceGrip.vb
@@ -1,6 +1,6 @@
Namespace BattleSystem.Moves.Normal
- Public Class ViseGrip
+ Public Class ViceGrip
Inherits Attack
diff --git a/P3D/Pokemon/Items/Item.vb b/P3D/Pokemon/Items/Item.vb
index 441aa05d4..b62f3fc13 100644
--- a/P3D/Pokemon/Items/Item.vb
+++ b/P3D/Pokemon/Items/Item.vb
@@ -9,6 +9,20 @@ Public MustInherit Class Item
Protected _textureRectangle As Rectangle
Private _texture As Texture2D
+ Public ReadOnly Property TextureSource As String
+ Get
+ Return _textureSource & "," & _textureRectangle.X & "," & _textureRectangle.Y & "," & _textureRectangle.Width & "," & _textureRectangle.Height
+ End Get
+ End Property
+
+ Public Function GetDescription() As String
+ If Localization.TokenExists("item_desc_" & GetAttribute().Id) = True Then
+ Return Localization.GetString("item_desc_" & GetAttribute().Id)
+ Else
+ Return Me.Description
+ End If
+ End Function
+
Private _attribute As ItemAttribute
Private Function GetAttribute() As ItemAttribute
@@ -24,7 +38,11 @@ Public MustInherit Class Item
'''
Public Overridable ReadOnly Property Name As String
Get
- Return GetAttribute().Name
+ If Localization.TokenExists("item_name_" & GetAttribute().Id) = True Then
+ Return Localization.GetString("item_name_" & GetAttribute().Id)
+ Else
+ Return GetAttribute().Name
+ End If
End Get
End Property