From c494e2644b628fe2a480b5cbfa99a73bca10d0c8 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 8 Dec 2016 23:15:06 +0100
Subject: [PATCH] Fixed #6
---
bin/de/deadlocker8/roadgame/logic/Board.class | Bin 5204 -> 5572 bytes
bin/de/deadlocker8/roadgame/logic/Game.class | Bin 1974 -> 2119 bytes
.../roadgame/tilepacks/TilePackTest2.class | Bin 0 -> 843 bytes
.../deadlocker8/roadgame/ui/Controller.class | Bin 13736 -> 14197 bytes
.../ui/SelectTilePackController$1.class | Bin 3323 -> 3323 bytes
.../ui/SelectTilePackController$2.class | Bin 1892 -> 1892 bytes
.../ui/SelectTilePackController.class | Bin 4911 -> 4986 bytes
src/de/deadlocker8/roadgame/logic/Board.java | 33 ++++++++++++++++++
src/de/deadlocker8/roadgame/logic/Game.java | 5 +++
.../roadgame/tilepacks/TilePackTest2.java | 18 ++++++++++
.../deadlocker8/roadgame/ui/Controller.java | 30 +++++++++++++---
.../roadgame/ui/SelectTilePackController.java | 2 ++
12 files changed, 83 insertions(+), 5 deletions(-)
create mode 100644 bin/de/deadlocker8/roadgame/tilepacks/TilePackTest2.class
create mode 100644 src/de/deadlocker8/roadgame/tilepacks/TilePackTest2.java
diff --git a/bin/de/deadlocker8/roadgame/logic/Board.class b/bin/de/deadlocker8/roadgame/logic/Board.class
index 9fd0b006b733e31bb2191558e7944e02ebf33685..b0cad02dd0c19c783c02615a51dc74bcff218e5a 100644
GIT binary patch
delta 754
zcmcbjaYS3-)W2Q(7#J8#7!I*BFflSHPgZ1>+o&hYDZpQnnUm_AnCFxlkdv64nlkw<
zr)FRj7Xu^16ds0lh7K+UVTNfu4AU8AFfy<dXI7;$GB9gsdU7!+GtA;)n9U%-$iQ8c
zUy@jo8kCuyQ34X5%fm1aB+dm9_eo7Fne54F&$5V-K^<i8<Qh&+E-r?J3`=+zxEYpC
z-pg6XxPGz?myGR3Mh0G|{KTRZg=mnoify?V)-h}bsoKKGAgbY$l~|UjpOcuEt{+@d
zl$n=qtr-SVv5kjeJHw92Q@O19cQG<B#)8E5fW-DrzRzXEv5sLs55pRUwUZ^eZ5jDC
zhjTw+t7o{zz{J4Bz`ziurM-<|@-~L4vlv*J*Jy8Jn28YJ)ZWH02VIaCBnZOj5+Kzx
zA%ZMx7#J9s8KfB)7~B{H85kJWF>o_%VBlrg%pl0Hg+YcPej9@V!*&KGhFuJ547(W&
z8TK-mGVEipWZ2JO&2Wgpp5ZWq7sF8oKZaur0SqS@LKsdl$S^Q4h(VmpAj=@f00LnQ
zc?=c|j0~0x3=C`xEW9ETA`FZS^BERQHWiv(zc5l-Mpl$%JHz4)aOc=D@G~$loM&KS
zxWK@|aFKzH;SvKU!xaWahHDIZ3^y1o7;ZDTGTdeGXL!I6!|;e9jo~Rn3Bz-SdWI_u
zoeZzRuCQZZV_;yI26Y7!!xV;P46zK13@i+j7?v}{GB7c)F-%}s!Nm~Ez|6qO(95uL
za-?uD^D2hblh+GtvVLITWcWDwuCRQ>8iutDj10UC3=GZ;%nXbS3=ERH8P-J#ZP?DR
wNoxy(*fxf(LOZuH?B2$(599+TaDcLb6@CM|ga^!)gt~;0;Q#{z0~5nR06#gh^Z)<=
delta 411
zcmX@2eMLjy)W2Q(7#J8#7`Cu8FflSHPgZ1>+o&hYIr%!LEz1-}26d2tuuEocYF=?>
zejXRYWQJ)x4BQOUCwp?$F)o~Zf=fnvF(U)7Q+{Gmib8ZrW=?9cEf>QAhNU1?%O?Nl
zlHypvu!4tSCBv%8irm)xYZw_AV?hemfyCBN&gM4aSirE6hhZMW{K-qXZ5eqtKjwbI
zHhH!1)cVPh(lWB5EZZ5TZeU<wU}lhJU|_Ig;Adc9SjWJ`u%3a1VFLpj!$t;9hRqC$
z3|krW7`8K5FzjM*W!S^u&#<2%hT$MX8p9EW5{6?8^$eRCIvGwe$bijYV_;yI#vsce
z$H2hA#4v?n216_ZBLfS=B!-y`u?$QMYzz|^W^pmZGB7i6GW0Uco_tayn0XGv+{yBy
znylv;I2kTX_7#<nn8z@mfsuiifq}u9fti7kfq_ACH^YKRp+(ynmS}BZ5ZlJETxj(+
ihPB%mHh_G<1oi<NSm9N$OL)L+NvKO088(64vl#&CBVMxr
diff --git a/bin/de/deadlocker8/roadgame/logic/Game.class b/bin/de/deadlocker8/roadgame/logic/Game.class
index dc3bfe85233eb41d5d7b319ec476fd8804810208..e862ecc9737deecace3642c65c26c229473796bc 100644
GIT binary patch
delta 192
zcmdnSe_Vj~)W2Q(7#J8#7`)gSm?k$eDQ?trWD(#m$;?T0PRw&k4aiAMPEDB{%dE*A
z#l^tSV8g>;$zU}(mnE3Zfrr77!D;d_7DE;n9tPLRzgf~5IW{M=eqmIyWnf}pVqjq4
z)Y`%zti6rFdJO{u0~3QN0|Nsa10w?igYjfNc6nx72D`}t>>^6`P-V^=;mY_Jm>C!t
fEErfBEE#witR}ayEAqQBxHB*@Ffw?6Re1sc*{~$7
delta 116
zcmX>uu#KPh)W2Q(7#J8#7~I$ym?k$eDQ?trWSP8`C6LXAhryP?ZZZ$6A&UbKgX3gJ
z)^tYp%_~{IFiw8K&Z}gtwS_@gdmDrOMg|53CI(Rk1_nL`W(EcZV+K|R69!%e)5+o-
Siu_It&J0Wpj0`SdRjvSnx)!Sd
diff --git a/bin/de/deadlocker8/roadgame/tilepacks/TilePackTest2.class b/bin/de/deadlocker8/roadgame/tilepacks/TilePackTest2.class
new file mode 100644
index 0000000000000000000000000000000000000000..0fc0a42fa46fc5c2b515fc7e081a374a02c49833
GIT binary patch
literal 843
zcmX^0Z`VEs1_l!bLv{uxMh5+qRQ;6H#FU);<m}WU3;m+}#FX^J+*JLN%$(GM#N_N^
z{gBL@)PTg~?2y#r5+im77Dfgw;x#ccu-RnhWtP}6GB9gshA}d*IOnINaxic*GO&RR
zR50RVU}oUvVPIw8VPp{1@X1OnOVrOv%uCk~E-A{)OSjexV`t!FWDo>Pl$K=X=zAm<
zXZR)-a53;Q2!J%QaWXJ62=OooGl(!Uu!0<3%*Y@NF$r0NH7A1@g9JN+I3t4^E+6FN
zr)MUEy&O_mkjld#$sonZz!Bu{=o0Vh=fcRK;X|BGYc2*E203;HS(wYgUh>Q<Nli~J
z;$e_yP+(+WFH6iRP4!P>WDwKv)P%SfS(!D+he|vQ$_y%u49o?kC5#Lf$N}V^l$DxX
zVvVE`DuQelR0!mCH68|akaxJ99fL!BT;ttBeSARTnmi0zAaO3RH=RR+!dw{{_<b_-
zQvFJElTwR95|eUL85x9p@{<#D!V-%zL42qnOG!p%F(ZQ^&R_vW2bOeX&B(wNoL^d$
zoa&YdHXJ3D>474fL6L!xftdjW7#SEDSQ*$D7#Y|Z7#M09m>C!u7#QreggCY{aB1yk
z;EmkQz`vD2P-_c=;3fu9mK_Yz+ZYtXAzW2dt_F;|k%57Mi9wrzfkBFaje&uIn}Lmi
qmqCz$k3oTfpFy8NfWeMIkU@umfq@5N9fK}|9s>gdBZEFzrvU(%&eE6w
literal 0
HcmV?d00001
diff --git a/bin/de/deadlocker8/roadgame/ui/Controller.class b/bin/de/deadlocker8/roadgame/ui/Controller.class
index 0f4c297b9a397c2c17b14932eca93ae0e0abecf1..44de8aa4615b85fc86feaccaa7df2feaab9db619 100644
GIT binary patch
delta 2991
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
delta 2532
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
Vn8^SJj8b5Vfk}x;o~h445&*E+UylF)
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$1.class
index 3875f98da1827314065a224d11592b4e83ab5572..bedf680ac2b3bbcb2f66d1cf496c5d87a9bff893 100644
GIT binary patch
delta 79
zcmew@`CD>>88@TzWOMH0wq6W^4BiZq3_c7>489E741Ns84E_vO3;_)841o+`3_%Pr
j48aVk3?U394518_4B-ql3=s^q3{ed246&1~c@6*ot!)sX
delta 79
zcmew@`CD>>88@TjWOMH0wjK<E44w><3|<UM4Biad3_c9T489Cj41Nsm4E_vZ3;_%=
j41o-(3_%Pf48aVQ4517)3}Fnl3=s_N4AGOVc@6*osDBWC
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController$2.class
index 6ab0b99aa84d336328a46f2d150e066c0b5cf408..c1e46d7ede0e2d0c9a75c6e25144c146a32a401f 100644
GIT binary patch
delta 31
mcmaFD_k?dlIU8g4<O;TM-U0?*h9U+DhGGVJhSJG**g624qX_;0
delta 31
mcmaFD_k?dlIU8f<<O;TM-aH0gh5`l&hC&8;hT_S0*g6249SHOQ
diff --git a/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class b/bin/de/deadlocker8/roadgame/ui/SelectTilePackController.class
index 0f5b49df7ea5b10af5da539b981464cf6078a558..75590e6be117f1f67f1ca6acff6be800c19e5561 100644
GIT binary patch
delta 1404
zcmZ3l_DhZH)W2Q(7#J8#7`|`hYGP$$XNYEG(4V}4MN1?kwYbEHiy?|Zn2W)SA&!S3
zo*`lKG*&f*B!(1rhGa$tp{&HRME%l|%p85slGLKalKdhbhE#^M$#+;47&9jSWz}cN
zVq}n*e34gzgNq@PL71H(cX9xmJV!c1J`Y0yL*e9dHf7};hGHHDeuff822l+ku!%W|
zdFlGWB}JKe>DHQI91LZX_p<4U<uFw6FjRunaTKSP1ea9iq_Q(qPiAD75vgTlVASAZ
zsA4GQVn}Cb;9+QFXqs%uF3nNJ(89ye%Fs4Bgk4LtgOPz<AtW;=wOA9RwhJWFJ$W*_
zkzo}>FAqZ>Lm?vrM@c@!Vh)B0j0{4$X%)I@`FSO}#hF#9Rtkn@*6a+E7#XA|evp>n
zV3@+lz!jX4Uk)*pi(w)|F$cr+$$QzfxQwhp+zNJvS(9TqtT<*e%mMjv?&SF#`#2^t
z%;#ZPz_4&~DyJbwCc|PLh9wM3C(q-wU|Y@*$j-20@*Pe!mQ{=lQj;(8icAjRV-w(F
zSjiyF$*`7TJv+lXMg|$M#2zjVRvv~83>zm0a_MknGHm8y*ut=Nax0e$%XUTvvB`Se
zV(M%TmJDFP#juTGH^>Ql7#Y|#TwGjSG{ZnqvX6&hKf{5^T-^4IhbDV*2Z?7gRDjeT
z1*ug9sW{HVaDw6F<jvgrEQ{G0&P<NwFy}YoVmQrk4y5EfBg1@+$%#BNllOB-P4488
zm@Lm}HF*n<gjy!UMIMGr3=0_<1dCHk{PTSCON&#Tb25{&Q&YGZk{GV=FkEH0w)qp!
zHAczT(6p3Rp<i5*n4YR13?kVX-cEkVC(HPL@_#-<wpR?Fco;rUHse3Qs5JRIzdYw*
z25tr(1_s8q$?^h8^}89OBDXWdY-0!rmt@(-5NpM@oRM9UZ6`w_Bf|lPbSu`~44IMJ
z8M3X|cQfQfO0sTa$lK0PWW^!LAym4Jp&TT*o1rRFsAfAu9Z0r*8$+{D`!<HoZ45mi
zg`AR{Lj7Qc6C;HtZ)ccl#U;rlG;JHh3`wrt3^VH^wX}6~C0VyK%-+T@Pm+Bb!y-wJ
zoeayE7{Yfmtc={wu-b|nBFYUBmE_*Uux1CtCWs&>R1mC>3(Dcz&9E(!kB?7;VaIlc
zT{{@|O0o+b+{SQNk{u)=!eF$W;m9_IV_I7nWVY2aoRVaR>SN!{a5_>;SCUnGJHy#+
z3>QG5aG8-|*1xYC85kH?7(^Ht80r}085kIJ7+4wf82B0V8PpgI7z`MU7%Ul#8Qd65
z7=js084?)G7;+gb7@8TZ7<w428D=rqFf3%SV>rxU&v1&tk>M(X6T=+_XNGqS2@LhW
z84?*;7?KzT8Il<#8B!S47*ZLH8PXVC8PXYj7%~{688R8O7_u3w87vrE87de=85kG}
z7`Q?4#~{Wa4oakqZ4A5&d<=|WvFi*s7?{AUn+&%Ym>Db?eHm^u++kp0XlD4qaF^j8
z11m!h!+VDN3=bIC8D=FiJY;yt@Q8tf;V{DvhQ|z#7&sZOGAv_w!ob78#mK@?&hV7s
z83Q-Na|Q+m9tK9JaW5EH7+x|kFvv47{bwj=U}tAwWM_EA&hUnv;T=1J7Xv#(5(C3;
zMrH;^h7Xg^3Q2f<1ce|II0U&s&SR)yU}vZWdj@1G0|N)tGfWI$7#J9s7``%mV_;wq
RVqjvJ3GyNX1H)+u4FJLbVX6QC
delta 1392
zcmeyRwq8x()W2Q(7#J8#7{0JGFflS1Pj=*#o@~b>vC-L+m5YnPiy@kaA%-D#@k
zg?NTUc7_B-2BECPvPAvTlFS@^&yv)l#FG3X9)=`_<jG=e3M{FN3|f;NIVC1Ha0;=p
zGo&*zNKAI%5}91b#>Sb(Ak5B?#mFEv@q;M8PhwJP4i`fTLk<r^E<@hrjcm%?nG6Ly
z4Ezj*j0~caFR+WSgmEwwPyWuPCzi=j%EM3wlHe##EeS5E%t>WusF-ZcE+bOK$iS$<
z#Zb;r05YtWhoO$4esVUuG)Fl@BM(CpL-XW5b}i9XMh13;kj$LaVoi|Rc92ZR<g@HX
zdgTmVJPh3od5jDkCHcW6MVWc&91OjT3_`kT6}oBpc_q5VnN_J)3WjFZ><s;rbvYEo
zCNeT`1!v@!Lk#3%=wm40V3;!bJDV1lku`{0%FZx-vI37ezabaHG=`ZVKh0uf*r_qu
zfl~$)x|0Pt+c^3d=I}7gWtca4KBpl^8p8q}hJ_4^Cg0$+;9SBG$j-2okwJ0t8%{-L
zc82AXZMo$6mN5u(GOS`)!_KgpkwFF$s9apkYZ=x}?&i|rNMqQ*!?2NI)8zeJE-YIZ
z8N??4=N6kR%grsbnPCUW1v?oT*fm^STwFB6xERtHcJnaoVc0v_h1;HS|Kt|#An`PY
zQZ9zg42M8!RY59_@Gu-@I5zn$w?4}Pc7~Ia6?m+8PB5GX$)90ln2+$yES?;WG=_6L
z4Cfi<P3Gej<A`Ut$ir}n;qqo3-fN69FQ7>#twO)JBr!czKNv)^GrR(&jf;#DZ0rng
z7#UP2J94V>GcvFwB_?NcF+68@&%^LxasmGVM#ag70`i=j7`PdD7#J8UCr1h-)o){n
zvSM4#$S%pYlOc|g;Q&L573*$>w8-rY8CLAO88Ra!S+_A{Z)eE2;*jJJD%!?S0utQK
zP#!5%xt*aJBwMqMp+Tr+8$;VRhE9+|PDxIo9<ai`NTCVa875hANpcBI-o`Lhl501^
zv`8&&9bHM*?F=)vG0d))WZ%XxUy@@d!(t|e@ZAi{BDXWFu;PY@azjKVxi>Ma+`+IO
zBFG691nc91a=3OgY>wpP;}c=nx}9PB4u)Nl>_YptF&vO&2T6!97;R@bxQ*ek))oet
zZ4AdH*`eClch@tVh}6=RWYylzaB3UFSx_ikU}Tu}@9Rbe1_l-e5e5c^Dh4?Q1_o^g
zRt8-Leg-`TH3oeK0|r9|O9mqbHwI&dU<MP01O_vPG6oBVdIn2|UIr_MDGW9Y+Zb#a
z_A=NroM3QZIM3k7@Q@*n;T=Of!*_-RMiz!dMjnPFM#*}HWJWcH6h;e%R7QJ-G)6y$
zbjDbQOvXG0GsX&rG6qow28IF#ZcubFh%tyWFo0RS415fXVAd6es|-wF)-{If49pCc
zj1CMp7;ZAKFqAR;V7SF_n}L;~p5Z;i9frFM><qmO4;k(;+-Klm*v7Df;Q_;ahI&qh
z6Aa539y0JSa4~#mC}()Y@R)&{;Ryo+0}lfu)VQY%EDX;W7#QRknEo?lF|e~UFtRf|
zXJ>fH&hVO@!Ha>NA)bNZHzP9xBg0z;0R~0}K?Vi}GX_SG8yPsXwlGL-V|WJ&P$qDI
za)DgTP{qK`P|aWr@*v121_lnO2bmZ?GB7YOF??e9%)r1P#K6Qb4diVG28I(58UR-B
BP)Gm(
diff --git a/src/de/deadlocker8/roadgame/logic/Board.java b/src/de/deadlocker8/roadgame/logic/Board.java
index 77927ea..81e42e8 100644
--- a/src/de/deadlocker8/roadgame/logic/Board.java
+++ b/src/de/deadlocker8/roadgame/logic/Board.java
@@ -167,6 +167,39 @@ public class Board
}
return possibleLocations;
+ }
+
+ public boolean tileCanBePlaced(Tile tile)
+ {
+ if(getPossibleLocations(tile).size() == 0)
+ {
+ return false;
+ }
+
+ tile.rotateRight();
+ if(getPossibleLocations(tile).size() == 0)
+ {
+ tile.rotateLeft();
+ return false;
+ }
+
+ tile.rotateRight();
+ if(getPossibleLocations(tile).size() == 0)
+ {
+ tile.rotateLeft();
+ tile.rotateLeft();
+ return false;
+ }
+
+ tile.rotateRight();
+ if(getPossibleLocations(tile).size() == 0)
+ {
+ tile.rotateRight();
+ return false;
+ }
+
+ tile.rotateRight();
+ return true;
}
public Dimension getDimension()
diff --git a/src/de/deadlocker8/roadgame/logic/Game.java b/src/de/deadlocker8/roadgame/logic/Game.java
index 1d51cbe..e289a7b 100644
--- a/src/de/deadlocker8/roadgame/logic/Game.java
+++ b/src/de/deadlocker8/roadgame/logic/Game.java
@@ -46,6 +46,11 @@ public class Game
return board.getPossibleLocations(tile);
}
+ public boolean tileCanBePlaced(Tile tile)
+ {
+ return board.tileCanBePlaced(tile);
+ }
+
public void placeTile(Tile tile, Point2D position)
{
tile.setPosition(position);
diff --git a/src/de/deadlocker8/roadgame/tilepacks/TilePackTest2.java b/src/de/deadlocker8/roadgame/tilepacks/TilePackTest2.java
new file mode 100644
index 0000000..f3c6919
--- /dev/null
+++ b/src/de/deadlocker8/roadgame/tilepacks/TilePackTest2.java
@@ -0,0 +1,18 @@
+package de.deadlocker8.roadgame.tilepacks;
+
+import java.util.HashMap;
+
+import de.deadlocker8.roadgame.logic.TileType;
+
+public class TilePackTest2 extends TilePack
+{
+ public TilePackTest2()
+ {
+ super("Test 2");
+
+ tiles = new HashMap<>();
+ tiles.put(TileType.ROAD_END, 1);
+ tiles.put(TileType.CASTLE_FULL, 1);
+ tiles.put(TileType.ROAD_CURVE, 1);
+ }
+}
\ No newline at end of file
diff --git a/src/de/deadlocker8/roadgame/ui/Controller.java b/src/de/deadlocker8/roadgame/ui/Controller.java
index 6bdac12..311f0ae 100644
--- a/src/de/deadlocker8/roadgame/ui/Controller.java
+++ b/src/de/deadlocker8/roadgame/ui/Controller.java
@@ -318,13 +318,33 @@ public class Controller
}
game.setCurrentTile(nextTile);
-
- stackPaneCurrentTile.getChildren().clear();
- stackPaneCurrentTile.getChildren().add(createStackPaneForTile(game.getCurrentTile(), false, 0, 0));
- labelTilesRemaining.setText(String.valueOf(game.getBoard().getTilePack().getNumberOfTiles()));
+ if(game.tileCanBePlaced(game.getCurrentTile()))
+ {
+ stackPaneCurrentTile.getChildren().clear();
+ stackPaneCurrentTile.getChildren().add(createStackPaneForTile(game.getCurrentTile(), false, 0, 0));
+
+ labelTilesRemaining.setText(String.valueOf(game.getBoard().getTilePack().getNumberOfTiles()));
- updateGrid(game.getBoard(), game.getPossibleLocations(game.getCurrentTile()));
+ updateGrid(game.getBoard(), game.getPossibleLocations(game.getCurrentTile()));
+ }
+ else
+ {
+ Alert alert = new Alert(AlertType.INFORMATION);
+ alert.setTitle("Tile skipped");
+ alert.setHeaderText("");
+ alert.setContentText("The following tile has been skipped because it doesn't fit the current board:");
+ Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
+ alert.getDialogPane().setExpandableContent(createStackPaneForTile(game.getCurrentTile(), false, 0, 0));
+ alert.getDialogPane().setExpanded(true);
+ dialogStage.getIcons().add(icon);
+ dialogStage.centerOnScreen();
+ alert.showAndWait();
+
+ labelTilesRemaining.setText(String.valueOf(game.getBoard().getTilePack().getNumberOfTiles()));
+
+ nextTile();
+ }
}
public void rotateRight()
diff --git a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
index 761c40b..190e99a 100644
--- a/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
+++ b/src/de/deadlocker8/roadgame/ui/SelectTilePackController.java
@@ -7,6 +7,7 @@ import de.deadlocker8.roadgame.tilepacks.TilePack;
import de.deadlocker8.roadgame.tilepacks.TilePackAllPossibleTiles;
import de.deadlocker8.roadgame.tilepacks.TilePackDefault;
import de.deadlocker8.roadgame.tilepacks.TilePackTest;
+import de.deadlocker8.roadgame.tilepacks.TilePackTest2;
import javafx.event.ActionEvent;
import javafx.event.EventHandler;
import javafx.fxml.FXML;
@@ -50,6 +51,7 @@ public class SelectTilePackController
possibleTilePacks.add(new TilePackDefault());
possibleTilePacks.add(new TilePackTest());
possibleTilePacks.add(new TilePackAllPossibleTiles());
+ possibleTilePacks.add(new TilePackTest2());
for(TilePack currentPack : possibleTilePacks)
{
--
GitLab