diff --git a/assets/fishTile_046.png b/assets/corals/fishTile_046.png similarity index 100% rename from assets/fishTile_046.png rename to assets/corals/fishTile_046.png diff --git a/assets/fishTile_047.png b/assets/corals/fishTile_047.png similarity index 100% rename from assets/fishTile_047.png rename to assets/corals/fishTile_047.png diff --git a/assets/fishTile_050.png b/assets/corals/fishTile_050.png similarity index 100% rename from assets/fishTile_050.png rename to assets/corals/fishTile_050.png diff --git a/assets/fishTile_051.png b/assets/corals/fishTile_051.png similarity index 100% rename from assets/fishTile_051.png rename to assets/corals/fishTile_051.png diff --git a/assets/fishTile_064.png b/assets/corals/fishTile_064.png similarity index 100% rename from assets/fishTile_064.png rename to assets/corals/fishTile_064.png diff --git a/assets/fishTile_065.png b/assets/corals/fishTile_065.png similarity index 100% rename from assets/fishTile_065.png rename to assets/corals/fishTile_065.png diff --git a/assets/fishTile_066.png b/assets/corals/fishTile_066.png similarity index 100% rename from assets/fishTile_066.png rename to assets/corals/fishTile_066.png diff --git a/assets/fishTile_067.png b/assets/corals/fishTile_067.png similarity index 100% rename from assets/fishTile_067.png rename to assets/corals/fishTile_067.png diff --git a/assets/fishTile_068.png b/assets/corals/fishTile_068.png similarity index 100% rename from assets/fishTile_068.png rename to assets/corals/fishTile_068.png diff --git a/assets/fishTile_069.png b/assets/corals/fishTile_069.png similarity index 100% rename from assets/fishTile_069.png rename to assets/corals/fishTile_069.png diff --git a/assets/fishTile_070.png b/assets/corals/fishTile_070.png similarity index 100% rename from assets/fishTile_070.png rename to assets/corals/fishTile_070.png diff --git a/assets/fishTile_071.png b/assets/corals/fishTile_071.png similarity index 100% rename from assets/fishTile_071.png rename to assets/corals/fishTile_071.png diff --git a/assets/fishTile_017.png b/assets/corals/pink (1).png similarity index 100% rename from assets/fishTile_017.png rename to assets/corals/pink (1).png diff --git a/assets/fishTile_010.png b/assets/corals/pink (2).png similarity index 100% rename from assets/fishTile_010.png rename to assets/corals/pink (2).png diff --git a/assets/fishTile_011.png b/assets/corals/pink (3).png similarity index 100% rename from assets/fishTile_011.png rename to assets/corals/pink (3).png diff --git a/assets/fishTile_012.png b/assets/corals/pink (4).png similarity index 100% rename from assets/fishTile_012.png rename to assets/corals/pink (4).png diff --git a/assets/fishTile_013.png b/assets/corals/pink (5).png similarity index 100% rename from assets/fishTile_013.png rename to assets/corals/pink (5).png diff --git a/assets/fishTile_014.png b/assets/corals/pink (6).png similarity index 100% rename from assets/fishTile_014.png rename to assets/corals/pink (6).png diff --git a/assets/fishTile_015.png b/assets/corals/pink (7).png similarity index 100% rename from assets/fishTile_015.png rename to assets/corals/pink (7).png diff --git a/assets/fishTile_016.png b/assets/corals/pink (8).png similarity index 100% rename from assets/fishTile_016.png rename to assets/corals/pink (8).png diff --git a/assets/fishTile_076.png b/assets/fish/blue.png similarity index 100% rename from assets/fishTile_076.png rename to assets/fish/blue.png diff --git a/assets/fishTile_090.png b/assets/fish/bone.png similarity index 100% rename from assets/fishTile_090.png rename to assets/fish/bone.png diff --git a/assets/fishTile_098.png b/assets/fish/bone_head.png similarity index 100% rename from assets/fishTile_098.png rename to assets/fish/bone_head.png diff --git a/assets/fishTile_096.png b/assets/fish/bone_lg.png similarity index 100% rename from assets/fishTile_096.png rename to assets/fish/bone_lg.png diff --git a/assets/fishTile_094.png b/assets/fish/bone_md.png similarity index 100% rename from assets/fishTile_094.png rename to assets/fish/bone_md.png diff --git a/assets/fishTile_092.png b/assets/fish/bone_sm.png similarity index 100% rename from assets/fishTile_092.png rename to assets/fish/bone_sm.png diff --git a/assets/fishTile_102.png b/assets/fish/eel.png similarity index 100% rename from assets/fishTile_102.png rename to assets/fish/eel.png diff --git a/assets/fishTile_106.png b/assets/fish/eel_lg_1.png similarity index 100% rename from assets/fishTile_106.png rename to assets/fish/eel_lg_1.png diff --git a/assets/fishTile_105.png b/assets/fish/eel_lg_2.png similarity index 100% rename from assets/fishTile_105.png rename to assets/fish/eel_lg_2.png diff --git a/assets/fishTile_072.png b/assets/fish/green.png similarity index 100% rename from assets/fishTile_072.png rename to assets/fish/green.png diff --git a/assets/fishTile_077.png b/assets/fish/ol/blue.png similarity index 100% rename from assets/fishTile_077.png rename to assets/fish/ol/blue.png diff --git a/assets/fishTile_091.png b/assets/fish/ol/bone.png similarity index 100% rename from assets/fishTile_091.png rename to assets/fish/ol/bone.png diff --git a/assets/fishTile_099.png b/assets/fish/ol/bone_head.png similarity index 100% rename from assets/fishTile_099.png rename to assets/fish/ol/bone_head.png diff --git a/assets/fishTile_097.png b/assets/fish/ol/bone_lg.png similarity index 100% rename from assets/fishTile_097.png rename to assets/fish/ol/bone_lg.png diff --git a/assets/fishTile_095.png b/assets/fish/ol/bone_md.png similarity index 100% rename from assets/fishTile_095.png rename to assets/fish/ol/bone_md.png diff --git a/assets/fishTile_093.png b/assets/fish/ol/bone_sm.png similarity index 100% rename from assets/fishTile_093.png rename to assets/fish/ol/bone_sm.png diff --git a/assets/fishTile_103.png b/assets/fish/ol/eel.png similarity index 100% rename from assets/fishTile_103.png rename to assets/fish/ol/eel.png diff --git a/assets/fishTile_104.png b/assets/fish/ol/eel_lg_1.png similarity index 100% rename from assets/fishTile_104.png rename to assets/fish/ol/eel_lg_1.png diff --git a/assets/fishTile_107.png b/assets/fish/ol/eel_lg_2.png similarity index 100% rename from assets/fishTile_107.png rename to assets/fish/ol/eel_lg_2.png diff --git a/assets/fishTile_073.png b/assets/fish/ol/green.png similarity index 100% rename from assets/fishTile_073.png rename to assets/fish/ol/green.png diff --git a/assets/fishTile_081.png b/assets/fish/ol/orange.png similarity index 100% rename from assets/fishTile_081.png rename to assets/fish/ol/orange.png diff --git a/assets/fishTile_075.png b/assets/fish/ol/pink.png similarity index 100% rename from assets/fishTile_075.png rename to assets/fish/ol/pink.png diff --git a/assets/fishTile_101.png b/assets/fish/ol/puff.png similarity index 100% rename from assets/fishTile_101.png rename to assets/fish/ol/puff.png diff --git a/assets/fishTile_079.png b/assets/fish/ol/red.png similarity index 100% rename from assets/fishTile_079.png rename to assets/fish/ol/red.png diff --git a/assets/fishTile_080.png b/assets/fish/orange.png similarity index 100% rename from assets/fishTile_080.png rename to assets/fish/orange.png diff --git a/assets/fishTile_074.png b/assets/fish/pink.png similarity index 100% rename from assets/fishTile_074.png rename to assets/fish/pink.png diff --git a/assets/fishTile_100.png b/assets/fish/puff.png similarity index 100% rename from assets/fishTile_100.png rename to assets/fish/puff.png diff --git a/assets/fishTile_078.png b/assets/fish/red.png similarity index 100% rename from assets/fishTile_078.png rename to assets/fish/red.png diff --git a/assets/fishTile_123.png b/assets/fishTile_123.png deleted file mode 100644 index b507681..0000000 Binary files a/assets/fishTile_123.png and /dev/null differ diff --git a/assets/fishTile_124.png b/assets/fishTile_124.png deleted file mode 100644 index af245a2..0000000 Binary files a/assets/fishTile_124.png and /dev/null differ diff --git a/assets/fishTile_125.png b/assets/fishTile_125.png deleted file mode 100644 index c112a32..0000000 Binary files a/assets/fishTile_125.png and /dev/null differ diff --git a/assets/fishTile_108.png b/assets/font/0.png similarity index 100% rename from assets/fishTile_108.png rename to assets/font/0.png diff --git a/assets/fishTile_109.png b/assets/font/1.png similarity index 100% rename from assets/fishTile_109.png rename to assets/font/1.png diff --git a/assets/fishTile_110.png b/assets/font/2.png similarity index 100% rename from assets/fishTile_110.png rename to assets/font/2.png diff --git a/assets/fishTile_111.png b/assets/font/3.png similarity index 100% rename from assets/fishTile_111.png rename to assets/font/3.png diff --git a/assets/fishTile_112.png b/assets/font/4.png similarity index 100% rename from assets/fishTile_112.png rename to assets/font/4.png diff --git a/assets/fishTile_113.png b/assets/font/5.png similarity index 100% rename from assets/fishTile_113.png rename to assets/font/5.png diff --git a/assets/fishTile_114.png b/assets/font/6.png similarity index 100% rename from assets/fishTile_114.png rename to assets/font/6.png diff --git a/assets/fishTile_115.png b/assets/font/7.png similarity index 100% rename from assets/fishTile_115.png rename to assets/font/7.png diff --git a/assets/fishTile_116.png b/assets/font/8.png similarity index 100% rename from assets/fishTile_116.png rename to assets/font/8.png diff --git a/assets/fishTile_117.png b/assets/font/9.png similarity index 100% rename from assets/fishTile_117.png rename to assets/font/9.png diff --git a/assets/fishTile_122.png b/assets/font/colon.png similarity index 100% rename from assets/fishTile_122.png rename to assets/font/colon.png diff --git a/assets/fishTile_120.png b/assets/font/divide.png similarity index 100% rename from assets/fishTile_120.png rename to assets/font/divide.png diff --git a/assets/fishTile_119.png b/assets/font/dollar.png similarity index 100% rename from assets/fishTile_119.png rename to assets/font/dollar.png diff --git a/assets/fishTile_118.png b/assets/font/percent.png similarity index 100% rename from assets/fishTile_118.png rename to assets/font/percent.png diff --git a/assets/fishTile_121.png b/assets/font/plus.png similarity index 100% rename from assets/fishTile_121.png rename to assets/font/plus.png diff --git a/assets/fishTile_001.png b/assets/sand/fishTile_001.png similarity index 100% rename from assets/fishTile_001.png rename to assets/sand/fishTile_001.png diff --git a/assets/fishTile_002.png b/assets/sand/fishTile_002.png similarity index 100% rename from assets/fishTile_002.png rename to assets/sand/fishTile_002.png diff --git a/assets/fishTile_003.png b/assets/sand/fishTile_003.png similarity index 100% rename from assets/fishTile_003.png rename to assets/sand/fishTile_003.png diff --git a/assets/fishTile_004.png b/assets/sand/fishTile_004.png similarity index 100% rename from assets/fishTile_004.png rename to assets/sand/fishTile_004.png diff --git a/assets/fishTile_005.png b/assets/sand/fishTile_005.png similarity index 100% rename from assets/fishTile_005.png rename to assets/sand/fishTile_005.png diff --git a/assets/fishTile_006.png b/assets/sand/fishTile_006.png similarity index 100% rename from assets/fishTile_006.png rename to assets/sand/fishTile_006.png diff --git a/assets/fishTile_007.png b/assets/sand/fishTile_007.png similarity index 100% rename from assets/fishTile_007.png rename to assets/sand/fishTile_007.png diff --git a/assets/fishTile_008.png b/assets/sand/fishTile_008.png similarity index 100% rename from assets/fishTile_008.png rename to assets/sand/fishTile_008.png diff --git a/assets/fishTile_009.png b/assets/sand/fishTile_009.png similarity index 100% rename from assets/fishTile_009.png rename to assets/sand/fishTile_009.png diff --git a/assets/fishTile_018.png b/assets/sand/fishTile_018.png similarity index 100% rename from assets/fishTile_018.png rename to assets/sand/fishTile_018.png diff --git a/assets/fishTile_019.png b/assets/sand/fishTile_019.png similarity index 100% rename from assets/fishTile_019.png rename to assets/sand/fishTile_019.png diff --git a/assets/fishTile_020.png b/assets/sand/fishTile_020.png similarity index 100% rename from assets/fishTile_020.png rename to assets/sand/fishTile_020.png diff --git a/assets/fishTile_021.png b/assets/sand/fishTile_021.png similarity index 100% rename from assets/fishTile_021.png rename to assets/sand/fishTile_021.png diff --git a/assets/fishTile_022.png b/assets/sand/fishTile_022.png similarity index 100% rename from assets/fishTile_022.png rename to assets/sand/fishTile_022.png diff --git a/assets/fishTile_023.png b/assets/sand/fishTile_023.png similarity index 100% rename from assets/fishTile_023.png rename to assets/sand/fishTile_023.png diff --git a/assets/fishTile_024.png b/assets/sand/fishTile_024.png similarity index 100% rename from assets/fishTile_024.png rename to assets/sand/fishTile_024.png diff --git a/assets/fishTile_025.png b/assets/sand/fishTile_025.png similarity index 100% rename from assets/fishTile_025.png rename to assets/sand/fishTile_025.png diff --git a/assets/fishTile_026.png b/assets/sand/fishTile_026.png similarity index 100% rename from assets/fishTile_026.png rename to assets/sand/fishTile_026.png diff --git a/assets/fishTile_027.png b/assets/sand/fishTile_027.png similarity index 100% rename from assets/fishTile_027.png rename to assets/sand/fishTile_027.png diff --git a/assets/fishTile_036.png b/assets/sand/fishTile_036.png similarity index 100% rename from assets/fishTile_036.png rename to assets/sand/fishTile_036.png diff --git a/assets/fishTile_037.png b/assets/sand/fishTile_037.png similarity index 100% rename from assets/fishTile_037.png rename to assets/sand/fishTile_037.png diff --git a/assets/fishTile_038.png b/assets/sand/fishTile_038.png similarity index 100% rename from assets/fishTile_038.png rename to assets/sand/fishTile_038.png diff --git a/assets/fishTile_039.png b/assets/sand/fishTile_039.png similarity index 100% rename from assets/fishTile_039.png rename to assets/sand/fishTile_039.png diff --git a/assets/fishTile_040.png b/assets/sand/fishTile_040.png similarity index 100% rename from assets/fishTile_040.png rename to assets/sand/fishTile_040.png diff --git a/assets/fishTile_041.png b/assets/sand/fishTile_041.png similarity index 100% rename from assets/fishTile_041.png rename to assets/sand/fishTile_041.png diff --git a/assets/fishTile_042.png b/assets/sand/fishTile_042.png similarity index 100% rename from assets/fishTile_042.png rename to assets/sand/fishTile_042.png diff --git a/assets/fishTile_043.png b/assets/sand/fishTile_043.png similarity index 100% rename from assets/fishTile_043.png rename to assets/sand/fishTile_043.png diff --git a/assets/fishTile_044.png b/assets/sand/fishTile_044.png similarity index 100% rename from assets/fishTile_044.png rename to assets/sand/fishTile_044.png diff --git a/assets/fishTile_045.png b/assets/sand/fishTile_045.png similarity index 100% rename from assets/fishTile_045.png rename to assets/sand/fishTile_045.png diff --git a/assets/fishTile_054.png b/assets/sand/fishTile_054.png similarity index 100% rename from assets/fishTile_054.png rename to assets/sand/fishTile_054.png diff --git a/assets/fishTile_055.png b/assets/sand/fishTile_055.png similarity index 100% rename from assets/fishTile_055.png rename to assets/sand/fishTile_055.png diff --git a/assets/fishTile_056.png b/assets/sand/fishTile_056.png similarity index 100% rename from assets/fishTile_056.png rename to assets/sand/fishTile_056.png diff --git a/assets/fishTile_057.png b/assets/sand/fishTile_057.png similarity index 100% rename from assets/fishTile_057.png rename to assets/sand/fishTile_057.png diff --git a/assets/fishTile_058.png b/assets/sand/fishTile_058.png similarity index 100% rename from assets/fishTile_058.png rename to assets/sand/fishTile_058.png diff --git a/assets/fishTile_059.png b/assets/sand/fishTile_059.png similarity index 100% rename from assets/fishTile_059.png rename to assets/sand/fishTile_059.png diff --git a/assets/fishTile_060.png b/assets/sand/fishTile_060.png similarity index 100% rename from assets/fishTile_060.png rename to assets/sand/fishTile_060.png diff --git a/assets/fishTile_061.png b/assets/sand/fishTile_061.png similarity index 100% rename from assets/fishTile_061.png rename to assets/sand/fishTile_061.png diff --git a/assets/fishTile_062.png b/assets/sand/fishTile_062.png similarity index 100% rename from assets/fishTile_062.png rename to assets/sand/fishTile_062.png diff --git a/assets/fishTile_063.png b/assets/sand/fishTile_063.png similarity index 100% rename from assets/fishTile_063.png rename to assets/sand/fishTile_063.png diff --git a/assets/fishTile_126.png b/assets/sand/fishTile_126.png similarity index 100% rename from assets/fishTile_126.png rename to assets/sand/fishTile_126.png diff --git a/assets/fishTile_028.png b/assets/seagrass/fishTile_028.png similarity index 100% rename from assets/fishTile_028.png rename to assets/seagrass/fishTile_028.png diff --git a/assets/fishTile_029.png b/assets/seagrass/fishTile_029.png similarity index 100% rename from assets/fishTile_029.png rename to assets/seagrass/fishTile_029.png diff --git a/assets/fishTile_030.png b/assets/seagrass/fishTile_030.png similarity index 100% rename from assets/fishTile_030.png rename to assets/seagrass/fishTile_030.png diff --git a/assets/fishTile_031.png b/assets/seagrass/fishTile_031.png similarity index 100% rename from assets/fishTile_031.png rename to assets/seagrass/fishTile_031.png diff --git a/assets/fishTile_048.png b/assets/seagrass/fishTile_048.png similarity index 100% rename from assets/fishTile_048.png rename to assets/seagrass/fishTile_048.png diff --git a/assets/fishTile_049.png b/assets/seagrass/fishTile_049.png similarity index 100% rename from assets/fishTile_049.png rename to assets/seagrass/fishTile_049.png diff --git a/assets/fishTile_032.png b/assets/seagrass/ol/fishTile_032.png similarity index 100% rename from assets/fishTile_032.png rename to assets/seagrass/ol/fishTile_032.png diff --git a/assets/fishTile_033.png b/assets/seagrass/ol/fishTile_033.png similarity index 100% rename from assets/fishTile_033.png rename to assets/seagrass/ol/fishTile_033.png diff --git a/assets/fishTile_034.png b/assets/seagrass/ol/fishTile_034.png similarity index 100% rename from assets/fishTile_034.png rename to assets/seagrass/ol/fishTile_034.png diff --git a/assets/fishTile_035.png b/assets/seagrass/ol/fishTile_035.png similarity index 100% rename from assets/fishTile_035.png rename to assets/seagrass/ol/fishTile_035.png diff --git a/assets/fishTile_052.png b/assets/seagrass/ol/fishTile_052.png similarity index 100% rename from assets/fishTile_052.png rename to assets/seagrass/ol/fishTile_052.png diff --git a/assets/fishTile_053.png b/assets/seagrass/ol/fishTile_053.png similarity index 100% rename from assets/fishTile_053.png rename to assets/seagrass/ol/fishTile_053.png diff --git a/assets/fishTile_082.png b/assets/stones/fishTile_082.png similarity index 100% rename from assets/fishTile_082.png rename to assets/stones/fishTile_082.png diff --git a/assets/fishTile_083.png b/assets/stones/fishTile_083.png similarity index 100% rename from assets/fishTile_083.png rename to assets/stones/fishTile_083.png diff --git a/assets/fishTile_084.png b/assets/stones/fishTile_084.png similarity index 100% rename from assets/fishTile_084.png rename to assets/stones/fishTile_084.png diff --git a/assets/fishTile_085.png b/assets/stones/fishTile_085.png similarity index 100% rename from assets/fishTile_085.png rename to assets/stones/fishTile_085.png diff --git a/assets/fishTile_086.png b/assets/stones/fishTile_086.png similarity index 100% rename from assets/fishTile_086.png rename to assets/stones/fishTile_086.png diff --git a/assets/fishTile_087.png b/assets/stones/fishTile_087.png similarity index 100% rename from assets/fishTile_087.png rename to assets/stones/fishTile_087.png diff --git a/assets/fishTile_088.png b/assets/water/fishTile_088.png similarity index 100% rename from assets/fishTile_088.png rename to assets/water/fishTile_088.png diff --git a/assets/fishTile_089.png b/assets/water/fishTile_089.png similarity index 100% rename from assets/fishTile_089.png rename to assets/water/fishTile_089.png diff --git a/css/app.css b/css/app.css index 881fd1a..e2f46ac 100644 --- a/css/app.css +++ b/css/app.css @@ -51,3 +51,23 @@ body { position: absolute; z-index: 10; } + +.fish img { + max-width: 100%; +} + +.fishyScoreIndicatorWrapper { + height: 10px; + margin-top: -15px; + width: 100%; + background-color: white; + z-index: 50; +} + +.fishyScoreIndicator { + height: 10px; + width: 0%; + margin: 0; + padding: 0; + background-color: greenyellow; +} \ No newline at end of file diff --git a/index.html b/index.html index 7bf7e9f..fea861e 100644 --- a/index.html +++ b/index.html @@ -3,7 +3,7 @@ - fishy + Fishy @@ -11,10 +11,23 @@

