Fixed some battle animation errors and added content that I forgot, also corrected ViceGrip spelling
This commit is contained in:
JappaWakkaP3D
parent
9723820427
commit
c6625de6f9
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 537 B |
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.2 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 345 B |
Binary file not shown.
|
After Width: | Height: | Size: 509 B |
Binary file not shown.
|
After Width: | Height: | Size: 492 B |
Binary file not shown.
|
After Width: | Height: | Size: 372 B |
Binary file not shown.
|
After Width: | Height: | Size: 345 B |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.6 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 372 B |
Binary file not shown.
|
After Width: | Height: | Size: 202 B |
Binary file not shown.
|
Before Width: | Height: | Size: 159 B After Width: | Height: | Size: 227 B |
Binary file not shown.
|
Before Width: | Height: | Size: 153 B After Width: | Height: | Size: 234 B |
Binary file not shown.
|
Before Width: | Height: | Size: 153 B After Width: | Height: | Size: 241 B |
235
P3D/P3D.vbproj
235
P3D/P3D.vbproj
|
|
@ -14653,6 +14653,84 @@
|
|||
<Content Include="Content\Songs\wind.ogg">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Ember_Hit.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Ember_Start.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Fly_Hit.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Fly_Start.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\PoisonSting_Hit.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\PoisonSting_Start.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Pound.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Tackle.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Attacks\Thunderbolt.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\Effective.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\NotVeryEffective.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\SuperEffective.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Burned.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Confused.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Frozen.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Paralyzed.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Poisoned.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Stat_Lower.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\Stat_Raise.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Exp_Fill.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Pokeball\catch.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Pokeball\land.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Pokeball\open.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Pokeball\shake.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Pokeball\throw.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\buy.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Cries\722.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -15217,12 +15295,81 @@
|
|||
<Content Include="Content\Sounds\Cries\893.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\ElevatorEnd.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\enter.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\FieldMove_Cut.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\FieldMove_Flash.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\FieldMove_Fly.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\FieldMove_RockSmash.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\FieldMove_Strength.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Heal_Party.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\LogOn.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\TurnOff.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\TurnOn.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Receive_Egg.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Receive_Item.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Receive_PhoneNumber.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Use_Item.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Use_Repel.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\Ember.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\FireBall.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\Smoke.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Normal\Growl.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Normal\Pound.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Normal\Tackle.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Other\Star.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Poison\Bubble.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Poison\Stinger.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\chess.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -23824,60 +23971,18 @@
|
|||
<Content Include="Content\Sounds\badge_acquired.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\ballshake.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\normaldamage.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\not_effective.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Damage\super_effective.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_ember.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_fly.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_ice1.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_poison.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_pound.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_thunderbolt.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\Effects\effect_thundershock2.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\exp_max.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\pokeball_land.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\running.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\shiny.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Battle\throw.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\bump.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\buy2.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Contest\rankplace.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26062,9 +26167,6 @@
|
|||
<Content Include="Content\Sounds\itemfinder.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\item_found.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\jump_ledge.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26074,21 +26176,9 @@
|
|||
<Content Include="Content\Sounds\menu_open.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\pc_logon.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\pc_off.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PC\pc_turnon.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\pickup.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\PokeballOpen.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\pokeball_set.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26098,12 +26188,6 @@
|
|||
<Content Include="Content\Sounds\Pokegear\pokegear_on.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\pokemon_heal.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\repel_use.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\Save.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26113,9 +26197,6 @@
|
|||
<Content Include="Content\Sounds\shutter.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\single_heal.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\success.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26125,9 +26206,6 @@
|
|||
<Content Include="Content\Sounds\teleport.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\TossPokeball.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Sounds\trhq_alarm.wav">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26173,12 +26251,6 @@
|
|||
<Content Include="Content\Textures\Battle\Fighting\forcepalmparticle.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\EmberBall.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\Fire.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Fire\Hand.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -26188,12 +26260,6 @@
|
|||
<Content Include="Content\Textures\Battle\Other\YellowCloud.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Physical\Particle.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\Physical\Tackle.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Content Include="Content\Textures\Battle\StatChange\Heal.png">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
|
|
@ -27428,6 +27494,11 @@
|
|||
<Content Include="credits.txt">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
<Compile Include="Battle\BattleAnimations\BABillMove.vb" />
|
||||
<Compile Include="Battle\BattleAnimations\BABillOpacity.vb" />
|
||||
<Compile Include="Battle\BattleAnimations\BABillSize.vb" />
|
||||
<Compile Include="Battle\BattleAnimations\BASound.vb" />
|
||||
<Compile Include="Battle\BattleSystemV2\QueryObjects\AnimationQueryObject.vb" />
|
||||
<Compile Include="Pokemon\Abilities\Aerilate.vb" />
|
||||
<Compile Include="Pokemon\Abilities\PsychicSurge.vb" />
|
||||
<Compile Include="Pokemon\Abilities\MistySurge.vb" />
|
||||
|
|
@ -29735,7 +29806,7 @@
|
|||
<Compile Include="Pokemon\Attacks\Normal\TriAttack.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\TrumpCard.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\Uproar.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\ViseGrip.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\ViceGrip.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\WeatherBall.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\Whirlwind.vb" />
|
||||
<Compile Include="Pokemon\Attacks\Normal\Wish.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 ""
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
Namespace BattleSystem.Moves.Normal
|
||||
|
||||
Public Class ViseGrip
|
||||
Public Class ViceGrip
|
||||
|
||||
Inherits Attack
|
||||
|
||||
|
|
@ -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
|
|||
''' </summary>
|
||||
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
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue