From c6625de6f92056470ff5260930c7265214a39072 Mon Sep 17 00:00:00 2001 From: JappaWakkaP3D <66885565+JappaWakkaP3D@users.noreply.github.com> Date: Sun, 22 Aug 2021 16:47:26 +0200 Subject: [PATCH] Fixed some battle animation errors and added content that I forgot, also corrected ViceGrip spelling --- P3D/Battle/BattleSystemV2/Battle.vb | 2 +- P3D/Content/Textures/Battle/Cloud.png | Bin 1717 -> 537 bytes P3D/Content/Textures/Battle/Fire/Ember.png | Bin 0 -> 1077 bytes .../Textures/Battle/Fire/EmberBall.png | Bin 3300 -> 0 bytes P3D/Content/Textures/Battle/Fire/Fire.png | Bin 2707 -> 0 bytes P3D/Content/Textures/Battle/Fire/FireBall.png | Bin 0 -> 345 bytes P3D/Content/Textures/Battle/Fire/Smoke.png | Bin 0 -> 509 bytes P3D/Content/Textures/Battle/Normal/Growl.png | Bin 0 -> 492 bytes P3D/Content/Textures/Battle/Normal/Pound.png | Bin 0 -> 372 bytes P3D/Content/Textures/Battle/Normal/Tackle.png | Bin 0 -> 345 bytes .../Textures/Battle/Physical/Particle.png | Bin 2504 -> 0 bytes .../Textures/Battle/Physical/Tackle.png | Bin 8823 -> 0 bytes P3D/Content/Textures/Battle/Poison/Bubble.png | Bin 0 -> 372 bytes .../Textures/Battle/Poison/Stinger.png | Bin 0 -> 202 bytes .../Textures/Battle/StatChange/Heal.png | Bin 159 -> 227 bytes .../Textures/Battle/StatChange/statDown.png | Bin 153 -> 234 bytes .../Textures/Battle/StatChange/statUp.png | Bin 153 -> 241 bytes P3D/P3D.vbproj | 235 ++++++++++++------ P3D/Player/PlayerInventory.vb | 16 +- P3D/Pokemon/Attacks/Attack.vb | 32 ++- .../Normal/{ViseGrip.vb => ViceGrip.vb} | 2 +- P3D/Pokemon/Items/Item.vb | 20 +- 22 files changed, 205 insertions(+), 102 deletions(-) create mode 100644 P3D/Content/Textures/Battle/Fire/Ember.png delete mode 100644 P3D/Content/Textures/Battle/Fire/EmberBall.png delete mode 100644 P3D/Content/Textures/Battle/Fire/Fire.png create mode 100644 P3D/Content/Textures/Battle/Fire/FireBall.png create mode 100644 P3D/Content/Textures/Battle/Fire/Smoke.png create mode 100644 P3D/Content/Textures/Battle/Normal/Growl.png create mode 100644 P3D/Content/Textures/Battle/Normal/Pound.png create mode 100644 P3D/Content/Textures/Battle/Normal/Tackle.png delete mode 100644 P3D/Content/Textures/Battle/Physical/Particle.png delete mode 100644 P3D/Content/Textures/Battle/Physical/Tackle.png create mode 100644 P3D/Content/Textures/Battle/Poison/Bubble.png create mode 100644 P3D/Content/Textures/Battle/Poison/Stinger.png rename P3D/Pokemon/Attacks/Normal/{ViseGrip.vb => ViceGrip.vb} (98%) 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 2db03a2071511e0377cb91377272d793b8431c90..9082d7b83d4c3a64b4a97c5f397136962757dc81 100644 GIT binary patch delta 494 zcmVl{9lNe^08{T)j`}T!^h;Yv*7y(9rYXF4Ef2zZAoCK%imH@yQ zh2-@u7!;r`4ge~b2*U{BB!bb(8^Q@dh>T{l1ppw=Wd#uZd}p+RZza3|j8+IIQFX?* z3f?VfK7#@Xkx?8c0Yh-fn-zF^PH#U0b#YtSc?cOOjuR_HQCw&`eGI$+nu1Ly7^A9B zTMNpvBmj`|&;slQe>fet#J8-AHvs@ZX^k}f3~aXtfU`Wb+T=6?yl`xNH%4^|H-FhKz0N zx*e~sfDjp}Tz2k!_I#d87_DHlUN3-8nR!*u7cZ^U{41ndWB_~v0Qh*{Ii(xht|%_V z!mcUV0;u10a=j(A@PsytRe4f?nf!518>g(F&HSMO0 kh#gX;r9()Ke@sSzZ%li(&{$G4VgLXD07*qoM6N<$f~u+56aWAK delta 1681 zcmV;C25$M81hoy2BpLy8Qb$4nuFf3k00004XF*Lt006O%3;baPks%j<21-dpK~z{r zZI^kBUsDvvXH2(gnQ4vcbf#k{Em|#VZ!K+TqFO;LL2ZehS}LRog47kYNxx^iAc09NLO z78uL*4p^Pfgmd9)xDD=s2jHQww#|i;!FNvr-?wcp{hWuLg;mghPB4n=KH<9SM`Il* zU@h##_`@l1G299|Tul2@*d_2ZJPC_HQ8&RgaDCkS{=+aIjMmxw_b}{s(7<(91pLvk z5-4CK);ZU?A)W_|;U#!IcrADZY<~t6<9qTPyc|3Wi|F%4?CG!@tj>Mc{QIM!mInvM%EVWVAHjzODenESwkcE*M(Rh?L`@kG{1Pq-Hbo^cLeXtB{SI8GoiYUco zloVnlP1rl(L~yD1Dg}(8!30sE8SNh&xek}ZkAc^UF%pXKol=B0BV)VQwi^kP^a;2G zjP@#(037#!=Vk*q1gvzWfFIyz_$BO5(Pk97Pe-C-+a$#q38&P&G79=~8tN2a0&W3E z!F6DvaoPE2BcRh2fg+4VITaa&#QUVo6_eC{Ene1{4WV8E!?~D-Jp*e3T1bq5p>vcv zGy)3HmQl!DNM~B_lkNh{EhB8XwkkH61MXOEI95J?m*4ZCQvalbjDpTf0p>yqD6uWu zdy0S&w$QmZv?;*d%H7U-Zg`xhT!KbGXGTHC;&nPtGAXr*_eMkknTQ#I3&Gv9T>|sNv;Hii1!M}MAYWB?d3BC<5+yak*_1h|z z0_@CxPD=qPBFX#mng4Sd6j0Ry^2~k34bCYa$Ng#w@Zg{#Yjx&;p~@&Y3P)qdSrc+P za!N8nzLP=~;Q*WhBVc0Nx7)TpUHVlLdhj?E+yib0qhKjs3eH$y{*& z3RudBJx^Q;d%^lJB$Mz2I3HB!rjciWEXj6%l#a6~t)RnSCE8L%iWG%74Nj^1fk|$; zSHNg!u?~3rvND+mSHd0OiN+nwoy=)ip3VxVzX!j?eTqmjGXCG?_X5o4U5{xVay@&r z7=dkIcksk=IXDdqdC_n=4bG#T{{fZ5AO-X!BAq*RhTrUWYCWFK0`~$>U(E`z5V<6O zW`KF%LG%6);1n#2&i{fxp(hb3psbdL-}!g>SzYJxj-&U~yb0C=aFv9f*{#ddKy~JU zhe@ZvxihnM@^_$+?$M}FL_ zU9+wLld2T(4=AD(k|@L|DBAxzg_hobo591*6#5;mbLcM$@N2~biIFflEX!`0t^!wp z%g>H=CQgIolt>EEx$o=Tk-Pufmz$5v-AE6C0XXl6tye%Bj08WOoCb5jL&LqiWE9L| zM`S`7QulTfOY3H1l4illV&g}P$?W;!EI1gsY+D68dTG z(cDk7CTugd75tM^V)uSN_Mjb};QQ3|#YrX)^+zK^4I& b=xqEK4p|7@{PUZr00000NkvXXu0mjfbvG&L diff --git a/P3D/Content/Textures/Battle/Fire/Ember.png b/P3D/Content/Textures/Battle/Fire/Ember.png new file mode 100644 index 0000000000000000000000000000000000000000..3ca6e2e663d780268f9a43a2fe58b4df623ff58a GIT binary patch literal 1077 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 N002ovPDHLkV1gR+B}D)L diff --git a/P3D/Content/Textures/Battle/Fire/FireBall.png b/P3D/Content/Textures/Battle/Fire/FireBall.png new file mode 100644 index 0000000000000000000000000000000000000000..3348c1ad145a7e0cefc8de324653668f52cc1cf4 GIT binary patch literal 345 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?3oArNM~bhqvgP*A$W zHKHUqKdq!Zu_%?nIW?!avREOwq%KLJT>t)=c@6Un-k%&RdRE52Xm78R zz2~%Mc5H8;L-{MSEta|LU3w0DsfN;qd>%}SUleyAEaZO4cxer1|LXz5tHsIkT4IZ8*Y*5^Hy%mOZo6uK=w$NF1bH5Y n`!PFznTG(KwV+`?s}19|=raeO{#tnv=wAj;S3j3^P6pF8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT0004q zNklyXMi003GE zWIWvg06c@{k3@+AZ2b`w~bb-MJzxof%}I$jK_=fJ75RT zu8gP1GJ)0Vos@xgCYJNS#4LvEI(xhHqaz4{D+2&o_6f1Yn;>cc{|{jAJYzEm&fwoZ zl8XVB^T1q>!gVB5>XT?PG=~s2k}HYgB#8{AJ}IZ7U57fc9Z+Wj1ZQxZHXOH&ax`l# z&N_;d07X%lr^OfB1?t+($(%wkNZucY=NvRYXPCu#>2F4ZYsTo z(PU_ZQcy|*0F=^4i=Tq1Er@FAKoi9cppNwcBw$|9CDMD200000NkvXXu0mjfI-kxW literal 0 HcmV?d00001 diff --git a/P3D/Content/Textures/Battle/Normal/Growl.png b/P3D/Content/Textures/Battle/Normal/Growl.png new file mode 100644 index 0000000000000000000000000000000000000000..1f5ff9cbbbf701294542324aaecea406a7a12b8b GIT binary patch literal 492 zcmVYAX9X8WNB|8RBvx=!KdMT0004Z zNklDZ~;dr$x@n> z<4#%N64`l}$c`KVAiVO34sd`2-Ug7rcaT2U@pXX10@CtF4bXyBfP7dyg0u)NSO?h7 zpMcG;8lVA>0?6Arl;>$EpE&HG{N2M|^YKDRr|NxC-bxC;|98 z2dKr1fc*8*mme>&JC}}^SjLpsxOjZM>_;^M)G$7-ovtCYO+V;#y??e%p#DB;B+LM5 z*jaGfu-PC!ge(B1nHXD{ka&PK_YJ8x4gmeKA+x0n7&8B(QTg*~XkG!0@#6yqyfesv ziC#kdozMXeaDW3G-~b0W;9mhYAX9X8WNB|8RBvx=!KdMT00030 zNklCbPsZx`?EcX;5ZBECc}j zn=~oYRUBi?O~?mFmTpB6fTy4xf57JQ4C2QqzJh#M0kv201MsfW1?V-oDghpUE07A1 z+6!JtX#<*W!j`M=ehixdEC~0%Vh=*ow3u2mj);$srDZcWr{71`)1s~39lrs>TI$gA S#}70B0000i?$biT7 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 YK6U0R?UyNIw3Le*(!G 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 J)#9ch{{xC!G0y-1 diff --git a/P3D/Content/Textures/Battle/Poison/Bubble.png b/P3D/Content/Textures/Battle/Poison/Bubble.png new file mode 100644 index 0000000000000000000000000000000000000000..5d45ad64df28e72f33b40a89d48e972860d3cf0c GIT binary patch literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^3P7B|!3HF2lnQ15Db50q$YKTtZXpn6ymYtj4^U9L z#5JNMI6tkVJh3R1!8tXjxUyIwxTG{CGhZPjKR@T-@`p7*W&b^0978hhy}fS8*Q_AY z@bLJv7cWkncou4tbi6O7_3TAugIyOFZseSL?1RuoHGAdG%K6MK_m@n0aw-+584B)* z3HY3_lewHRi?N9_vw}yc_RpKOb)kx@7;hH{o@BTdJu`Kk+X{xeSKfYOG-1x+P}jSC znP>ld!zXGiP!j~ymbPbJHYi*@`A1LWj10lhhPUT`ue?8X;anMprCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRLOop^Lo80eopg}vfB}c| zZ2KPb|3?27TKj6eo^e5T_GFKmB!QWhWi8A2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzR@;qG}Lo808oxEGnA%KD9 zyOPsPvzA>KnkIB{Y+b;;&@4_(#mcbJ(C)D4hT>xRo6q{bXgTbCb7&VI$EM5rj9-<^ zFS<4~-BAnhEqIc|9H2khd8z~3lrtqqdK|17ncq0qUOTv0^3UR9x4r-T^GV;rRCG4= Vp$hkrmq42tJYD@<);T3K0RSISQc3^- literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK@(3G#}JL+WCu33|C0Zj4W@K+B}|GCUFdzt yAkI_b*!l2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRN{eF z;xe{BCQtsHulr}M{FBXR%AfP|{?{n*TCDgn|L#A#O13|9G=9!kRBmicJjTRUv(CZr z!E(jt^=&MSY;4SYY;4^eY;0|89CjO<8Xq3wXKQ1Xm$<+@b(h|PED4@T8B0u5`D)UX bfG*#;I_=@zsAHFa4q)(f^>bP0l+XkK9*|Le literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK|N0w#}JL+WCyl>Nr`{W22;AZ5++56F7!TR t5a%hOwuWK8W`d{00c}p^8IyQ;7%qPD4vgcD{tVQ~;OXk;vd$@?2>@eaC+7eF diff --git a/P3D/Content/Textures/Battle/StatChange/statUp.png b/P3D/Content/Textures/Battle/StatChange/statUp.png index 0eabe3c224d439a8b4b08b59ea42bf7623bb6f71..5b4326ff03cc65211babc811b91090390e76dc75 100644 GIT binary patch literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GGLLkg|>2BR0prCY# zYeY$Kep*R+Vo@rCb81d;WwAnVNoh)EzCuWTe$K(=4{LzRYCK&WLo7}w|M~ylo>{eF z;xe`hvv+^?@4Yv7Vh*#B`Mp2(cjIdrcrAW>dR|{$SoVqM#GQ)I^^MI;hg+EWB|hwA zI?8bV*xdi3JR%ZGIwBG(77`L7KrHtsA)(@9b7SJsPIexCJ(~mv{*YI@8dfD5SS*_O hXo|&$nVk|03{x&-KkSj$`T=wYgQu&X%Q~loCIHB3R@49h literal 153 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK|N0w#}JL+WCu3E&Hw+iCu)d`9#Gk+ZDIx#> 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