- fishy.sprite +
+ fishy.sprite
+
+
+
+
- {{ force }} | {{ pull }} | {{ intervalID }} | {{ fishy ? fishy.position +' '+ fishy.name: '' }}
+ Score: {{ score }}
+ Force: {{ force }}
+ Pulling: {{ pull }}
+ +
PULL
diff --git a/js/app.js b/js/app.js index 0e140e7..2d38159 100644 --- a/js/app.js +++ b/js/app.js @@ -5,38 +5,58 @@ Array.prototype.random = function () { const FishApp = { data() { return { + score: 0, force: 0, pull: false, pullRate: 2, dropRate: 3, - intervalID: null, - fishMovementIntervalID: null, + intervals: { + forceIntervalID: null, + fishMovementIntervalID: null + }, fishy: null, fishies: [ { - name: 'Freddy the fishy', + name: 'Franz the Flying Fishy', strength: 3, quirkyness: 10, - points: 10, + points: 100, position: 0, - sprite: './assets/fishTile_074.png' + sprite: './assets/fish/ol/blue.png' + }, + { + name: 'Paul the Pufferfishy', + strength: 3, + quirkyness: 5, + points: 50, + position: 200, + sprite: './assets/fish/ol/puff.png' + }, + { + name: 'Sandro the Squishyfishy', + strength: 3, + quirkyness: 15, + points: 50, + position: 200, + sprite: './assets/fish/ol/pink.png' } - ] + ], + fishyScore: 0 } }, watch: { pull() { let vue = this; - window.clearInterval(vue.intervalID); + window.clearInterval(vue.intervals.forceIntervalID); if (vue.pull) { - vue.intervalID = setInterval(function () { + vue.intervals.forceIntervalID = setInterval(function () { if (vue.force < 125) { vue.force = Number(vue.force) + vue.pullRate; } }, 50); } else { - vue.intervalID = setInterval(function () { + vue.intervals.forceIntervalID = setInterval(function () { if (vue.force >= 0.0) { vue.force = Number(vue.force) - vue.dropRate; } @@ -48,19 +68,28 @@ const FishApp = { } } }, + computed: { + fishyPosition() { + return this.fishy ? (this.fishy.position / 2) : -200; + }, + fishyInRange() { + return (this.force < (this.fishyPosition + 10) && this.force > (this.fishyPosition -10)); + } + }, methods: { pullRod() { this.force = Number(this.force) + 0.5; }, deployFish() { this.fishy = this.fishies.random(); + this.fishyScore = 20; this.startFishLifecycle(); }, startFishLifecycle() { let vue = this; this.fishy.position = 0; - this.fishMovementIntervalID = setInterval(() => { + this.intervals.fishMovementIntervalID = setInterval(() => { let up = Math.floor(Math.random() * 101) <= 55; if (up) { @@ -74,7 +103,36 @@ const FishApp = { vue.fishy.position = Number(vue.fishy.position) - vue.fishy.quirkyness; } } + + if (vue.fishyScore >= 100) { + vue.fishyCaught(); + } else if (vue.fishyInRange) { + vue.fishyScore++; + } else { + if (vue.fishyScore > 0) { + vue.fishyScore--; + } else { + vue.fishyFled(); + } + } }, 100); + }, + fishyCaught() { + window.clearInterval(this.intervals.fishMovementIntervalID); + + this.score += this.fishy.points; + this.fishy = null; + this.pull = false; + + alert('fischi ist jetzt dein freund'); + }, + fishyFled() { + window.clearInterval(this.intervals.fishMovementIntervalID); + + this.fishy = null; + this.pull = false; + + alert('fischi fort!'); } } };