From 351b3e45927b9c09bd5bc9ddc7d0efadfa3d5b52 Mon Sep 17 00:00:00 2001 From: BACHTARZI Imed eddine <imed-eddine.BACHTARZI@etu.uinv-amu.fr> Date: Fri, 29 Nov 2024 23:13:24 +0100 Subject: [PATCH] put initial values given in FFBoard as arguments for initializer. Actual final commit. --- .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .gradle/8.10.2/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.10.2/fileHashes/resourceHashesCache.bin | Bin 71369 -> 71403 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../stash-dir/module-info.class.uniqueId0 | Bin 0 -> 337 bytes .../compileJava/previous-compilation-data.bin | Bin 24616 -> 24616 bytes .../ChargerBehaviorTest.class.uniqueId0 | Bin 0 -> 3020 bytes src/main/java/model/firefighter/FFBoard.java | 4 ++-- 8 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId0 create mode 100644 build/tmp/compileTestJava/compileTransaction/stash-dir/ChargerBehaviorTest.class.uniqueId0 diff --git a/.gradle/8.10.2/executionHistory/executionHistory.lock b/.gradle/8.10.2/executionHistory/executionHistory.lock index f9434ab149350f0bca858c35e5aa9274e48bb691..135ec062fa2840bf8bbf646c3eaa1fb3f695d549 100644 GIT binary patch literal 17 VcmZQRz2joLjYLr@0~j!G001_W1ib(N literal 17 VcmZQRz2joLjYLr@0~j!`1pqdY1iAnK diff --git a/.gradle/8.10.2/fileHashes/fileHashes.lock b/.gradle/8.10.2/fileHashes/fileHashes.lock index 8a731737a3788deb2fae2f2bef2436f855fbd28a..f5c07e477b59b747574b176004a11625184e6450 100644 GIT binary patch literal 17 VcmZSHkQ$u3|HT_E1~3pS0suLF1s(tZ literal 17 VcmZSHkQ$u3|HT_E1~3rI002331rz`P diff --git a/.gradle/8.10.2/fileHashes/resourceHashesCache.bin b/.gradle/8.10.2/fileHashes/resourceHashesCache.bin index 361daef945004ae98fb8e0b135ac933f7c06db16..60b3e4c59bfbfb6ef65ce617e78db068e5503f32 100644 GIT binary patch delta 79 zcmX@PmgV(YmJKEnj59WyO8gY&KUsYu=Ec9c3?RTLc5<_-j<XPB;O0g<j~hzH3=9mC g3=9l{AT03WTwly8uK$%wMMP^S|LU-1U|^5~0ArmQ_5c6? delta 36 tcmaF8mgVGHmJKEnjMF!pO8gYw?51NS#A?aFkUM$u!7GZJ`|PZ5000Ow4nY6_ diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock index 5778c33693d22aa969839bc4efdaf00c873ebb97..1fe5d977bc22eab0c4ea42a020b66b21aba00998 100644 GIT binary patch literal 17 VcmZSf?RGnPr1wxh0~l~A001^H1eX8+ literal 17 VcmZSf?RGnPr1wxh0~l~|0{}J~1cCqn diff --git a/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId0 b/build/tmp/compileJava/compileTransaction/stash-dir/module-info.class.uniqueId0 new file mode 100644 index 0000000000000000000000000000000000000000..f0b28b3b4966d6d1c1eac55f53fff160e8e01b67 GIT binary patch literal 337 zcmX^0Z`VEs1_nC@Np=P%Mh5QO{FKt1RNc(Hw0uSeuHgLAqU2P!%$!t41_2}~y{yEt zL`DWSU$AOn26jdU?zGIJ)U?d>jFQwMVFpe{22PL~y`;qAR7M6iLkm3vJtJWT9!3U! zka${!UUGh3Nl|`IF(U($k)bdHKO+M-R3@z=H%FL35TP`^D6t?TGr3rVL70(&IkBKX zgh7;%feUIvPHGV&gJ5DofqrmiZfQ<pNq&)UVrCvYgBT+NKg5L~zH?4uad86!10w?r zFf%YSFfcGNurRQKgMbYz!NS1Nz`(%8z|FwGz{|h~CI!GGBZClF1rvh^1IQdcFrN{u LhJir>Y?e3xyjn!1 literal 0 HcmV?d00001 diff --git a/build/tmp/compileJava/previous-compilation-data.bin b/build/tmp/compileJava/previous-compilation-data.bin index 00cf6d06570f134f19435eed7d4fae39480c7e5e..03e9cd14d7dfa0dcc9c4c229e713d217f2c5b12b 100644 GIT binary patch delta 31 ocmZ2+fN{kE#trvb1qAfBZCm=A=V@tq<@Nf_2M%q1&uSS30QK<?-2eap delta 31 ncmZ2+fN{kE#trvb1<q9bea)q4@3i4=hlWnUL($FeSuLXg@1zb` diff --git a/build/tmp/compileTestJava/compileTransaction/stash-dir/ChargerBehaviorTest.class.uniqueId0 b/build/tmp/compileTestJava/compileTransaction/stash-dir/ChargerBehaviorTest.class.uniqueId0 new file mode 100644 index 0000000000000000000000000000000000000000..b1de71e03d1c37e7171a9dfe30a14faccc89d5f3 GIT binary patch literal 3020 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 literal 0 HcmV?d00001 diff --git a/src/main/java/model/firefighter/FFBoard.java b/src/main/java/model/firefighter/FFBoard.java index 2677834..aac98cc 100644 --- a/src/main/java/model/firefighter/FFBoard.java +++ b/src/main/java/model/firefighter/FFBoard.java @@ -36,11 +36,11 @@ public class FFBoard implements Board<List<ModelElement>> { 20,//forests 10,//rocks 30,//mountains - 5,//firefighter + initialFirefighterCount,//firefighter 2,//motorized firefighter 1,//motorized firefighter (AKA superman) 2,//clouds - 10,//fires + initialFireCount,//fires }); } -- GitLab