From 0db6be32b6d02a530adec8df23acc39f6c197fe3 Mon Sep 17 00:00:00 2001 From: Andrin Fassbind Date: Fri, 26 Nov 2021 10:05:02 +0100 Subject: [PATCH] Road.java and changes SiedlerGame buildRoad Method --- .gitignore | 1 + .../ch/zhaw/catan/Config$Faction.class | Bin 1465 -> 1465 bytes .../ch/zhaw/catan/Config$Land.class | Bin 2136 -> 2136 bytes .../ch/zhaw/catan/Config$Resource.class | Bin 1530 -> 1530 bytes .../ch/zhaw/catan/Config$Structure.class | Bin 2969 -> 2969 bytes .../ch/zhaw/catan/Config.class | Bin 3892 -> 3892 bytes .../ch/zhaw/catan/Dummy$1.class | Bin 702 -> 702 bytes .../ch/zhaw/catan/Dummy$Actions.class | Bin 1113 -> 1113 bytes .../ch/zhaw/catan/Dummy.class | Bin 3788 -> 3788 bytes .../ch/zhaw/catan/SiedlerBoard.class | Bin 5398 -> 5365 bytes .../ch/zhaw/catan/SiedlerBoardTextView.class | Bin 681 -> 681 bytes .../ch/zhaw/catan/SiedlerGame.class | Bin 2586 -> 2740 bytes .../ch/zhaw/hexboard/Edge.class | Bin 2689 -> 2689 bytes .../hexboard/FieldAnnotationPosition.class | Bin 2239 -> 2239 bytes .../ch/zhaw/hexboard/HexBoard.class | Bin 12025 -> 12025 bytes .../ch/zhaw/hexboard/HexBoardTextView.class | Bin 8235 -> 8235 bytes .../ch/zhaw/hexboard/Label.class | Bin 1235 -> 1235 bytes src/ch/zhaw/catan/Road.java | 13 +++++++++++++ 18 files changed, 14 insertions(+) create mode 100644 .gitignore create mode 100644 src/ch/zhaw/catan/Road.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6a3417b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/out/ diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Faction.class index d312fff43d77181fa04aeec4c5c291969fba6a77..a9c9a44e6bb763d39b275dcbf6f35d961bad970d 100644 GIT binary patch delta 17 ZcmdnVy_1{c)W2Q(7#J9AHgara1pq*%27CYj delta 17 ZcmdnVy_1{c)W2Q(7#J9AH*#!b1pq*+27Lek diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Land.class index 2a20065c61fe93f6bc65a3beb56983a3a86d994f..a0e3700d37eb7ebebe102891270c75592f6aa796 100644 GIT binary patch delta 29 lcmca1a6>@g)W2Q(7#J9A7)sa~m>3x(CtqX|-Kc8J0RWgZ2!H?p delta 29 lcmca1a6>@g)W2Q(7#J9A8A{k0m>3x(CtqX|-Kc8J0RWgq2!Q|q diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Resource.class index 58f80c19d826c4c3d20a93bb7cc34cd58bfbf4c1..82c496d4a344d4551e973a178c0d2b1feb11773f 100644 GIT binary patch delta 17 Zcmeyx{fnF9)W2Q(7#J9AHgbGo1prA%2R{G+ delta 17 Zcmeyx{fnF9)W2Q(7#J9AH*$Pp1prA+2S5M- diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config$Structure.class index 169ab41df0a499b0974a70ca692c220aade8ba7a..cfb923789cbee4999b3277de56d6adbfb46ab006 100644 GIT binary patch delta 29 lcmbO!K2u!a)W2Q(7#J9A7`oXRm>3yECVylW*{D*=4FHaJ2!;Rv delta 29 lcmbO!K2u!a)W2Q(7#J9A8M@gSm>3yECVylW*{D*=4FHaa2!{Xw diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Config.class index 922ab81f29087b69126385b1f5d1e57df820260c..598fcb0bcb49d4a9e62bbb1a06337c38fcce3681 100644 GIT binary patch delta 17 ZcmdlYw?&TQ)W2Q(7#J9AHgf3j0{}rl1|0wZ delta 17 ZcmdlYw?&TQ)W2Q(7#J9AH*)Ck0{}rq1|9$a diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$1.class index f4062e0543dd7a05698bdfc914692770f987eff1..8567a9baf96bfafe29eaf344e89d39a5ee1dcf7d 100644 GIT binary patch delta 23 fcmdnTx{sCP)W2Q(7#J9AHgcphF{)24VDbY1X}|}l delta 23 fcmdnTx{sCP)W2Q(7#J9AH*%yiF{({2VDbY1X~qYr diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy$Actions.class index 3410db753ca6458025bf856739f3d98ae36bec03..0d99f9f2a2000f589248dd6620c2a76c84bb5e38 100644 GIT binary patch delta 17 Zcmcb~ag&4N)W2Q(7#J9AHgW{A002Xa22}t6 delta 17 Zcmcb~ag&4N)W2Q(7#J9AH*y5B002Xf237z7 diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/Dummy.class index d1759cf92ad3f595b71d525c136ce70d21351b66..09c27a7c753f40354200852b54a7f35916c4c323 100644 GIT binary patch delta 127 zcmX>jdq$Sy)W2Q(7#J9AHgcTci4Fnpu}*NL7CwKgDS&i1~rBo4C;(544RDm3|fpr3_6UW47!XG4El^p f3`UG<491f+d7m?yO%~)!W3^)7Vz8cE!xsPm99I^6 delta 127 zcmX>jdq$Sy)W2Q(7#J9AH*%cdi49WDsKzWDsXiWRPGmWRPU=WRPM=WRPLV zVvuEMV~}H*z@Wge1t@!#L5bl4g9^iC233X|3~G!l3>u9544RBW4BCvM3_6Sw40?=8 f42Fzq3`UbRd7m?yP8Q@#W3^=9Vz8QA!xsPm7SA=9UyG8saP!~2@11+@xx+t~`^9Y=`uSuKz}y~N zTq#+E`36!^XJQlT8EjQG;qqX0Lx@4naR&^95H_KrfkDj)1l;8Y?AT(W3C;YgQexkZ z9XfWJXu&RCs(Q!o5#YT7Tvp~Tw__Ien>c`je79OQ`w)X`eXuc@-w>{<&iB{X2b-5x zZ4Mh~g)E>)O&r5=25m#Ad1Z+1?KolLBu?=kYL2ZH+{782<$2mP`+2nKxM1QUF7>X` zh8bUNd&jzZy(u##S34Ca;WBI>9nk1|g*VtUJsos!&pk2jMurDiFp^<_&uBm`s|4MZMu0Q>PI1(bT+_f2b`@r9@j}*jA!j`k)d)p=eGV zp-M}Wg@#cnagcj4S?2}Ou#f<;L1=!M+(SR|DTGox!!WX)x`yz>2RLsR% z>S&y1mX5=C3MVZIXxe{jivF!BiUF#r)0I0(O!XzrK&8_kM{8vt4lfgm`f-GRa%E;5 zpBRDRwUii6S44jed;iQMGi|CBp`cu9rH4|9p^B#ZMLJ%YR=lQFM@7~*;!ZC5E9&NJ vydhuYoJF2kapf`22}&t37x5DSYZ7~to_znSUcuYM-Xz(EXp-&xb6WOqY;@pU delta 1037 zcmZ8fNl#Nz6#niT+R{FewoDJ_gh0y>P|Kjm0*NTGhByR*(M6GJ5Q2(Dzd-J-MC@zKX5}-JomMVar5rE?|k<=-}%n@?(WL4eEjv|HGtwlOIWcu zuua2u?BJi3gyfwXR0J4QS9!U+(h3`PX=p(!|EVmt?ZI9%_G#FU1AM8Pm3&Bm4-0T< zsk_pKLLAj_49EF#wRF)52Ip4aE?-V_pspdOq^Zf*=B?Wqup$UqKu>Epg9-*yy}xa( zpZ?p>uHhWcbIIgd7(}NAjtdO3ueO#U!R0l`8hnjgaw=-J`ZooN-0Q9A!X+~oeVc3_@N%#3WfFZZ_}6i1Z)kFK`Ds9*no5a1Govs#-vu< zqDYd8*bm&MNS3a#ZiFaO%R24L%ugs#(90|AGvB=xVszQ_FSyA&lR}(a&Ds_UWBP;usoO_4&bQdKH p=_Zy{d5(*MQ8H#A))}ZV_9HQp|0`a>2V*}XY#(WA-TYI0+Ha^T-5me` diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/catan/SiedlerBoardTextView.class index fd38f027ff1bd27d5b16552c99dd8824201047dd..26d90d1065f9c2e5fd1d0f89628fb2679cba5c4b 100644 GIT binary patch delta 17 ZcmZ3?Y!DUH)Y>#{AR3yQgjShxI;WeH=D>Ehv)K^J zAMkg0?}d&ZI6A`}H~s_vg4bRzt*t6&3eV+IG{qx`7UlP$WeKkP=3Pvat zqcDvzntIHi@|4M~{Zw)9u`palW6RQ#?h2z|BDo!*aYh%6dg^(dw^9aoxs@tQQ8k6L zW^<=HK@kc@=?#iS=v0i}q)A4z1I6$01HmY~r%;S876uAw&a@&u9izB1Fm5=4yCNr_ zDT105CUl;qa}k=3(F~nubWXd_bfuZf+NKE~q-`}AMa99PdsL7O_!Lhh3$Ml0U7FEM zuK2LDTPf}qH#c@GrOf)qZZVhJC^2GrMyIl1fxGTDH=81e=!FmwOThn6b`f~UW}A*9tmAetn(u@5sA4qN3oeO< z-E<65c5UMcqbrFXJ>nH9r7c)2{eP~R5x|W=ID&8eWbk{N=MXzaM|S!h$3pg zVF4R;>yF)8mxijfM83P`AMis}Mpe9NAx1`@z=$;WbkGp#PMlYCT}S$sik@ehi8{eq&u(8S`;H1R7<{fMUkln@4W2g!=*5MzjPAHodR4eLx@j z9IN=N{PuG^*BoB@+S(Pz9l8sQ+I>VHV`cOSrAM-TJA`ey!}ck5ifx5H!+#zcI{x)V z=DQ*Ot?JV9Qj`JL8fAUUI$V9R`e_K4=O?4}6L7p5!Lf0I2>o^92<7PB$aw!fgzdhr z0F}Kwb}HVVpP&-|(QID#wQGUV7o#J?LPH``(0LEg16@g*RK!0Hd$y=VmDO2#i2u&& F?0@Dh7U%!~ literal 2586 zcma)8%W@h=6uphW2rNgkY)Mx9Qe-Cq+YyeFI1dy>2!TR^K?Ovr@>GYoWA$m+g<$i-=A-Y=yNJWDM;xk z?NTO8*)Z)fTFDlFC>>RbN5w+ss8UMpW{!&4Y^KDBS8aS*%)1u154b1wd-r2d zHDrs?&Ain}{M6u`gvGIcqAW$t7Tz8|5lKdoj&$~2=_nxQ9iv&S@7w%Tc=)o|>PTfZ zDsDmisQj;tW@0*)<=)c1CtgXn-Rdo0Jr-SPmRm|9Yv{z{`4{{ZPqdY^6M5NEdh4=0 zcDQPLB1|wS+=Vlm%Q=ql(l&3k1jtWD$eTkc!P>e!zTXu{Zb5t&QS7+ft1-F*{#Xml zI4r$A&`b>h%!GIGmXE zx)O};PJyEiO`BUHhenayE(@h>ae_n`U61*e^NvcG3MZe(pF_Oqwt#gVMhn9Lv|N*) zx^1u-pbLZ2C6~j?dn2O58hVe22XI+&4?h08@%S)L#?OeV?~Xm&{k&(yk4wwygZxs{>O7^cdee|wuL}>SzJpr>`=Zefr9K(GqE{MH)KdjM>Dv0i2`(kLUf7HU*>HV?~#G` zC@o;^GR@(61&BS2`c@4+_?_5qhVl-cQ3w&OL2{ku&CGy6zKS=%Y0-%4*)_}pkhxAv zUD1a?F#S6d)DaQIjhNnB1AH+QZ94JsSmFwj3z#%EAg4uxe^B68i~-VF_?xB%xWVqG zs|Ir$oI7+EPi@7cu10_jE93_h0{yVpVEQ!X!C2-xz29X%#i*SQ%)B-cokd+W%w>PI z?|Xngpbt%)F_`J^zKu~=XH=tQG}ipp0gVUr5FG8&Bl-wWMjMovs`m2)wa0z6k1^9~ zPv{ej+S7i1BcA>;A-_*e)%^N=2Cb*~PvPg;*BbHa^#m5cc1_lP3jU1I+06J#{?EnA( delta 17 YcmZn^Z4~7=^>5cc1_lP(jU1I+06J_1?f?J) diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/FieldAnnotationPosition.class index 50b3008ccbd52a872ad8a498800786b7129d62dc..064c70d60828d7a4384f85d8d86b2dd9c4a59b42 100644 GIT binary patch delta 17 ZcmdllxL=Ut)W2Q(7#J9AHgas|002TM2Au!^ delta 17 ZcmdllxL=Ut)W2Q(7#J9AH*##}002TR2A%)_ diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoard.class index 54b55a6018c5c241225ea1f2bc50d808f5cef6a3..c212f56dfbb74bb24fc3dab4a53e704eb7cfc170 100644 GIT binary patch delta 17 Zcmewv`!kl~)W2Q(7#J9AHgbH_0{~L%2nhfH delta 17 Zcmewv`!kl~)W2Q(7#J9AH*$Q`0{~L+2nqlI diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/HexBoardTextView.class index d987cad504653507643f6993f19be18b860f1b89..9904f75d53df6123bc2d5ba3cae6853767877e7b 100644 GIT binary patch delta 17 ZcmZ4Ou-bv+)W2Q(7#J9AHgYH{002ZA23G(8 delta 17 ZcmZ4Ou-bv+)W2Q(7#J9AH*zQ|002ZF23P<9 diff --git a/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class b/out/production/gruppe06-hufflepuff-projekt3-catan/ch/zhaw/hexboard/Label.class index 3dd5342468f73a225021be99f765b9a921438683..85f914830010a10f0d03bf5bf51d31549fa8f97e 100644 GIT binary patch delta 17 Zcmcc2d6|>r)W2Q(7#J9AHgcS10RThY2E_mX delta 17 Zcmcc2d6|>r)W2Q(7#J9AH*%b20RThd2F3sY diff --git a/src/ch/zhaw/catan/Road.java b/src/ch/zhaw/catan/Road.java new file mode 100644 index 0000000..24025c5 --- /dev/null +++ b/src/ch/zhaw/catan/Road.java @@ -0,0 +1,13 @@ +package ch.zhaw.catan; + +import java.util.HashMap; + +public class Road { + HashMap buildCost; + + public Road() { + buildCost = new HashMap<>(); + buildCost.put(Config.Resource.BRICK,1); + buildCost.put(Config.Resource.LUMBER,1); + } +}