From a9270af983f154dad69c022e650089a01e7ac5cf Mon Sep 17 00:00:00 2001 From: RuiAlonso Date: Mon, 2 May 2022 16:52:38 +0200 Subject: [PATCH] refactor: removed all default ball, use dash --- lib/game/game_assets.dart | 9 ++++--- .../assets/images/ball/ball.png | Bin 3190 -> 0 bytes .../lib/src/components/ball.dart | 4 +--- .../lib/stories/ball/ball_booster_game.dart | 1 - .../lib/stories/ball/basic_ball_game.dart | 1 - .../test/src/components/ball_test.dart | 22 ------------------ .../chrome_dino_chomping_behavior_test.dart | 3 ++- .../chrome_dino_spitting_behavior_test.dart | 3 ++- .../test/src/components/flipper_test.dart | 3 ++- .../game/components/controlled_ball_test.dart | 3 ++- .../flutter_forest_bonus_behavior_test.dart | 2 +- test/game/pinball_game_test.dart | 1 - 12 files changed, 14 insertions(+), 38 deletions(-) delete mode 100644 packages/pinball_components/assets/images/ball/ball.png diff --git a/lib/game/game_assets.dart b/lib/game/game_assets.dart index 642b6e14..d26c452b 100644 --- a/lib/game/game_assets.dart +++ b/lib/game/game_assets.dart @@ -14,11 +14,6 @@ extension PinballGameAssetsX on PinballGame { return [ images.load(components.Assets.images.boardBackground.keyName), - images.load(components.Assets.images.ball.ball.keyName), - images.load(androidTheme.ball.keyName), - images.load(dashTheme.ball.keyName), - images.load(dinoTheme.ball.keyName), - images.load(sparkyTheme.ball.keyName), images.load(components.Assets.images.ball.flameEffect.keyName), images.load(components.Assets.images.signpost.inactive.keyName), images.load(components.Assets.images.signpost.active1.keyName), @@ -136,6 +131,10 @@ extension PinballGameAssetsX on PinballGame { images.load(sparkyTheme.leaderboardIcon.keyName), images.load(androidTheme.leaderboardIcon.keyName), images.load(dinoTheme.leaderboardIcon.keyName), + images.load(androidTheme.ball.keyName), + images.load(dashTheme.ball.keyName), + images.load(dinoTheme.ball.keyName), + images.load(sparkyTheme.ball.keyName), images.load(Assets.images.components.background.path), ]; } diff --git a/packages/pinball_components/assets/images/ball/ball.png b/packages/pinball_components/assets/images/ball/ball.png deleted file mode 100644 index 43332c9aba015855ea7d77252cd9b3c6ca339e38..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3190 zcmW+(30P9u`^KfjG^KQkCO5Ja3b)b`70pmeaY^})8RR;Iism+GiF-Ip=)meZTiR-@WGNdur#7A9sL2 zpq-u`?s#Cd`rg3Xfu3r9>oG8BCU_92Adr^c_of13l|exuZMdiViJzlB%@Dov&l8AS z{SGUe`KPeh{~jK0s5xB!n2D_Eh#_+K4mmoSy>^7FO! zem*bfAU3VqEt4@UI>bdASVyT7^r8p-uPxR zdudCl*c$X1Q9k{xblHs#0nzcV;hgQHH{peM%H$ZZzXzfXk2}oK2Q6i2oCd@4!duII zW%w>>sP6LwJ8+KH2}sZ)I=^TNTf7o&i6#m2>Ly%ZQ{ZOkBrRifRR3&>9)MB@6#bMc)^ zMIm)7V_1Kbe9a)yz_gfDNhv@I!=T%tBtP5<#5NoPDa;u|B^YQh$uO{LYpvFE>o7?( zo6+m!^Bjcymux3^>Om z8^42AG4`9KN-q=)v(|p-0wHNP$C`pwlN=2jC9x?Lf@<+()<=GZq6IMJ+F9Lu(O(;M zWVBBsOM{`x*G2p7`MzL+VbRGX5=rghJ8(e21NaVLGSbS5WDRx2X^L%k<-yXWSI1D+ z+G?Qac`|{G^zyF$KX-rieg~wG&7TVm3J%`1fw`mac>i<-@`aik-$XnT-?h0s7u@#i zmr^0`Ldi+fU*|qK7YaycnOCf}V=T`xw~6EF;=Wfoebi zOholI)AK;=QddbdsP1TQUw>F3b9g>FAKXv-_GZLFxFc@3ed%1?vxV1IWWxB@xj7P* zsz+dU%h7(g2aFsF3vjh|x+ghU{RBuPk1lp9R+BV`v&`U}`-~o2AHWG7GA2=ws0~vG zAPk4je*XM92KPr)eEeK6hmjIJPlq&r2YqR2sqPESs8~Sy*p+4MdGk*m5}5nye9pTl zI#TEgR)MJ())N^Fyv3s40bjAcc=G!LQ0}=KRjh_X@Q`YtRlaWTZD*)Z^~H zM2_0_r#1}7g%UzTm4{^;LHgK~)p^*soHo;R&=ZKfN(Rc&5n~{@?OW|3)(1Gr3kSAB z9MXQCO<{pR{SG$|b|;{KD1^P{sl(J6cz|d>Tw+2(wh8#{+)B9Q|D$DVJq5i5_q_Qo zGRNLW91869-UJ-tb(5}r)y=@bAe*WqNOT3C(8nh0Xk>G_Pg`29qKW~GUi0V>%&A>W za`#GxAI`?8}0*q0Mytg|YV8KNHKmevHz4#^88OruqFJ54;J3R5p0 zE8BB4rioYw!ThT^8ev=tpbhRS@zz_-V~x2O$=+F{Y6Tnd2I`v>X!BB0xQtkd0hb^GgMoihl`_m2^W zg*?;Y1LCo#KR0~%+Qq=*ul6;^0@@YwrgrIo9LseK1b?L6E)B1p9?*HW?Qc2y-{#;J zvA}mv!-os!M6HV`gI|BTJFJIctiPzDu-``m>iM^Mr;xYUn5(td@}JGM>nsXuBFWK& z9_Dh7WF#7;8MP0`8IpHaP%8`#4TqgnjIvoG*}a5*S)boJza*qC@KRcHtQ%NG$a_1z z6mlCtIH@BTU=ilt`4b^12t8_@@rCA6#Gbe%7|KNomlx2+_SKn^=6BIeQ~Lr=x#O<+ zR_C6nS^C%qg{eO|qm|nYqC?(99Q%(}oY|H2In$?KkofEt`9n8pq=sAYx9zY)`6WZa zi53aAMdIv#yMXOlH<&ATDsAej5`9r{@ROS!4TGFr$?_L-V1nO&jA9xW#8 zMy!gVeHbvmqeEfuub;8;LZyuA(v_v$GOlpCH2cH^Tx(nXFruN7;rQ;km4yXNByYcS zq(GIzVsp7elJ=3d+UwTZ(_GrehHRTWq|o=mkHts$tiA~2?}bA>fmL-c$+2A2R-1MW&C_#b%}h;B*tTs|QYLTjNbbtq6Hshb4;^TslHKP~w(acc(CU`$eO*g)QO^Z)2OA%TwlC9h$ z2mY~umcr;aE_Q61k>13m28%hG?8y&iZ^uU$BON#Gx+DfKI1IROVSaYFqwAP~j&j*k zk-CgHcBq6s;l|O|%^7hdy%BFv{`OG2u+XWAS98AZ(w9FmhynjzHJLynjom$W?p&4` zJ!RSA+qazsA1*AHBZU{!rOI%zty8tJhplb`@sZDbUpH}3wY+>$Rz|fc_nk{$9lhFB z-`Tk-t8NfBxCCY6xqyU>vHpvE87I9-=l+pG1tMRiYM%sJ|^XCI|fr9jtZ zb>xVKhK90|kveK_nhfC~B`%JR>wy@LDAqU@R9q3o8u66}=UzAywsWf$bqy&z`Q5|R zmD%CCmx<}Re+tvglB0WcB{RzoDXV$KpUX;tDz-by zc3m-=uv&WS)qheE?yB_q)xYTY=#JVn&fxUsVoy&`X}Ywl7b=I6wsROZy-~S`@rXl} zjNc&#u8pnsC!jV4fSbGnDKzpxT%Qw;rD4Fwv>(b){XYnKOann%m}I$N47Jxs{PpL6 ztgSrTMpElRfAO Q;70=FiS>1_#f0Vj56Hwch5!Hn diff --git a/packages/pinball_components/lib/src/components/ball.dart b/packages/pinball_components/lib/src/components/ball.dart index ccab4332..6c4d0815 100644 --- a/packages/pinball_components/lib/src/components/ball.dart +++ b/packages/pinball_components/lib/src/components/ball.dart @@ -131,9 +131,7 @@ class _BallSpriteComponent extends SpriteComponent with HasGameRef { gameRef.images.fromCache(spriteAsset ?? Assets.images.ball.ball.keyName), ); this.sprite = sprite; - // TODO(ruimiguel): temp fix cause final assets are bigger than default one. - final spriteScaleSize = (spriteAsset != null) ? 12.5 : 10.0; - size = sprite.originalSize / spriteScaleSize; + size = sprite.originalSize / 12.5; } } diff --git a/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart index 259a9b41..eef7b1b6 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/ball_booster_game.dart @@ -7,7 +7,6 @@ class BallBoosterGame extends LineGame { BallBoosterGame() : super( imagesFileNames: [ - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName, diff --git a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart index a997fb31..78c0c331 100644 --- a/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart +++ b/packages/pinball_components/sandbox/lib/stories/ball/basic_ball_game.dart @@ -11,7 +11,6 @@ class BallGame extends AssetsGame with TapDetector, Traceable { List? imagesFileNames, }) : super( imagesFileNames: [ - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName, diff --git a/packages/pinball_components/test/src/components/ball_test.dart b/packages/pinball_components/test/src/components/ball_test.dart index 8a166d7b..38af0c28 100644 --- a/packages/pinball_components/test/src/components/ball_test.dart +++ b/packages/pinball_components/test/src/components/ball_test.dart @@ -12,7 +12,6 @@ import '../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, Assets.images.ball.flameEffect.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, @@ -35,27 +34,6 @@ void main() { ); group('renders correctly', () { - flameTester.testGameWidget( - 'default', - setUp: (game, tester) async { - final ball = Ball()..initialPosition = Vector2.zero(); - await game.ready(); - await game.ensureAdd(ball); - - await tester.pump(); - - game.camera - ..followVector2(Vector2.zero()) - ..zoom = 8; - }, - verify: (game, tester) async { - await expectLater( - find.byGame(), - matchesGoldenFile('golden/ball/default.png'), - ); - }, - ); - flameTester.testGameWidget( 'android theme', setUp: (game, tester) async { diff --git a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart index e408243f..50407770 100644 --- a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart +++ b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_chomping_behavior_test.dart @@ -7,13 +7,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/src/components/chrome_dino/behaviors/behaviors.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart index 11b362a0..a3852cc2 100644 --- a/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart +++ b/packages/pinball_components/test/src/components/chrome_dino/behaviors/chrome_dino_spitting_behavior_test.dart @@ -9,13 +9,14 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball_components/pinball_components.dart'; import 'package:pinball_components/src/components/chrome_dino/behaviors/behaviors.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/packages/pinball_components/test/src/components/flipper_test.dart b/packages/pinball_components/test/src/components/flipper_test.dart index 3bff1474..314b1f77 100644 --- a/packages/pinball_components/test/src/components/flipper_test.dart +++ b/packages/pinball_components/test/src/components/flipper_test.dart @@ -4,6 +4,7 @@ import 'package:flame_forge2d/flame_forge2d.dart'; import 'package:flame_test/flame_test.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../helpers/helpers.dart'; @@ -12,7 +13,7 @@ void main() { final assets = [ Assets.images.flipper.left.keyName, Assets.images.flipper.right.keyName, - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, ]; final flameTester = FlameTester(() => TestGame(assets)); diff --git a/test/game/components/controlled_ball_test.dart b/test/game/components/controlled_ball_test.dart index f2c00d64..13852a99 100644 --- a/test/game/components/controlled_ball_test.dart +++ b/test/game/components/controlled_ball_test.dart @@ -7,6 +7,7 @@ import 'package:flutter_test/flutter_test.dart'; import 'package:mocktail/mocktail.dart'; import 'package:pinball/game/game.dart'; import 'package:pinball_components/pinball_components.dart'; +import 'package:pinball_theme/pinball_theme.dart' as theme; import '../../helpers/helpers.dart'; @@ -24,7 +25,7 @@ class WrappedBallController extends BallController { void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, Assets.images.ball.flameEffect.keyName, ]; diff --git a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart index 3f8c8fdd..995572c4 100644 --- a/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart +++ b/test/game/components/flutter_forest/behaviors/flutter_forest_bonus_behavior_test.dart @@ -17,7 +17,7 @@ import '../../../../helpers/helpers.dart'; void main() { TestWidgetsFlutterBinding.ensureInitialized(); final assets = [ - Assets.images.ball.ball.keyName, + theme.Assets.images.dash.ball.keyName, theme.Assets.images.dash.ball.keyName, ]; diff --git a/test/game/pinball_game_test.dart b/test/game/pinball_game_test.dart index 7a6e13e2..9643b1da 100644 --- a/test/game/pinball_game_test.dart +++ b/test/game/pinball_game_test.dart @@ -26,7 +26,6 @@ void main() { Assets.images.backboard.backboardGameOver.keyName, Assets.images.backboard.display.keyName, Assets.images.boardBackground.keyName, - Assets.images.ball.ball.keyName, theme.Assets.images.android.ball.keyName, theme.Assets.images.dash.ball.keyName, theme.Assets.images.dino.ball.keyName,