diff --git a/README.md b/README.md
index 6e8e4c7..85786ba 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# \[Game Name\]
+# Deep Breath
[](https://github.com/Ewpratten/ludum-dare-48/actions/workflows/build.yml)
@@ -9,7 +9,11 @@
[](https://www.rust-lang.org/)
[](https://www.raylib.com/)
-*\[Game Name\]* is a ...
+**Deep Breath** is an exploration game where you explore an underwater cave in hopes of finding your lost transponder. Items and upgrades can be acquired along the way to assist your search.
+
+This game was written in [Rust](https://www.rust-lang.org/), on top of [Rust bindings](https://github.com/deltaphc/raylib-rs) to the [`raylib`](https://github.com/raysan5/raylib) graphics library. For most of the team, this has been our first big Rust project.
+
+This has been our second game produced for Ludum Dare. Check out the first [here](https://ldjam.com/events/ludum-dare/46/micromanaged-mike).
## Development Resources
diff --git a/assets/audio/shopSong.mp3 b/assets/audio/shopSong.mp3
new file mode 100644
index 0000000..b13a1f3
Binary files /dev/null and b/assets/audio/shopSong.mp3 differ
diff --git a/assets/audio/swimSong.mp3 b/assets/audio/swimSong.mp3
new file mode 100644
index 0000000..a9ef7bd
Binary files /dev/null and b/assets/audio/swimSong.mp3 differ
diff --git a/assets/img/enemies/pufferFish.aseprite b/assets/img/enemies/pufferFish.aseprite
new file mode 100644
index 0000000..3ac1d78
Binary files /dev/null and b/assets/img/enemies/pufferFish.aseprite differ
diff --git a/assets/img/enemies/pufferFishAttack.json b/assets/img/enemies/pufferFishAttack.json
new file mode 100644
index 0000000..b87517a
--- /dev/null
+++ b/assets/img/enemies/pufferFishAttack.json
@@ -0,0 +1,50 @@
+{ "frames": {
+ "pufferFish 0.aseprite": {
+ "frame": { "x": 0, "y": 0, "w": 39, "h": 25 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+ "sourceSize": { "w": 39, "h": 25 },
+ "duration": 100
+ },
+ "pufferFish 1.aseprite": {
+ "frame": { "x": 39, "y": 0, "w": 39, "h": 25 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+ "sourceSize": { "w": 39, "h": 25 },
+ "duration": 100
+ },
+ "pufferFish 2.aseprite": {
+ "frame": { "x": 78, "y": 0, "w": 39, "h": 25 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+ "sourceSize": { "w": 39, "h": 25 },
+ "duration": 100
+ },
+ "pufferFish 3.aseprite": {
+ "frame": { "x": 117, "y": 0, "w": 39, "h": 25 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 39, "h": 25 },
+ "sourceSize": { "w": 39, "h": 25 },
+ "duration": 100
+ }
+ },
+ "meta": {
+ "app": "http://www.aseprite.org/",
+ "version": "1.2.27-x64",
+ "image": "pufferFishAttack.png",
+ "format": "RGBA8888",
+ "size": { "w": 156, "h": 25 },
+ "scale": "1",
+ "frameTags": [
+ ],
+ "layers": [
+ { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+ ],
+ "slices": [
+ ]
+ }
+}
diff --git a/assets/img/enemies/pufferFishAttack.png b/assets/img/enemies/pufferFishAttack.png
new file mode 100644
index 0000000..438fb4d
Binary files /dev/null and b/assets/img/enemies/pufferFishAttack.png differ
diff --git a/assets/img/enemies/pufferFishBigIdle.json b/assets/img/enemies/pufferFishBigIdle.json
new file mode 100644
index 0000000..ec1e108
--- /dev/null
+++ b/assets/img/enemies/pufferFishBigIdle.json
@@ -0,0 +1,42 @@
+{ "frames": {
+ "pufferFish 0.aseprite": {
+ "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 1.aseprite": {
+ "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 2.aseprite": {
+ "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ }
+ },
+ "meta": {
+ "app": "http://www.aseprite.org/",
+ "version": "1.2.27-x64",
+ "image": "pufferFishBigIdle.png",
+ "format": "RGBA8888",
+ "size": { "w": 57, "h": 19 },
+ "scale": "1",
+ "frameTags": [
+ ],
+ "layers": [
+ { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+ ],
+ "slices": [
+ ]
+ }
+}
diff --git a/assets/img/enemies/pufferFishBigIdle.png b/assets/img/enemies/pufferFishBigIdle.png
new file mode 100644
index 0000000..961b819
Binary files /dev/null and b/assets/img/enemies/pufferFishBigIdle.png differ
diff --git a/assets/img/enemies/pufferFishExpand.json b/assets/img/enemies/pufferFishExpand.json
new file mode 100644
index 0000000..ebebe6a
--- /dev/null
+++ b/assets/img/enemies/pufferFishExpand.json
@@ -0,0 +1,50 @@
+{ "frames": {
+ "pufferFish 0.aseprite": {
+ "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 1.aseprite": {
+ "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 2.aseprite": {
+ "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 3.aseprite": {
+ "frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ }
+ },
+ "meta": {
+ "app": "http://www.aseprite.org/",
+ "version": "1.2.27-x64",
+ "image": "pufferFishExpand.png",
+ "format": "RGBA8888",
+ "size": { "w": 76, "h": 19 },
+ "scale": "1",
+ "frameTags": [
+ ],
+ "layers": [
+ { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+ ],
+ "slices": [
+ ]
+ }
+}
diff --git a/assets/img/enemies/pufferFishExpand.png b/assets/img/enemies/pufferFishExpand.png
new file mode 100644
index 0000000..e9a70c9
Binary files /dev/null and b/assets/img/enemies/pufferFishExpand.png differ
diff --git a/assets/img/enemies/pufferFishIdle.json b/assets/img/enemies/pufferFishIdle.json
new file mode 100644
index 0000000..9078974
--- /dev/null
+++ b/assets/img/enemies/pufferFishIdle.json
@@ -0,0 +1,66 @@
+{ "frames": {
+ "pufferFish 0.aseprite": {
+ "frame": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 1.aseprite": {
+ "frame": { "x": 19, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 2.aseprite": {
+ "frame": { "x": 38, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 3.aseprite": {
+ "frame": { "x": 57, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 4.aseprite": {
+ "frame": { "x": 76, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ },
+ "pufferFish 5.aseprite": {
+ "frame": { "x": 95, "y": 0, "w": 19, "h": 19 },
+ "rotated": false,
+ "trimmed": false,
+ "spriteSourceSize": { "x": 0, "y": 0, "w": 19, "h": 19 },
+ "sourceSize": { "w": 19, "h": 19 },
+ "duration": 100
+ }
+ },
+ "meta": {
+ "app": "http://www.aseprite.org/",
+ "version": "1.2.27-x64",
+ "image": "pufferFish.png",
+ "format": "RGBA8888",
+ "size": { "w": 114, "h": 19 },
+ "scale": "1",
+ "frameTags": [
+ ],
+ "layers": [
+ { "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
+ ],
+ "slices": [
+ ]
+ }
+}
diff --git a/assets/img/enemies/pufferFishIdle.png b/assets/img/enemies/pufferFishIdle.png
new file mode 100644
index 0000000..2b6dad9
Binary files /dev/null and b/assets/img/enemies/pufferFishIdle.png differ
diff --git a/assets/img/logos/readme-54.png b/assets/img/logos/readme-54.png
new file mode 100644
index 0000000..97f845b
Binary files /dev/null and b/assets/img/logos/readme-54.png differ
diff --git a/assets/img/logos/readme.png b/assets/img/logos/readme.png
index c86b506..d6fda2f 100644
Binary files a/assets/img/logos/readme.png and b/assets/img/logos/readme.png differ
diff --git a/assets/img/map/cave.json b/assets/img/map/cave.json
index 3fdba6c..e23cf7a 100644
--- a/assets/img/map/cave.json
+++ b/assets/img/map/cave.json
@@ -1 +1 @@
-[{"x":95,"y":25,"width":190,"height":50},{"x":500,"y":30,"width":440,"height":60},{"x":90,"y":80,"width":180,"height":60},{"x":305,"y":70,"width":10,"height":20},{"x":525,"y":65,"width":390,"height":10},{"x":530,"y":75,"width":380,"height":10},{"x":385,"y":85,"width":10,"height":10},{"x":435,"y":85,"width":30,"height":10},{"x":470,"y":85,"width":20,"height":10},{"x":615,"y":85,"width":210,"height":10},{"x":190,"y":95,"width":20,"height":10},{"x":435,"y":95,"width":10,"height":10},{"x":475,"y":100,"width":10,"height":20},{"x":525,"y":100,"width":10,"height":20},{"x":640,"y":95,"width":160,"height":10},{"x":200,"y":105,"width":20,"height":10},{"x":500,"y":105,"width":20,"height":10},{"x":575,"y":105,"width":30,"height":10},{"x":660,"y":105,"width":120,"height":10},{"x":75,"y":170,"width":150,"height":120},{"x":175,"y":120,"width":10,"height":20},{"x":205,"y":115,"width":10,"height":10},{"x":495,"y":120,"width":10,"height":20},{"x":520,"y":115,"width":20,"height":10},{"x":585,"y":130,"width":10,"height":40},{"x":665,"y":115,"width":110,"height":10},{"x":155,"y":125,"width":10,"height":10},{"x":190,"y":125,"width":20,"height":10},{"x":505,"y":130,"width":10,"height":20},{"x":525,"y":125,"width":10,"height":10},{"x":660,"y":125,"width":120,"height":10},{"x":185,"y":135,"width":50,"height":10},{"x":520,"y":135,"width":20,"height":10},{"x":595,"y":135,"width":10,"height":10},{"x":665,"y":135,"width":110,"height":10},{"x":155,"y":145,"width":10,"height":10},{"x":220,"y":145,"width":20,"height":10},{"x":670,"y":145,"width":100,"height":10},{"x":155,"y":155,"width":10,"height":10},{"x":190,"y":155,"width":40,"height":10},{"x":225,"y":155,"width":10,"height":10},{"x":355,"y":160,"width":10,"height":20},{"x":645,"y":155,"width":150,"height":10},{"x":200,"y":165,"width":100,"height":10},{"x":565,"y":170,"width":10,"height":20},{"x":600,"y":175,"width":20,"height":30},{"x":670,"y":165,"width":100,"height":10},{"x":210,"y":175,"width":120,"height":10},{"x":345,"y":175,"width":50,"height":10},{"x":415,"y":175,"width":10,"height":10},{"x":575,"y":180,"width":10,"height":20},{"x":665,"y":175,"width":110,"height":10},{"x":285,"y":185,"width":270,"height":10},{"x":545,"y":185,"width":30,"height":10},{"x":665,"y":185,"width":110,"height":10},{"x":295,"y":195,"width":290,"height":10},{"x":525,"y":195,"width":10,"height":10},{"x":630,"y":195,"width":180,"height":10},{"x":305,"y":205,"width":310,"height":10},{"x":545,"y":210,"width":10,"height":20},{"x":640,"y":205,"width":160,"height":10},{"x":185,"y":215,"width":70,"height":10},{"x":355,"y":215,"width":230,"height":10},{"x":555,"y":215,"width":10,"height":10},{"x":645,"y":215,"width":150,"height":10},{"x":160,"y":225,"width":20,"height":10},{"x":270,"y":225,"width":20,"height":10},{"x":380,"y":225,"width":180,"height":10},{"x":660,"y":225,"width":120,"height":10},{"x":70,"y":255,"width":140,"height":50},{"x":410,"y":235,"width":120,"height":10},{"x":665,"y":240,"width":110,"height":20},{"x":385,"y":245,"width":70,"height":10},{"x":590,"y":255,"width":20,"height":30},{"x":390,"y":255,"width":20,"height":10},{"x":670,"y":260,"width":100,"height":20},{"x":605,"y":265,"width":10,"height":10},{"x":655,"y":295,"width":130,"height":50},{"x":65,"y":285,"width":130,"height":10},{"x":60,"y":295,"width":120,"height":10},{"x":55,"y":305,"width":110,"height":10},{"x":410,"y":315,"width":20,"height":30},{"x":50,"y":365,"width":100,"height":110},{"x":510,"y":320,"width":40,"height":20},{"x":355,"y":325,"width":10,"height":10},{"x":650,"y":330,"width":140,"height":20},{"x":285,"y":335,"width":30,"height":10},{"x":380,"y":335,"width":100,"height":10},{"x":515,"y":350,"width":70,"height":40},{"x":340,"y":345,"width":160,"height":10},{"x":635,"y":345,"width":170,"height":10},{"x":335,"y":355,"width":170,"height":10},{"x":635,"y":355,"width":170,"height":10},{"x":330,"y":365,"width":180,"height":10},{"x":560,"y":370,"width":20,"height":20},{"x":650,"y":370,"width":140,"height":20},{"x":325,"y":375,"width":190,"height":10},{"x":485,"y":375,"width":10,"height":10},{"x":520,"y":375,"width":40,"height":10},{"x":285,"y":385,"width":110,"height":10},{"x":395,"y":385,"width":10,"height":10},{"x":515,"y":385,"width":10,"height":10},{"x":660,"y":395,"width":120,"height":30},{"x":105,"y":395,"width":10,"height":10},{"x":285,"y":400,"width":130,"height":20},{"x":580,"y":405,"width":20,"height":30},{"x":525,"y":405,"width":10,"height":10},{"x":170,"y":430,"width":20,"height":40},{"x":295,"y":425,"width":130,"height":30},{"x":520,"y":415,"width":20,"height":10},{"x":655,"y":415,"width":130,"height":10},{"x":45,"y":625,"width":90,"height":410},{"x":505,"y":425,"width":30,"height":10},{"x":650,"y":430,"width":140,"height":20},{"x":185,"y":435,"width":10,"height":10},{"x":375,"y":435,"width":30,"height":10},{"x":430,"y":435,"width":40,"height":10},{"x":495,"y":450,"width":10,"height":40},{"x":185,"y":445,"width":10,"height":10},{"x":245,"y":455,"width":30,"height":30},{"x":360,"y":445,"width":180,"height":10},{"x":530,"y":445,"width":20,"height":10},{"x":665,"y":445,"width":110,"height":10},{"x":180,"y":485,"width":20,"height":70},{"x":215,"y":460,"width":10,"height":20},{"x":305,"y":455,"width":90,"height":10},{"x":420,"y":455,"width":80,"height":10},{"x":535,"y":460,"width":10,"height":20},{"x":660,"y":465,"width":120,"height":30},{"x":305,"y":465,"width":90,"height":10},{"x":365,"y":470,"width":10,"height":20},{"x":385,"y":465,"width":10,"height":10},{"x":440,"y":470,"width":40,"height":20},{"x":505,"y":475,"width":10,"height":30},{"x":260,"y":475,"width":80,"height":10},{"x":330,"y":475,"width":40,"height":10},{"x":380,"y":475,"width":20,"height":10},{"x":520,"y":475,"width":20,"height":10},{"x":265,"y":485,"width":70,"height":10},{"x":315,"y":495,"width":10,"height":30},{"x":435,"y":485,"width":30,"height":10},{"x":515,"y":485,"width":10,"height":10},{"x":650,"y":485,"width":140,"height":10},{"x":265,"y":495,"width":50,"height":10},{"x":640,"y":505,"width":160,"height":30},{"x":195,"y":505,"width":10,"height":10},{"x":280,"y":510,"width":20,"height":20},{"x":195,"y":515,"width":10,"height":10},{"x":190,"y":535,"width":20,"height":30},{"x":580,"y":525,"width":20,"height":10},{"x":660,"y":535,"width":120,"height":30},{"x":575,"y":535,"width":10,"height":10},{"x":185,"y":555,"width":30,"height":10},{"x":320,"y":570,"width":20,"height":40},{"x":430,"y":565,"width":20,"height":30},{"x":650,"y":555,"width":140,"height":10},{"x":180,"y":580,"width":20,"height":40},{"x":450,"y":565,"width":20,"height":10},{"x":645,"y":565,"width":150,"height":10},{"x":95,"y":575,"width":10,"height":10},{"x":285,"y":580,"width":30,"height":20},{"x":335,"y":575,"width":10,"height":10},{"x":450,"y":575,"width":20,"height":10},{"x":660,"y":595,"width":120,"height":50},{"x":100,"y":585,"width":20,"height":10},{"x":195,"y":585,"width":10,"height":10},{"x":240,"y":595,"width":20,"height":30},{"x":335,"y":585,"width":10,"height":10},{"x":445,"y":585,"width":30,"height":10},{"x":100,"y":595,"width":20,"height":10},{"x":195,"y":595,"width":10,"height":10},{"x":340,"y":595,"width":40,"height":10},{"x":430,"y":600,"width":20,"height":20},{"x":100,"y":605,"width":20,"height":10},{"x":350,"y":605,"width":20,"height":10},{"x":340,"y":630,"width":20,"height":20},{"x":665,"y":630,"width":110,"height":20},{"x":280,"y":655,"width":20,"height":50},{"x":400,"y":645,"width":20,"height":30},{"x":430,"y":635,"width":20,"height":10},{"x":540,"y":650,"width":20,"height":40},{"x":430,"y":645,"width":40,"height":10},{"x":670,"y":650,"width":100,"height":20},{"x":310,"y":655,"width":40,"height":10},{"x":435,"y":655,"width":50,"height":10},{"x":375,"y":665,"width":170,"height":10},{"x":665,"y":675,"width":110,"height":30},{"x":350,"y":675,"width":100,"height":10},{"x":440,"y":675,"width":40,"height":10},{"x":310,"y":685,"width":20,"height":10},{"x":550,"y":685,"width":20,"height":10},{"x":545,"y":700,"width":30,"height":20},{"x":660,"y":700,"width":120,"height":20},{"x":205,"y":710,"width":10,"height":20},{"x":220,"y":715,"width":20,"height":10},{"x":270,"y":715,"width":20,"height":10},{"x":540,"y":715,"width":20,"height":10},{"x":655,"y":735,"width":130,"height":50},{"x":200,"y":725,"width":60,"height":10},{"x":260,"y":725,"width":20,"height":10},{"x":195,"y":735,"width":150,"height":10},{"x":205,"y":760,"width":190,"height":40},{"x":335,"y":745,"width":10,"height":10},{"x":320,"y":755,"width":40,"height":10},{"x":95,"y":765,"width":10,"height":10},{"x":320,"y":765,"width":40,"height":10},{"x":650,"y":765,"width":140,"height":10},{"x":95,"y":775,"width":10,"height":10},{"x":330,"y":775,"width":60,"height":10},{"x":470,"y":810,"width":20,"height":80},{"x":545,"y":830,"width":10,"height":120},{"x":655,"y":820,"width":130,"height":100},{"x":95,"y":785,"width":10,"height":10},{"x":125,"y":785,"width":30,"height":10},{"x":185,"y":790,"width":10,"height":20},{"x":310,"y":785,"width":100,"height":10},{"x":485,"y":785,"width":10,"height":10},{"x":95,"y":795,"width":10,"height":10},{"x":125,"y":800,"width":10,"height":20},{"x":320,"y":795,"width":80,"height":10},{"x":485,"y":795,"width":10,"height":10},{"x":95,"y":805,"width":10,"height":10},{"x":330,"y":805,"width":60,"height":10},{"x":495,"y":805,"width":30,"height":10},{"x":95,"y":815,"width":10,"height":10},{"x":340,"y":830,"width":40,"height":40},{"x":495,"y":815,"width":30,"height":10},{"x":365,"y":825,"width":10,"height":10},{"x":495,"y":825,"width":30,"height":10},{"x":40,"y":980,"width":80,"height":300},{"x":380,"y":835,"width":40,"height":10},{"x":495,"y":835,"width":30,"height":10},{"x":385,"y":845,"width":50,"height":10},{"x":495,"y":845,"width":30,"height":10},{"x":360,"y":855,"width":100,"height":10},{"x":480,"y":855,"width":20,"height":10},{"x":350,"y":865,"width":120,"height":10},{"x":475,"y":870,"width":10,"height":20},{"x":90,"y":875,"width":20,"height":10},{"x":345,"y":875,"width":130,"height":10},{"x":660,"y":895,"width":120,"height":50},{"x":90,"y":885,"width":20,"height":10},{"x":320,"y":885,"width":120,"height":10},{"x":90,"y":895,"width":20,"height":10},{"x":265,"y":900,"width":10,"height":20},{"x":330,"y":895,"width":100,"height":10},{"x":540,"y":895,"width":20,"height":10},{"x":575,"y":905,"width":10,"height":30},{"x":90,"y":905,"width":20,"height":10},{"x":325,"y":905,"width":110,"height":10},{"x":510,"y":905,"width":60,"height":10},{"x":90,"y":915,"width":20,"height":10},{"x":320,"y":915,"width":100,"height":10},{"x":480,"y":915,"width":20,"height":10},{"x":90,"y":925,"width":20,"height":10},{"x":305,"y":925,"width":110,"height":10},{"x":470,"y":925,"width":20,"height":10},{"x":530,"y":925,"width":40,"height":10},{"x":570,"y":925,"width":20,"height":10},{"x":655,"y":1005,"width":130,"height":170},{"x":90,"y":935,"width":20,"height":10},{"x":295,"y":940,"width":110,"height":20},{"x":460,"y":935,"width":20,"height":10},{"x":505,"y":935,"width":30,"height":10},{"x":565,"y":935,"width":10,"height":10},{"x":90,"y":945,"width":20,"height":10},{"x":450,"y":945,"width":20,"height":10},{"x":560,"y":945,"width":20,"height":10},{"x":90,"y":955,"width":20,"height":10},{"x":255,"y":960,"width":50,"height":20},{"x":325,"y":955,"width":50,"height":10},{"x":400,"y":955,"width":20,"height":10},{"x":445,"y":955,"width":10,"height":10},{"x":555,"y":955,"width":10,"height":10},{"x":90,"y":965,"width":20,"height":10},{"x":330,"y":965,"width":40,"height":10},{"x":390,"y":965,"width":20,"height":10},{"x":435,"y":965,"width":10,"height":10},{"x":550,"y":965,"width":20,"height":10},{"x":90,"y":975,"width":20,"height":10},{"x":250,"y":980,"width":60,"height":20},{"x":295,"y":975,"width":10,"height":10},{"x":340,"y":980,"width":20,"height":20},{"x":385,"y":985,"width":10,"height":30},{"x":540,"y":975,"width":20,"height":10},{"x":100,"y":985,"width":40,"height":10},{"x":305,"y":990,"width":10,"height":20},{"x":470,"y":985,"width":20,"height":10},{"x":525,"y":985,"width":30,"height":10},{"x":105,"y":995,"width":50,"height":10},{"x":250,"y":995,"width":80,"height":10},{"x":330,"y":995,"width":40,"height":10},{"x":445,"y":1000,"width":10,"height":20},{"x":465,"y":1040,"width":10,"height":100},{"x":515,"y":995,"width":10,"height":10},{"x":105,"y":1005,"width":50,"height":10},{"x":270,"y":1005,"width":160,"height":10},{"x":395,"y":1010,"width":10,"height":20},{"x":510,"y":1005,"width":20,"height":10},{"x":125,"y":1015,"width":90,"height":10},{"x":240,"y":1015,"width":80,"height":10},{"x":315,"y":1020,"width":50,"height":20},{"x":405,"y":1045,"width":10,"height":70},{"x":440,"y":1015,"width":20,"height":10},{"x":505,"y":1015,"width":10,"height":10},{"x":125,"y":1025,"width":90,"height":10},{"x":230,"y":1025,"width":60,"height":10},{"x":435,"y":1055,"width":10,"height":70},{"x":555,"y":1055,"width":10,"height":70},{"x":130,"y":1035,"width":100,"height":10},{"x":235,"y":1035,"width":50,"height":10},{"x":305,"y":1035,"width":50,"height":10},{"x":385,"y":1035,"width":10,"height":10},{"x":130,"y":1045,"width":100,"height":10},{"x":235,"y":1050,"width":30,"height":20},{"x":290,"y":1045,"width":60,"height":10},{"x":380,"y":1045,"width":20,"height":10},{"x":135,"y":1055,"width":110,"height":10},{"x":280,"y":1055,"width":60,"height":10},{"x":370,"y":1055,"width":20,"height":10},{"x":135,"y":1065,"width":110,"height":10},{"x":265,"y":1065,"width":70,"height":10},{"x":365,"y":1065,"width":10,"height":10},{"x":140,"y":1075,"width":120,"height":10},{"x":260,"y":1075,"width":60,"height":10},{"x":360,"y":1075,"width":20,"height":10},{"x":145,"y":1085,"width":130,"height":10},{"x":255,"y":1085,"width":50,"height":10},{"x":355,"y":1090,"width":10,"height":20},{"x":400,"y":1085,"width":20,"height":10},{"x":145,"y":1095,"width":130,"height":10},{"x":255,"y":1095,"width":30,"height":10},{"x":425,"y":1100,"width":10,"height":20},{"x":455,"y":1095,"width":10,"height":10},{"x":550,"y":1095,"width":20,"height":10},{"x":660,"y":1100,"width":120,"height":20},{"x":145,"y":1105,"width":130,"height":10},{"x":350,"y":1105,"width":20,"height":10},{"x":545,"y":1105,"width":10,"height":10},{"x":150,"y":1115,"width":140,"height":10},{"x":345,"y":1115,"width":10,"height":10},{"x":420,"y":1115,"width":20,"height":10},{"x":540,"y":1115,"width":20,"height":10},{"x":665,"y":1120,"width":110,"height":20},{"x":105,"y":1125,"width":50,"height":10},{"x":145,"y":1130,"width":10,"height":20},{"x":415,"y":1125,"width":10,"height":10},{"x":535,"y":1125,"width":10,"height":10},{"x":35,"y":1355,"width":70,"height":450},{"x":530,"y":1135,"width":20,"height":10},{"x":660,"y":1145,"width":120,"height":30},{"x":280,"y":1145,"width":20,"height":10},{"x":525,"y":1145,"width":10,"height":10},{"x":280,"y":1155,"width":40,"height":10},{"x":75,"y":1165,"width":10,"height":10},{"x":275,"y":1170,"width":30,"height":20},{"x":655,"y":1175,"width":130,"height":30},{"x":75,"y":1175,"width":10,"height":10},{"x":295,"y":1175,"width":10,"height":10},{"x":80,"y":1185,"width":20,"height":10},{"x":275,"y":1185,"width":50,"height":10},{"x":80,"y":1195,"width":20,"height":10},{"x":265,"y":1195,"width":50,"height":10},{"x":650,"y":1210,"width":140,"height":40},{"x":80,"y":1205,"width":20,"height":10},{"x":255,"y":1215,"width":70,"height":30},{"x":80,"y":1215,"width":20,"height":10},{"x":490,"y":1215,"width":20,"height":10},{"x":80,"y":1225,"width":20,"height":10},{"x":480,"y":1235,"width":40,"height":30},{"x":535,"y":1225,"width":10,"height":10},{"x":80,"y":1235,"width":20,"height":10},{"x":250,"y":1235,"width":60,"height":10},{"x":535,"y":1255,"width":30,"height":50},{"x":655,"y":1250,"width":130,"height":40},{"x":80,"y":1245,"width":20,"height":10},{"x":235,"y":1245,"width":70,"height":10},{"x":80,"y":1255,"width":20,"height":10},{"x":225,"y":1255,"width":70,"height":10},{"x":475,"y":1280,"width":30,"height":60},{"x":505,"y":1270,"width":10,"height":40},{"x":80,"y":1265,"width":20,"height":10},{"x":220,"y":1265,"width":60,"height":10},{"x":435,"y":1265,"width":30,"height":10},{"x":555,"y":1265,"width":10,"height":10},{"x":80,"y":1275,"width":20,"height":10},{"x":210,"y":1275,"width":60,"height":10},{"x":300,"y":1275,"width":20,"height":10},{"x":415,"y":1285,"width":70,"height":30},{"x":555,"y":1275,"width":10,"height":10},{"x":645,"y":1275,"width":150,"height":10},{"x":80,"y":1285,"width":20,"height":10},{"x":205,"y":1285,"width":70,"height":10},{"x":295,"y":1285,"width":30,"height":10},{"x":545,"y":1305,"width":30,"height":50},{"x":655,"y":1295,"width":130,"height":30},{"x":80,"y":1295,"width":20,"height":10},{"x":175,"y":1295,"width":10,"height":10},{"x":210,"y":1295,"width":40,"height":10},{"x":290,"y":1300,"width":40,"height":20},{"x":500,"y":1295,"width":20,"height":10},{"x":80,"y":1305,"width":20,"height":10},{"x":190,"y":1305,"width":80,"height":10},{"x":435,"y":1305,"width":30,"height":10},{"x":500,"y":1305,"width":20,"height":10},{"x":80,"y":1315,"width":20,"height":10},{"x":185,"y":1315,"width":70,"height":10},{"x":285,"y":1320,"width":50,"height":20},{"x":490,"y":1315,"width":40,"height":10},{"x":660,"y":1320,"width":120,"height":20},{"x":80,"y":1325,"width":20,"height":10},{"x":175,"y":1325,"width":70,"height":10},{"x":485,"y":1345,"width":30,"height":50},{"x":80,"y":1335,"width":20,"height":10},{"x":170,"y":1335,"width":60,"height":10},{"x":280,"y":1345,"width":80,"height":30},{"x":655,"y":1335,"width":130,"height":10},{"x":80,"y":1345,"width":20,"height":10},{"x":165,"y":1345,"width":50,"height":10},{"x":395,"y":1360,"width":30,"height":40},{"x":525,"y":1350,"width":10,"height":20},{"x":650,"y":1355,"width":140,"height":30},{"x":75,"y":1355,"width":10,"height":10},{"x":160,"y":1355,"width":40,"height":10},{"x":540,"y":1355,"width":20,"height":10},{"x":75,"y":1365,"width":10,"height":10},{"x":165,"y":1365,"width":30,"height":10},{"x":260,"y":1365,"width":60,"height":10},{"x":415,"y":1365,"width":10,"height":10},{"x":535,"y":1365,"width":70,"height":10},{"x":75,"y":1375,"width":10,"height":10},{"x":255,"y":1380,"width":70,"height":20},{"x":415,"y":1375,"width":10,"height":10},{"x":585,"y":1375,"width":270,"height":10},{"x":75,"y":1385,"width":10,"height":10},{"x":405,"y":1395,"width":30,"height":30},{"x":580,"y":1385,"width":280,"height":10},{"x":75,"y":1395,"width":10,"height":10},{"x":245,"y":1395,"width":90,"height":10},{"x":570,"y":1395,"width":300,"height":10},{"x":75,"y":1405,"width":10,"height":10},{"x":250,"y":1425,"width":80,"height":50},{"x":570,"y":1405,"width":300,"height":10},{"x":75,"y":1415,"width":10,"height":10},{"x":295,"y":1415,"width":10,"height":10},{"x":335,"y":1420,"width":10,"height":20},{"x":560,"y":1470,"width":320,"height":120},{"x":75,"y":1425,"width":10,"height":10},{"x":305,"y":1425,"width":30,"height":10},{"x":365,"y":1425,"width":10,"height":10},{"x":75,"y":1435,"width":10,"height":10},{"x":340,"y":1435,"width":100,"height":10},{"x":75,"y":1445,"width":10,"height":10},{"x":340,"y":1445,"width":100,"height":10},{"x":75,"y":1455,"width":10,"height":10},{"x":305,"y":1465,"width":170,"height":30},{"x":110,"y":1465,"width":80,"height":10},{"x":110,"y":1475,"width":80,"height":10},{"x":110,"y":1485,"width":80,"height":10},{"x":240,"y":1485,"width":40,"height":10},{"x":330,"y":1485,"width":120,"height":10},{"x":115,"y":1495,"width":90,"height":10},{"x":245,"y":1495,"width":30,"height":10},{"x":335,"y":1495,"width":110,"height":10},{"x":115,"y":1505,"width":90,"height":10},{"x":250,"y":1505,"width":20,"height":10},{"x":345,"y":1505,"width":90,"height":10},{"x":115,"y":1515,"width":90,"height":10},{"x":350,"y":1515,"width":40,"height":10},{"x":115,"y":1525,"width":90,"height":10},{"x":360,"y":1525,"width":40,"height":10},{"x":80,"y":1535,"width":20,"height":10},{"x":135,"y":1535,"width":70,"height":10},{"x":350,"y":1535,"width":20,"height":10},{"x":565,"y":1545,"width":310,"height":30},{"x":80,"y":1545,"width":20,"height":10},{"x":145,"y":1545,"width":50,"height":10},{"x":345,"y":1545,"width":10,"height":10},{"x":75,"y":1555,"width":10,"height":10},{"x":160,"y":1555,"width":40,"height":10},{"x":75,"y":1565,"width":10,"height":10},{"x":495,"y":1565,"width":130,"height":10},{"x":650,"y":1575,"width":140,"height":30},{"x":75,"y":1575,"width":10,"height":10},{"x":495,"y":1575,"width":110,"height":10},{"x":25,"y":1870,"width":50,"height":580},{"x":510,"y":1590,"width":20,"height":20},{"x":55,"y":1595,"width":10,"height":10},{"x":660,"y":1620,"width":120,"height":60},{"x":55,"y":1605,"width":10,"height":10},{"x":505,"y":1605,"width":10,"height":10},{"x":55,"y":1615,"width":10,"height":10},{"x":60,"y":1625,"width":20,"height":10},{"x":65,"y":1635,"width":30,"height":10},{"x":65,"y":1645,"width":30,"height":10},{"x":275,"y":1645,"width":30,"height":10},{"x":65,"y":1655,"width":30,"height":10},{"x":270,"y":1655,"width":40,"height":10},{"x":655,"y":1710,"width":130,"height":120},{"x":65,"y":1665,"width":30,"height":10},{"x":260,"y":1680,"width":60,"height":40},{"x":65,"y":1675,"width":30,"height":10},{"x":300,"y":1675,"width":20,"height":10},{"x":65,"y":1685,"width":30,"height":10},{"x":310,"y":1690,"width":20,"height":20},{"x":65,"y":1695,"width":30,"height":10},{"x":70,"y":1705,"width":40,"height":10},{"x":265,"y":1705,"width":90,"height":10},{"x":405,"y":1705,"width":10,"height":10},{"x":70,"y":1715,"width":40,"height":10},{"x":245,"y":1725,"width":90,"height":30},{"x":410,"y":1715,"width":40,"height":10},{"x":445,"y":1715,"width":10,"height":10},{"x":70,"y":1725,"width":40,"height":10},{"x":405,"y":1725,"width":90,"height":10},{"x":70,"y":1735,"width":40,"height":10},{"x":395,"y":1735,"width":110,"height":10},{"x":70,"y":1745,"width":40,"height":10},{"x":235,"y":1745,"width":110,"height":10},{"x":390,"y":1745,"width":120,"height":10},{"x":70,"y":1755,"width":40,"height":10},{"x":225,"y":1760,"width":110,"height":20},{"x":395,"y":1760,"width":150,"height":20},{"x":75,"y":1765,"width":50,"height":10},{"x":75,"y":1775,"width":50,"height":10},{"x":205,"y":1775,"width":110,"height":10},{"x":385,"y":1775,"width":130,"height":10},{"x":660,"y":1785,"width":120,"height":30},{"x":75,"y":1785,"width":50,"height":10},{"x":200,"y":1785,"width":120,"height":10},{"x":370,"y":1790,"width":100,"height":20},{"x":75,"y":1795,"width":50,"height":10},{"x":190,"y":1800,"width":100,"height":20},{"x":75,"y":1805,"width":50,"height":10},{"x":355,"y":1805,"width":70,"height":10},{"x":405,"y":1815,"width":10,"height":30},{"x":665,"y":1840,"width":110,"height":80},{"x":75,"y":1815,"width":50,"height":10},{"x":180,"y":1820,"width":80,"height":20},{"x":340,"y":1815,"width":100,"height":10},{"x":530,"y":1815,"width":20,"height":10},{"x":75,"y":1825,"width":50,"height":10},{"x":330,"y":1825,"width":120,"height":10},{"x":535,"y":1835,"width":10,"height":30},{"x":75,"y":1835,"width":50,"height":10},{"x":170,"y":1840,"width":60,"height":20},{"x":315,"y":1835,"width":130,"height":10},{"x":395,"y":1835,"width":10,"height":10},{"x":475,"y":1835,"width":10,"height":10},{"x":75,"y":1845,"width":50,"height":10},{"x":300,"y":1845,"width":160,"height":10},{"x":500,"y":1845,"width":40,"height":10},{"x":70,"y":1855,"width":40,"height":10},{"x":295,"y":1860,"width":170,"height":20},{"x":485,"y":1885,"width":10,"height":70},{"x":525,"y":1855,"width":30,"height":10},{"x":65,"y":1865,"width":30,"height":10},{"x":525,"y":1865,"width":70,"height":10},{"x":65,"y":1875,"width":30,"height":10},{"x":270,"y":1880,"width":140,"height":20},{"x":530,"y":1875,"width":80,"height":10},{"x":65,"y":1885,"width":30,"height":10},{"x":530,"y":1885,"width":80,"height":10},{"x":660,"y":1900,"width":120,"height":40},{"x":65,"y":1895,"width":30,"height":10},{"x":260,"y":1895,"width":120,"height":10},{"x":530,"y":1895,"width":80,"height":10},{"x":65,"y":1905,"width":30,"height":10},{"x":255,"y":1910,"width":110,"height":20},{"x":530,"y":1905,"width":80,"height":10},{"x":65,"y":1915,"width":30,"height":10},{"x":530,"y":1915,"width":80,"height":10},{"x":65,"y":1925,"width":30,"height":10},{"x":250,"y":1925,"width":100,"height":10},{"x":315,"y":1935,"width":10,"height":30},{"x":430,"y":1925,"width":60,"height":10},{"x":525,"y":1940,"width":70,"height":40},{"x":655,"y":1980,"width":130,"height":120},{"x":65,"y":1935,"width":30,"height":10},{"x":245,"y":1940,"width":110,"height":20},{"x":435,"y":1935,"width":50,"height":10},{"x":65,"y":1945,"width":30,"height":10},{"x":425,"y":1950,"width":30,"height":20},{"x":455,"y":1950,"width":10,"height":20},{"x":65,"y":1955,"width":30,"height":10},{"x":245,"y":1955,"width":130,"height":10},{"x":65,"y":1965,"width":30,"height":10},{"x":235,"y":1970,"width":110,"height":20},{"x":305,"y":1970,"width":10,"height":20},{"x":390,"y":1965,"width":20,"height":10},{"x":435,"y":1965,"width":30,"height":10},{"x":65,"y":1975,"width":30,"height":10},{"x":385,"y":1980,"width":10,"height":20},{"x":435,"y":1975,"width":50,"height":10},{"x":65,"y":1985,"width":30,"height":10},{"x":225,"y":2010,"width":90,"height":60},{"x":295,"y":1985,"width":10,"height":10},{"x":65,"y":1995,"width":30,"height":10},{"x":290,"y":1995,"width":20,"height":10},{"x":70,"y":2005,"width":40,"height":10},{"x":285,"y":2010,"width":10,"height":20},{"x":70,"y":2015,"width":40,"height":10},{"x":75,"y":2025,"width":50,"height":10},{"x":275,"y":2025,"width":10,"height":10},{"x":75,"y":2035,"width":50,"height":10},{"x":275,"y":2035,"width":10,"height":10},{"x":75,"y":2045,"width":50,"height":10},{"x":215,"y":2065,"width":70,"height":50},{"x":660,"y":2045,"width":120,"height":10},{"x":80,"y":2055,"width":60,"height":10},{"x":655,"y":2065,"width":130,"height":30},{"x":85,"y":2065,"width":70,"height":10},{"x":400,"y":2065,"width":140,"height":10},{"x":90,"y":2075,"width":80,"height":10},{"x":395,"y":2075,"width":170,"height":10},{"x":95,"y":2085,"width":90,"height":10},{"x":395,"y":2085,"width":210,"height":10},{"x":615,"y":2085,"width":210,"height":10},{"x":160,"y":2095,"width":220,"height":10},{"x":500,"y":2095,"width":440,"height":10},{"x":385,"y":2105,"width":670,"height":10},{"x":385,"y":2115,"width":670,"height":10},{"x":385,"y":2125,"width":670,"height":10},{"x":385,"y":2135,"width":670,"height":10},{"x":385,"y":2145,"width":670,"height":10},{"x":385,"y":2155,"width":670,"height":10}]
+[{"x":360,"y":15,"width":720,"height":30},{"x":50,"y":35,"width":100,"height":10},{"x":425,"y":35,"width":590,"height":10},{"x":45,"y":65,"width":90,"height":50},{"x":430,"y":50,"width":580,"height":20},{"x":220,"y":65,"width":160,"height":10},{"x":315,"y":65,"width":10,"height":10},{"x":345,"y":70,"width":10,"height":20},{"x":390,"y":70,"width":20,"height":20},{"x":420,"y":65,"width":20,"height":10},{"x":465,"y":70,"width":10,"height":20},{"x":495,"y":65,"width":10,"height":10},{"x":615,"y":65,"width":210,"height":10},{"x":170,"y":75,"width":60,"height":10},{"x":260,"y":75,"width":100,"height":10},{"x":525,"y":75,"width":10,"height":10},{"x":545,"y":80,"width":10,"height":20},{"x":640,"y":75,"width":160,"height":10},{"x":155,"y":90,"width":10,"height":20},{"x":190,"y":85,"width":20,"height":10},{"x":255,"y":85,"width":70,"height":10},{"x":385,"y":90,"width":10,"height":20},{"x":565,"y":85,"width":10,"height":10},{"x":660,"y":85,"width":120,"height":10},{"x":35,"y":105,"width":70,"height":30},{"x":195,"y":95,"width":10,"height":10},{"x":225,"y":105,"width":10,"height":30},{"x":265,"y":95,"width":30,"height":10},{"x":670,"y":105,"width":100,"height":30},{"x":270,"y":105,"width":20,"height":10},{"x":265,"y":120,"width":10,"height":20},{"x":355,"y":120,"width":10,"height":20},{"x":395,"y":115,"width":10,"height":10},{"x":30,"y":425,"width":60,"height":610},{"x":365,"y":125,"width":10,"height":10},{"x":395,"y":125,"width":30,"height":10},{"x":675,"y":125,"width":90,"height":10},{"x":95,"y":140,"width":10,"height":20},{"x":380,"y":135,"width":80,"height":10},{"x":575,"y":135,"width":10,"height":10},{"x":680,"y":165,"width":80,"height":70},{"x":70,"y":145,"width":20,"height":10},{"x":310,"y":145,"width":20,"height":10},{"x":375,"y":145,"width":90,"height":10},{"x":605,"y":150,"width":10,"height":20},{"x":85,"y":155,"width":50,"height":10},{"x":370,"y":160,"width":120,"height":20},{"x":530,"y":165,"width":40,"height":30},{"x":95,"y":165,"width":70,"height":10},{"x":160,"y":170,"width":20,"height":20},{"x":195,"y":170,"width":10,"height":20},{"x":555,"y":165,"width":10,"height":10},{"x":100,"y":175,"width":80,"height":10},{"x":175,"y":175,"width":10,"height":10},{"x":365,"y":180,"width":130,"height":20},{"x":555,"y":175,"width":10,"height":10},{"x":580,"y":175,"width":20,"height":10},{"x":140,"y":185,"width":160,"height":10},{"x":525,"y":185,"width":70,"height":10},{"x":155,"y":195,"width":190,"height":10},{"x":375,"y":195,"width":130,"height":10},{"x":515,"y":195,"width":90,"height":10},{"x":155,"y":205,"width":190,"height":10},{"x":365,"y":205,"width":110,"height":10},{"x":525,"y":205,"width":90,"height":10},{"x":615,"y":210,"width":10,"height":20},{"x":685,"y":220,"width":70,"height":40},{"x":150,"y":215,"width":180,"height":10},{"x":370,"y":215,"width":80,"height":10},{"x":530,"y":220,"width":80,"height":20},{"x":155,"y":225,"width":190,"height":10},{"x":265,"y":225,"width":10,"height":10},{"x":365,"y":225,"width":70,"height":10},{"x":585,"y":225,"width":10,"height":10},{"x":170,"y":235,"width":220,"height":10},{"x":375,"y":240,"width":70,"height":20},{"x":535,"y":235,"width":70,"height":10},{"x":170,"y":245,"width":220,"height":10},{"x":420,"y":245,"width":20,"height":10},{"x":525,"y":245,"width":90,"height":10},{"x":680,"y":245,"width":80,"height":10},{"x":175,"y":255,"width":230,"height":10},{"x":375,"y":255,"width":90,"height":10},{"x":535,"y":275,"width":70,"height":50},{"x":600,"y":255,"width":20,"height":10},{"x":675,"y":260,"width":90,"height":20},{"x":175,"y":265,"width":230,"height":10},{"x":380,"y":270,"width":60,"height":20},{"x":175,"y":275,"width":230,"height":10},{"x":575,"y":275,"width":10,"height":10},{"x":670,"y":275,"width":100,"height":10},{"x":105,"y":285,"width":90,"height":10},{"x":230,"y":285,"width":120,"height":10},{"x":385,"y":285,"width":50,"height":10},{"x":645,"y":285,"width":150,"height":10},{"x":80,"y":295,"width":40,"height":10},{"x":140,"y":295,"width":20,"height":10},{"x":245,"y":295,"width":90,"height":10},{"x":380,"y":295,"width":40,"height":10},{"x":645,"y":295,"width":150,"height":10},{"x":85,"y":305,"width":50,"height":10},{"x":185,"y":305,"width":30,"height":10},{"x":255,"y":305,"width":90,"height":10},{"x":620,"y":310,"width":200,"height":20},{"x":70,"y":315,"width":20,"height":10},{"x":95,"y":315,"width":10,"height":10},{"x":235,"y":315,"width":90,"height":10},{"x":65,"y":325,"width":10,"height":10},{"x":245,"y":325,"width":70,"height":10},{"x":630,"y":325,"width":180,"height":10},{"x":70,"y":335,"width":20,"height":10},{"x":250,"y":335,"width":60,"height":10},{"x":480,"y":335,"width":20,"height":10},{"x":545,"y":335,"width":10,"height":10},{"x":655,"y":335,"width":130,"height":10},{"x":80,"y":345,"width":20,"height":10},{"x":245,"y":345,"width":10,"height":10},{"x":265,"y":350,"width":10,"height":20},{"x":485,"y":345,"width":10,"height":10},{"x":660,"y":355,"width":120,"height":30},{"x":75,"y":355,"width":10,"height":10},{"x":480,"y":360,"width":20,"height":20},{"x":65,"y":365,"width":10,"height":10},{"x":570,"y":365,"width":40,"height":10},{"x":555,"y":380,"width":30,"height":20},{"x":670,"y":375,"width":100,"height":10},{"x":65,"y":385,"width":10,"height":10},{"x":505,"y":390,"width":10,"height":20},{"x":575,"y":385,"width":10,"height":10},{"x":680,"y":385,"width":80,"height":10},{"x":235,"y":405,"width":10,"height":30},{"x":340,"y":395,"width":20,"height":10},{"x":480,"y":395,"width":20,"height":10},{"x":570,"y":395,"width":40,"height":10},{"x":685,"y":395,"width":70,"height":10},{"x":70,"y":405,"width":20,"height":10},{"x":245,"y":405,"width":10,"height":10},{"x":320,"y":405,"width":40,"height":10},{"x":485,"y":405,"width":50,"height":10},{"x":585,"y":405,"width":10,"height":10},{"x":680,"y":410,"width":80,"height":20},{"x":70,"y":415,"width":20,"height":10},{"x":170,"y":415,"width":20,"height":10},{"x":215,"y":415,"width":10,"height":10},{"x":245,"y":415,"width":10,"height":10},{"x":310,"y":415,"width":60,"height":10},{"x":465,"y":425,"width":30,"height":30},{"x":500,"y":415,"width":20,"height":10},{"x":615,"y":415,"width":10,"height":10},{"x":70,"y":425,"width":20,"height":10},{"x":125,"y":425,"width":10,"height":10},{"x":250,"y":425,"width":160,"height":10},{"x":660,"y":430,"width":120,"height":20},{"x":70,"y":435,"width":20,"height":10},{"x":110,"y":460,"width":40,"height":60},{"x":225,"y":435,"width":170,"height":10},{"x":490,"y":435,"width":20,"height":10},{"x":70,"y":445,"width":20,"height":10},{"x":215,"y":445,"width":170,"height":10},{"x":425,"y":450,"width":10,"height":20},{"x":485,"y":445,"width":50,"height":10},{"x":540,"y":445,"width":20,"height":10},{"x":650,"y":445,"width":140,"height":10},{"x":70,"y":455,"width":20,"height":10},{"x":210,"y":455,"width":160,"height":10},{"x":395,"y":460,"width":10,"height":20},{"x":540,"y":465,"width":40,"height":30},{"x":585,"y":455,"width":10,"height":10},{"x":660,"y":455,"width":120,"height":10},{"x":70,"y":465,"width":20,"height":10},{"x":205,"y":465,"width":150,"height":10},{"x":420,"y":465,"width":40,"height":10},{"x":680,"y":480,"width":80,"height":40},{"x":70,"y":475,"width":20,"height":10},{"x":200,"y":475,"width":140,"height":10},{"x":405,"y":475,"width":50,"height":10},{"x":565,"y":475,"width":10,"height":10},{"x":70,"y":485,"width":20,"height":10},{"x":170,"y":485,"width":80,"height":10},{"x":410,"y":485,"width":40,"height":10},{"x":525,"y":490,"width":10,"height":20},{"x":560,"y":485,"width":20,"height":10},{"x":70,"y":495,"width":20,"height":10},{"x":140,"y":495,"width":80,"height":10},{"x":240,"y":495,"width":40,"height":10},{"x":415,"y":500,"width":10,"height":20},{"x":475,"y":500,"width":10,"height":20},{"x":625,"y":495,"width":10,"height":10},{"x":70,"y":505,"width":20,"height":10},{"x":135,"y":505,"width":70,"height":10},{"x":225,"y":505,"width":70,"height":10},{"x":305,"y":505,"width":10,"height":10},{"x":365,"y":515,"width":10,"height":30},{"x":580,"y":505,"width":20,"height":10},{"x":665,"y":520,"width":110,"height":40},{"x":65,"y":515,"width":10,"height":10},{"x":125,"y":515,"width":50,"height":10},{"x":220,"y":515,"width":80,"height":10},{"x":300,"y":525,"width":20,"height":30},{"x":485,"y":515,"width":50,"height":10},{"x":580,"y":515,"width":40,"height":10},{"x":65,"y":525,"width":10,"height":10},{"x":120,"y":530,"width":40,"height":20},{"x":215,"y":545,"width":90,"height":50},{"x":375,"y":525,"width":10,"height":10},{"x":475,"y":525,"width":50,"height":10},{"x":560,"y":530,"width":20,"height":20},{"x":595,"y":525,"width":10,"height":10},{"x":365,"y":640,"width":30,"height":220},{"x":435,"y":600,"width":10,"height":140},{"x":480,"y":535,"width":40,"height":10},{"x":580,"y":535,"width":20,"height":10},{"x":120,"y":545,"width":60,"height":10},{"x":290,"y":565,"width":40,"height":50},{"x":490,"y":545,"width":20,"height":10},{"x":565,"y":545,"width":10,"height":10},{"x":585,"y":545,"width":10,"height":10},{"x":680,"y":545,"width":80,"height":10},{"x":120,"y":555,"width":40,"height":10},{"x":445,"y":555,"width":10,"height":10},{"x":485,"y":555,"width":10,"height":10},{"x":690,"y":605,"width":60,"height":110},{"x":115,"y":580,"width":50,"height":40},{"x":315,"y":565,"width":10,"height":10},{"x":385,"y":565,"width":10,"height":10},{"x":445,"y":565,"width":10,"height":10},{"x":210,"y":580,"width":80,"height":20},{"x":315,"y":575,"width":10,"height":10},{"x":385,"y":575,"width":10,"height":10},{"x":445,"y":575,"width":10,"height":10},{"x":315,"y":585,"width":10,"height":10},{"x":385,"y":585,"width":10,"height":10},{"x":445,"y":585,"width":10,"height":10},{"x":465,"y":630,"width":10,"height":100},{"x":65,"y":595,"width":10,"height":10},{"x":145,"y":600,"width":10,"height":20},{"x":225,"y":595,"width":50,"height":10},{"x":300,"y":625,"width":40,"height":70},{"x":385,"y":595,"width":10,"height":10},{"x":445,"y":595,"width":10,"height":10},{"x":70,"y":605,"width":20,"height":10},{"x":220,"y":610,"width":40,"height":20},{"x":385,"y":605,"width":10,"height":10},{"x":445,"y":605,"width":10,"height":10},{"x":75,"y":615,"width":30,"height":10},{"x":385,"y":615,"width":10,"height":10},{"x":445,"y":615,"width":10,"height":10},{"x":490,"y":615,"width":40,"height":10},{"x":85,"y":625,"width":50,"height":10},{"x":385,"y":625,"width":10,"height":10},{"x":445,"y":625,"width":10,"height":10},{"x":530,"y":625,"width":120,"height":10},{"x":105,"y":635,"width":90,"height":10},{"x":385,"y":635,"width":10,"height":10},{"x":445,"y":635,"width":10,"height":10},{"x":525,"y":635,"width":110,"height":10},{"x":105,"y":645,"width":90,"height":10},{"x":385,"y":645,"width":10,"height":10},{"x":445,"y":645,"width":10,"height":10},{"x":520,"y":645,"width":100,"height":10},{"x":105,"y":655,"width":90,"height":10},{"x":385,"y":655,"width":10,"height":10},{"x":445,"y":655,"width":10,"height":10},{"x":500,"y":655,"width":60,"height":10},{"x":110,"y":665,"width":100,"height":10},{"x":295,"y":665,"width":70,"height":10},{"x":385,"y":665,"width":10,"height":10},{"x":445,"y":665,"width":10,"height":10},{"x":480,"y":665,"width":20,"height":10},{"x":665,"y":665,"width":110,"height":10},{"x":120,"y":675,"width":120,"height":10},{"x":270,"y":675,"width":40,"height":10},{"x":315,"y":675,"width":30,"height":10},{"x":385,"y":675,"width":10,"height":10},{"x":430,"y":705,"width":20,"height":70},{"x":475,"y":675,"width":10,"height":10},{"x":655,"y":675,"width":130,"height":10},{"x":110,"y":685,"width":100,"height":10},{"x":250,"y":685,"width":40,"height":10},{"x":310,"y":695,"width":20,"height":30},{"x":385,"y":685,"width":10,"height":10},{"x":465,"y":685,"width":30,"height":10},{"x":650,"y":685,"width":140,"height":10},{"x":110,"y":695,"width":100,"height":10},{"x":235,"y":695,"width":50,"height":10},{"x":385,"y":695,"width":10,"height":10},{"x":460,"y":695,"width":40,"height":10},{"x":570,"y":695,"width":120,"height":10},{"x":690,"y":740,"width":60,"height":100},{"x":115,"y":705,"width":110,"height":10},{"x":230,"y":710,"width":40,"height":20},{"x":385,"y":705,"width":10,"height":10},{"x":465,"y":705,"width":50,"height":10},{"x":570,"y":705,"width":80,"height":10},{"x":120,"y":715,"width":120,"height":10},{"x":305,"y":740,"width":30,"height":60},{"x":385,"y":715,"width":10,"height":10},{"x":470,"y":715,"width":60,"height":10},{"x":120,"y":725,"width":100,"height":10},{"x":335,"y":730,"width":10,"height":20},{"x":385,"y":725,"width":10,"height":10},{"x":475,"y":725,"width":70,"height":10},{"x":25,"y":740,"width":50,"height":20},{"x":130,"y":735,"width":100,"height":10},{"x":445,"y":735,"width":10,"height":10},{"x":495,"y":735,"width":70,"height":10},{"x":135,"y":750,"width":90,"height":20},{"x":330,"y":745,"width":20,"height":10},{"x":430,"y":755,"width":40,"height":30},{"x":520,"y":745,"width":100,"height":10},{"x":20,"y":1455,"width":40,"height":1410},{"x":350,"y":755,"width":60,"height":10},{"x":530,"y":755,"width":100,"height":10},{"x":145,"y":765,"width":90,"height":10},{"x":350,"y":765,"width":60,"height":10},{"x":545,"y":765,"width":70,"height":10},{"x":150,"y":775,"width":120,"height":10},{"x":335,"y":775,"width":70,"height":10},{"x":425,"y":775,"width":30,"height":10},{"x":565,"y":775,"width":30,"height":10},{"x":45,"y":785,"width":10,"height":10},{"x":135,"y":785,"width":90,"height":10},{"x":340,"y":785,"width":60,"height":10},{"x":430,"y":790,"width":20,"height":20},{"x":45,"y":795,"width":10,"height":10},{"x":130,"y":795,"width":100,"height":10},{"x":340,"y":800,"width":40,"height":20},{"x":615,"y":795,"width":10,"height":10},{"x":680,"y":795,"width":80,"height":10},{"x":45,"y":805,"width":10,"height":10},{"x":120,"y":815,"width":120,"height":30},{"x":435,"y":805,"width":10,"height":10},{"x":610,"y":805,"width":20,"height":10},{"x":675,"y":805,"width":90,"height":10},{"x":45,"y":815,"width":10,"height":10},{"x":185,"y":815,"width":10,"height":10},{"x":340,"y":815,"width":20,"height":10},{"x":665,"y":820,"width":110,"height":20},{"x":45,"y":825,"width":10,"height":10},{"x":195,"y":825,"width":30,"height":10},{"x":335,"y":830,"width":10,"height":20},{"x":45,"y":835,"width":10,"height":10},{"x":155,"y":840,"width":170,"height":20},{"x":575,"y":840,"width":10,"height":20},{"x":660,"y":835,"width":120,"height":10},{"x":50,"y":845,"width":20,"height":10},{"x":260,"y":845,"width":40,"height":10},{"x":655,"y":850,"width":130,"height":20},{"x":50,"y":855,"width":20,"height":10},{"x":195,"y":860,"width":230,"height":20},{"x":570,"y":860,"width":20,"height":20},{"x":50,"y":865,"width":20,"height":10},{"x":315,"y":865,"width":10,"height":10},{"x":525,"y":875,"width":10,"height":30},{"x":650,"y":865,"width":140,"height":10},{"x":50,"y":875,"width":20,"height":10},{"x":205,"y":880,"width":230,"height":20},{"x":495,"y":890,"width":10,"height":40},{"x":630,"y":875,"width":180,"height":10},{"x":50,"y":885,"width":20,"height":10},{"x":625,"y":885,"width":190,"height":10},{"x":50,"y":895,"width":20,"height":10},{"x":210,"y":895,"width":220,"height":10},{"x":610,"y":895,"width":220,"height":10},{"x":55,"y":905,"width":30,"height":10},{"x":215,"y":905,"width":210,"height":10},{"x":610,"y":905,"width":220,"height":10},{"x":55,"y":915,"width":30,"height":10},{"x":195,"y":915,"width":170,"height":10},{"x":295,"y":925,"width":10,"height":30},{"x":455,"y":920,"width":10,"height":20},{"x":600,"y":920,"width":240,"height":20},{"x":55,"y":925,"width":30,"height":10},{"x":200,"y":925,"width":160,"height":10},{"x":465,"y":935,"width":10,"height":30},{"x":50,"y":935,"width":20,"height":10},{"x":85,"y":1035,"width":10,"height":210},{"x":195,"y":935,"width":150,"height":10},{"x":305,"y":935,"width":10,"height":10},{"x":595,"y":935,"width":250,"height":10},{"x":50,"y":945,"width":20,"height":10},{"x":95,"y":945,"width":10,"height":10},{"x":185,"y":945,"width":130,"height":10},{"x":265,"y":950,"width":10,"height":20},{"x":595,"y":945,"width":250,"height":10},{"x":50,"y":955,"width":20,"height":10},{"x":100,"y":955,"width":20,"height":10},{"x":185,"y":955,"width":110,"height":10},{"x":525,"y":955,"width":170,"height":10},{"x":675,"y":955,"width":90,"height":10},{"x":50,"y":965,"width":20,"height":10},{"x":105,"y":965,"width":30,"height":10},{"x":165,"y":965,"width":50,"height":10},{"x":215,"y":975,"width":10,"height":30},{"x":235,"y":965,"width":10,"height":10},{"x":515,"y":965,"width":170,"height":10},{"x":680,"y":970,"width":80,"height":20},{"x":50,"y":975,"width":20,"height":10},{"x":105,"y":975,"width":30,"height":10},{"x":180,"y":975,"width":20,"height":10},{"x":225,"y":975,"width":10,"height":10},{"x":500,"y":975,"width":180,"height":10},{"x":50,"y":985,"width":20,"height":10},{"x":110,"y":985,"width":40,"height":10},{"x":520,"y":985,"width":120,"height":10},{"x":685,"y":990,"width":70,"height":20},{"x":50,"y":995,"width":20,"height":10},{"x":115,"y":995,"width":50,"height":10},{"x":525,"y":995,"width":70,"height":10},{"x":50,"y":1005,"width":20,"height":10},{"x":120,"y":1005,"width":60,"height":10},{"x":690,"y":1135,"width":60,"height":270},{"x":50,"y":1015,"width":20,"height":10},{"x":120,"y":1015,"width":60,"height":10},{"x":50,"y":1025,"width":20,"height":10},{"x":120,"y":1025,"width":60,"height":10},{"x":195,"y":1030,"width":10,"height":20},{"x":615,"y":1035,"width":10,"height":30},{"x":50,"y":1035,"width":20,"height":10},{"x":120,"y":1035,"width":60,"height":10},{"x":205,"y":1035,"width":10,"height":10},{"x":50,"y":1045,"width":20,"height":10},{"x":120,"y":1045,"width":60,"height":10},{"x":200,"y":1065,"width":40,"height":50},{"x":285,"y":1050,"width":10,"height":20},{"x":465,"y":1055,"width":10,"height":30},{"x":625,"y":1045,"width":10,"height":10},{"x":50,"y":1055,"width":20,"height":10},{"x":120,"y":1055,"width":60,"height":10},{"x":225,"y":1055,"width":10,"height":10},{"x":295,"y":1055,"width":10,"height":10},{"x":615,"y":1055,"width":50,"height":10},{"x":50,"y":1065,"width":20,"height":10},{"x":115,"y":1065,"width":50,"height":10},{"x":265,"y":1065,"width":90,"height":10},{"x":375,"y":1075,"width":10,"height":30},{"x":475,"y":1065,"width":10,"height":10},{"x":585,"y":1080,"width":110,"height":40},{"x":50,"y":1075,"width":20,"height":10},{"x":115,"y":1075,"width":50,"height":10},{"x":275,"y":1075,"width":110,"height":10},{"x":385,"y":1075,"width":10,"height":10},{"x":465,"y":1075,"width":70,"height":10},{"x":50,"y":1085,"width":20,"height":10},{"x":115,"y":1085,"width":50,"height":10},{"x":280,"y":1085,"width":120,"height":10},{"x":385,"y":1085,"width":10,"height":10},{"x":455,"y":1085,"width":90,"height":10},{"x":50,"y":1095,"width":20,"height":10},{"x":120,"y":1095,"width":60,"height":10},{"x":265,"y":1095,"width":150,"height":10},{"x":435,"y":1105,"width":150,"height":30},{"x":50,"y":1105,"width":20,"height":10},{"x":120,"y":1105,"width":60,"height":10},{"x":210,"y":1105,"width":20,"height":10},{"x":310,"y":1105,"width":60,"height":10},{"x":595,"y":1105,"width":90,"height":10},{"x":50,"y":1115,"width":20,"height":10},{"x":115,"y":1115,"width":50,"height":10},{"x":205,"y":1115,"width":10,"height":10},{"x":320,"y":1115,"width":60,"height":10},{"x":605,"y":1125,"width":70,"height":30},{"x":50,"y":1125,"width":20,"height":10},{"x":115,"y":1125,"width":50,"height":10},{"x":325,"y":1125,"width":50,"height":10},{"x":400,"y":1125,"width":80,"height":10},{"x":490,"y":1135,"width":40,"height":30},{"x":50,"y":1135,"width":20,"height":10},{"x":115,"y":1265,"width":50,"height":270},{"x":310,"y":1135,"width":60,"height":10},{"x":515,"y":1135,"width":10,"height":10},{"x":50,"y":1145,"width":20,"height":10},{"x":275,"y":1145,"width":110,"height":10},{"x":405,"y":1150,"width":10,"height":20},{"x":515,"y":1145,"width":10,"height":10},{"x":615,"y":1155,"width":50,"height":30},{"x":50,"y":1155,"width":20,"height":10},{"x":265,"y":1160,"width":110,"height":20},{"x":415,"y":1155,"width":10,"height":10},{"x":500,"y":1155,"width":40,"height":10},{"x":50,"y":1165,"width":20,"height":10},{"x":150,"y":1165,"width":20,"height":10},{"x":415,"y":1165,"width":70,"height":10},{"x":490,"y":1185,"width":40,"height":50},{"x":50,"y":1175,"width":20,"height":10},{"x":155,"y":1175,"width":30,"height":10},{"x":255,"y":1175,"width":90,"height":10},{"x":410,"y":1175,"width":80,"height":10},{"x":600,"y":1185,"width":80,"height":30},{"x":50,"y":1185,"width":20,"height":10},{"x":160,"y":1185,"width":40,"height":10},{"x":240,"y":1185,"width":40,"height":10},{"x":410,"y":1190,"width":100,"height":20},{"x":50,"y":1195,"width":20,"height":10},{"x":160,"y":1195,"width":40,"height":10},{"x":240,"y":1200,"width":20,"height":20},{"x":50,"y":1205,"width":20,"height":10},{"x":160,"y":1205,"width":40,"height":10},{"x":255,"y":1205,"width":10,"height":10},{"x":375,"y":1205,"width":90,"height":10},{"x":445,"y":1205,"width":30,"height":10},{"x":595,"y":1205,"width":90,"height":10},{"x":50,"y":1215,"width":20,"height":10},{"x":160,"y":1215,"width":40,"height":10},{"x":250,"y":1215,"width":20,"height":10},{"x":385,"y":1215,"width":70,"height":10},{"x":600,"y":1215,"width":80,"height":10},{"x":50,"y":1225,"width":20,"height":10},{"x":160,"y":1225,"width":40,"height":10},{"x":260,"y":1245,"width":20,"height":50},{"x":390,"y":1230,"width":60,"height":20},{"x":605,"y":1225,"width":70,"height":10},{"x":50,"y":1235,"width":20,"height":10},{"x":165,"y":1235,"width":50,"height":10},{"x":280,"y":1235,"width":20,"height":10},{"x":430,"y":1235,"width":20,"height":10},{"x":610,"y":1235,"width":60,"height":10},{"x":50,"y":1245,"width":20,"height":10},{"x":165,"y":1245,"width":50,"height":10},{"x":310,"y":1245,"width":80,"height":10},{"x":410,"y":1250,"width":60,"height":20},{"x":605,"y":1305,"width":50,"height":130},{"x":50,"y":1255,"width":20,"height":10},{"x":170,"y":1255,"width":60,"height":10},{"x":315,"y":1255,"width":90,"height":10},{"x":455,"y":1255,"width":30,"height":10},{"x":535,"y":1260,"width":10,"height":20},{"x":50,"y":1265,"width":20,"height":10},{"x":150,"y":1265,"width":20,"height":10},{"x":195,"y":1270,"width":50,"height":20},{"x":320,"y":1265,"width":100,"height":10},{"x":440,"y":1265,"width":80,"height":10},{"x":50,"y":1275,"width":20,"height":10},{"x":145,"y":1275,"width":10,"height":10},{"x":225,"y":1275,"width":10,"height":10},{"x":310,"y":1275,"width":80,"height":10},{"x":455,"y":1280,"width":50,"height":20},{"x":530,"y":1290,"width":20,"height":40},{"x":695,"y":1320,"width":50,"height":100},{"x":50,"y":1285,"width":20,"height":10},{"x":145,"y":1285,"width":10,"height":10},{"x":210,"y":1285,"width":60,"height":10},{"x":50,"y":1295,"width":20,"height":10},{"x":195,"y":1295,"width":10,"height":10},{"x":465,"y":1295,"width":30,"height":10},{"x":50,"y":1305,"width":20,"height":10},{"x":370,"y":1310,"width":20,"height":20},{"x":55,"y":1315,"width":30,"height":10},{"x":145,"y":1315,"width":10,"height":10},{"x":390,"y":1315,"width":20,"height":10},{"x":520,"y":1340,"width":40,"height":60},{"x":555,"y":1315,"width":10,"height":10},{"x":55,"y":1325,"width":30,"height":10},{"x":145,"y":1325,"width":10,"height":10},{"x":265,"y":1325,"width":10,"height":10},{"x":365,"y":1325,"width":110,"height":10},{"x":555,"y":1325,"width":30,"height":10},{"x":55,"y":1335,"width":30,"height":10},{"x":150,"y":1335,"width":20,"height":10},{"x":205,"y":1335,"width":10,"height":10},{"x":330,"y":1335,"width":200,"height":10},{"x":555,"y":1335,"width":30,"height":10},{"x":635,"y":1335,"width":10,"height":10},{"x":55,"y":1345,"width":30,"height":10},{"x":155,"y":1345,"width":10,"height":10},{"x":200,"y":1370,"width":20,"height":60},{"x":275,"y":1355,"width":90,"height":30},{"x":395,"y":1345,"width":90,"height":10},{"x":555,"y":1345,"width":30,"height":10},{"x":640,"y":1345,"width":20,"height":10},{"x":55,"y":1355,"width":30,"height":10},{"x":415,"y":1355,"width":70,"height":10},{"x":555,"y":1355,"width":30,"height":10},{"x":640,"y":1355,"width":20,"height":10},{"x":55,"y":1365,"width":30,"height":10},{"x":355,"y":1385,"width":10,"height":50},{"x":420,"y":1365,"width":60,"height":10},{"x":555,"y":1365,"width":30,"height":10},{"x":645,"y":1365,"width":30,"height":10},{"x":55,"y":1375,"width":30,"height":10},{"x":215,"y":1375,"width":10,"height":10},{"x":285,"y":1375,"width":70,"height":10},{"x":410,"y":1375,"width":100,"height":10},{"x":540,"y":1380,"width":60,"height":20},{"x":655,"y":1375,"width":130,"height":10},{"x":55,"y":1385,"width":30,"height":10},{"x":215,"y":1385,"width":10,"height":10},{"x":290,"y":1385,"width":60,"height":10},{"x":410,"y":1385,"width":100,"height":10},{"x":660,"y":1390,"width":120,"height":20},{"x":55,"y":1395,"width":30,"height":10},{"x":150,"y":1395,"width":20,"height":10},{"x":225,"y":1395,"width":30,"height":10},{"x":285,"y":1395,"width":50,"height":10},{"x":410,"y":1395,"width":100,"height":10},{"x":535,"y":1405,"width":70,"height":30},{"x":55,"y":1405,"width":30,"height":10},{"x":120,"y":1445,"width":80,"height":90},{"x":210,"y":1405,"width":60,"height":10},{"x":290,"y":1410,"width":40,"height":20},{"x":410,"y":1405,"width":100,"height":10},{"x":665,"y":1405,"width":110,"height":10},{"x":55,"y":1415,"width":30,"height":10},{"x":165,"y":1415,"width":10,"height":10},{"x":205,"y":1420,"width":50,"height":20},{"x":420,"y":1415,"width":100,"height":10},{"x":670,"y":1415,"width":100,"height":10},{"x":55,"y":1425,"width":30,"height":10},{"x":165,"y":1425,"width":10,"height":10},{"x":290,"y":1430,"width":20,"height":20},{"x":435,"y":1425,"width":70,"height":10},{"x":530,"y":1445,"width":40,"height":50},{"x":565,"y":1430,"width":10,"height":20},{"x":675,"y":1440,"width":90,"height":40},{"x":55,"y":1435,"width":30,"height":10},{"x":195,"y":1435,"width":70,"height":10},{"x":425,"y":1435,"width":90,"height":10},{"x":575,"y":1435,"width":10,"height":10},{"x":55,"y":1445,"width":30,"height":10},{"x":200,"y":1445,"width":80,"height":10},{"x":295,"y":1445,"width":10,"height":10},{"x":415,"y":1445,"width":110,"height":10},{"x":55,"y":1455,"width":30,"height":10},{"x":200,"y":1455,"width":80,"height":10},{"x":415,"y":1455,"width":90,"height":10},{"x":55,"y":1465,"width":30,"height":10},{"x":200,"y":1465,"width":80,"height":10},{"x":400,"y":1465,"width":40,"height":10},{"x":450,"y":1465,"width":20,"height":10},{"x":670,"y":1465,"width":100,"height":10},{"x":55,"y":1475,"width":30,"height":10},{"x":200,"y":1475,"width":80,"height":10},{"x":320,"y":1475,"width":80,"height":10},{"x":455,"y":1475,"width":10,"height":10},{"x":525,"y":1475,"width":10,"height":10},{"x":660,"y":1475,"width":120,"height":10},{"x":55,"y":1485,"width":30,"height":10},{"x":195,"y":1485,"width":70,"height":10},{"x":340,"y":1485,"width":80,"height":10},{"x":650,"y":1485,"width":140,"height":10},{"x":55,"y":1495,"width":30,"height":10},{"x":175,"y":1505,"width":110,"height":30},{"x":350,"y":1505,"width":80,"height":30},{"x":430,"y":1495,"width":20,"height":10},{"x":635,"y":1495,"width":170,"height":10},{"x":55,"y":1505,"width":30,"height":10},{"x":555,"y":1505,"width":330,"height":10},{"x":65,"y":1515,"width":50,"height":10},{"x":555,"y":1515,"width":330,"height":10},{"x":65,"y":1525,"width":50,"height":10},{"x":180,"y":1530,"width":100,"height":20},{"x":520,"y":1530,"width":400,"height":20},{"x":65,"y":1535,"width":50,"height":10},{"x":70,"y":1545,"width":60,"height":10},{"x":185,"y":1545,"width":70,"height":10},{"x":485,"y":1545,"width":310,"height":10},{"x":690,"y":1545,"width":60,"height":10},{"x":70,"y":1555,"width":60,"height":10},{"x":185,"y":1555,"width":50,"height":10},{"x":475,"y":1555,"width":290,"height":10},{"x":695,"y":1560,"width":50,"height":20},{"x":75,"y":1565,"width":70,"height":10},{"x":185,"y":1565,"width":30,"height":10},{"x":460,"y":1565,"width":280,"height":10},{"x":75,"y":1575,"width":70,"height":10},{"x":190,"y":1580,"width":20,"height":20},{"x":440,"y":1575,"width":240,"height":10},{"x":690,"y":1575,"width":60,"height":10},{"x":80,"y":1585,"width":80,"height":10},{"x":430,"y":1585,"width":220,"height":10},{"x":685,"y":1585,"width":70,"height":10},{"x":85,"y":1595,"width":90,"height":10},{"x":195,"y":1595,"width":10,"height":10},{"x":375,"y":1595,"width":110,"height":10},{"x":500,"y":1595,"width":80,"height":10},{"x":680,"y":1595,"width":80,"height":10},{"x":90,"y":1605,"width":100,"height":10},{"x":375,"y":1605,"width":90,"height":10},{"x":475,"y":1605,"width":10,"height":10},{"x":675,"y":1610,"width":90,"height":20},{"x":90,"y":1615,"width":100,"height":10},{"x":355,"y":1615,"width":50,"height":10},{"x":405,"y":1615,"width":30,"height":10},{"x":590,"y":1620,"width":60,"height":20},{"x":95,"y":1625,"width":110,"height":10},{"x":350,"y":1625,"width":40,"height":10},{"x":670,"y":1625,"width":100,"height":10},{"x":100,"y":1635,"width":120,"height":10},{"x":350,"y":1645,"width":20,"height":30},{"x":630,"y":1640,"width":180,"height":20},{"x":55,"y":1645,"width":30,"height":10},{"x":125,"y":1645,"width":90,"height":10},{"x":55,"y":1655,"width":30,"height":10},{"x":130,"y":1660,"width":80,"height":20},{"x":625,"y":1660,"width":190,"height":20},{"x":55,"y":1665,"width":30,"height":10},{"x":175,"y":1665,"width":10,"height":10},{"x":355,"y":1670,"width":10,"height":20},{"x":55,"y":1675,"width":30,"height":10},{"x":145,"y":1675,"width":90,"height":10},{"x":620,"y":1675,"width":200,"height":10},{"x":55,"y":1685,"width":30,"height":10},{"x":155,"y":1685,"width":90,"height":10},{"x":590,"y":1685,"width":140,"height":10},{"x":695,"y":1840,"width":50,"height":320},{"x":65,"y":1695,"width":50,"height":10},{"x":165,"y":1695,"width":90,"height":10},{"x":570,"y":1695,"width":140,"height":10},{"x":70,"y":1705,"width":60,"height":10},{"x":175,"y":1705,"width":90,"height":10},{"x":550,"y":1705,"width":160,"height":10},{"x":80,"y":1715,"width":80,"height":10},{"x":185,"y":1720,"width":90,"height":20},{"x":540,"y":1715,"width":160,"height":10},{"x":655,"y":1720,"width":10,"height":20},{"x":55,"y":1725,"width":30,"height":10},{"x":115,"y":1745,"width":10,"height":50},{"x":235,"y":1725,"width":10,"height":10},{"x":530,"y":1725,"width":160,"height":10},{"x":55,"y":1735,"width":30,"height":10},{"x":90,"y":1755,"width":20,"height":50},{"x":200,"y":1735,"width":100,"height":10},{"x":505,"y":1735,"width":170,"height":10},{"x":650,"y":1740,"width":20,"height":20},{"x":55,"y":1745,"width":30,"height":10},{"x":195,"y":1760,"width":130,"height":40},{"x":510,"y":1745,"width":140,"height":10},{"x":55,"y":1755,"width":30,"height":10},{"x":265,"y":1755,"width":10,"height":10},{"x":525,"y":1755,"width":110,"height":10},{"x":645,"y":1760,"width":30,"height":20},{"x":55,"y":1765,"width":30,"height":10},{"x":270,"y":1765,"width":20,"height":10},{"x":555,"y":1765,"width":10,"height":10},{"x":55,"y":1775,"width":30,"height":10},{"x":280,"y":1775,"width":40,"height":10},{"x":640,"y":1785,"width":40,"height":30},{"x":55,"y":1785,"width":30,"height":10},{"x":85,"y":1845,"width":10,"height":130},{"x":225,"y":1785,"width":130,"height":10},{"x":410,"y":1785,"width":40,"height":10},{"x":55,"y":1795,"width":30,"height":10},{"x":185,"y":1795,"width":150,"height":10},{"x":460,"y":1795,"width":120,"height":10},{"x":55,"y":1805,"width":30,"height":10},{"x":95,"y":1805,"width":10,"height":10},{"x":180,"y":1805,"width":140,"height":10},{"x":535,"y":1810,"width":250,"height":20},{"x":55,"y":1815,"width":30,"height":10},{"x":95,"y":1815,"width":10,"height":10},{"x":160,"y":1815,"width":100,"height":10},{"x":55,"y":1825,"width":30,"height":10},{"x":95,"y":1825,"width":10,"height":10},{"x":135,"y":1825,"width":50,"height":10},{"x":635,"y":1825,"width":50,"height":10},{"x":55,"y":1835,"width":30,"height":10},{"x":95,"y":1835,"width":10,"height":10},{"x":230,"y":1835,"width":40,"height":10},{"x":290,"y":1835,"width":20,"height":10},{"x":485,"y":1835,"width":170,"height":10},{"x":585,"y":1850,"width":10,"height":40},{"x":645,"y":1840,"width":30,"height":20},{"x":55,"y":1845,"width":30,"height":10},{"x":95,"y":1845,"width":10,"height":10},{"x":120,"y":1845,"width":20,"height":10},{"x":180,"y":1845,"width":80,"height":10},{"x":265,"y":1845,"width":50,"height":10},{"x":325,"y":1875,"width":10,"height":70},{"x":435,"y":1855,"width":10,"height":30},{"x":480,"y":1845,"width":20,"height":10},{"x":520,"y":1845,"width":20,"height":10},{"x":565,"y":1885,"width":10,"height":90},{"x":600,"y":1845,"width":20,"height":10},{"x":55,"y":1855,"width":30,"height":10},{"x":145,"y":1855,"width":10,"height":10},{"x":375,"y":1875,"width":10,"height":50},{"x":470,"y":1855,"width":20,"height":10},{"x":515,"y":1855,"width":10,"height":10},{"x":640,"y":1860,"width":40,"height":20},{"x":55,"y":1865,"width":30,"height":10},{"x":115,"y":1935,"width":10,"height":150},{"x":140,"y":1865,"width":20,"height":10},{"x":235,"y":1865,"width":130,"height":10},{"x":345,"y":1890,"width":10,"height":60},{"x":405,"y":1875,"width":10,"height":30},{"x":465,"y":1865,"width":10,"height":10},{"x":510,"y":1865,"width":20,"height":10},{"x":545,"y":1865,"width":10,"height":10},{"x":600,"y":1865,"width":20,"height":10},{"x":55,"y":1875,"width":30,"height":10},{"x":135,"y":1925,"width":10,"height":110},{"x":175,"y":1875,"width":10,"height":10},{"x":460,"y":1875,"width":20,"height":10},{"x":500,"y":1875,"width":20,"height":10},{"x":540,"y":1875,"width":20,"height":10},{"x":605,"y":1875,"width":10,"height":10},{"x":645,"y":1875,"width":30,"height":10},{"x":55,"y":1885,"width":30,"height":10},{"x":165,"y":1885,"width":30,"height":10},{"x":220,"y":1885,"width":60,"height":10},{"x":285,"y":1885,"width":50,"height":10},{"x":455,"y":1885,"width":10,"height":10},{"x":490,"y":1885,"width":20,"height":10},{"x":535,"y":1885,"width":30,"height":10},{"x":600,"y":1885,"width":40,"height":10},{"x":655,"y":1885,"width":10,"height":10},{"x":55,"y":1895,"width":30,"height":10},{"x":155,"y":1925,"width":10,"height":70},{"x":210,"y":1895,"width":20,"height":10},{"x":235,"y":1895,"width":10,"height":10},{"x":420,"y":1895,"width":80,"height":10},{"x":485,"y":1895,"width":10,"height":10},{"x":520,"y":1895,"width":20,"height":10},{"x":545,"y":1915,"width":10,"height":50},{"x":615,"y":1930,"width":10,"height":80},{"x":645,"y":1895,"width":30,"height":10},{"x":55,"y":1905,"width":30,"height":10},{"x":95,"y":1970,"width":10,"height":140},{"x":180,"y":1905,"width":20,"height":10},{"x":275,"y":1905,"width":50,"height":10},{"x":480,"y":1905,"width":20,"height":10},{"x":510,"y":1905,"width":20,"height":10},{"x":635,"y":1935,"width":10,"height":70},{"x":655,"y":1940,"width":10,"height":80},{"x":55,"y":1915,"width":30,"height":10},{"x":230,"y":1915,"width":60,"height":10},{"x":310,"y":1915,"width":40,"height":10},{"x":415,"y":1915,"width":130,"height":10},{"x":505,"y":1915,"width":10,"height":10},{"x":55,"y":1925,"width":30,"height":10},{"x":190,"y":1930,"width":20,"height":20},{"x":295,"y":1950,"width":10,"height":60},{"x":500,"y":1925,"width":20,"height":10},{"x":585,"y":1925,"width":30,"height":10},{"x":55,"y":1935,"width":30,"height":10},{"x":240,"y":1935,"width":80,"height":10},{"x":340,"y":1935,"width":60,"height":10},{"x":440,"y":1935,"width":120,"height":10},{"x":555,"y":1940,"width":10,"height":20},{"x":595,"y":1955,"width":10,"height":50},{"x":55,"y":1945,"width":30,"height":10},{"x":185,"y":1950,"width":10,"height":20},{"x":275,"y":1975,"width":10,"height":70},{"x":315,"y":1950,"width":10,"height":20},{"x":570,"y":1945,"width":20,"height":10},{"x":55,"y":1955,"width":30,"height":10},{"x":165,"y":1960,"width":10,"height":20},{"x":230,"y":1955,"width":60,"height":10},{"x":335,"y":1955,"width":30,"height":10},{"x":440,"y":1955,"width":120,"height":10},{"x":575,"y":1955,"width":10,"height":10},{"x":55,"y":1965,"width":30,"height":10},{"x":180,"y":1965,"width":20,"height":10},{"x":205,"y":1970,"width":10,"height":20},{"x":255,"y":1995,"width":10,"height":70},{"x":355,"y":1965,"width":30,"height":10},{"x":535,"y":1965,"width":90,"height":10},{"x":55,"y":1975,"width":30,"height":10},{"x":145,"y":1980,"width":10,"height":20},{"x":235,"y":2000,"width":10,"height":60},{"x":305,"y":1980,"width":10,"height":20},{"x":395,"y":1975,"width":90,"height":10},{"x":495,"y":1975,"width":10,"height":10},{"x":55,"y":1985,"width":30,"height":10},{"x":180,"y":1985,"width":60,"height":10},{"x":325,"y":1985,"width":30,"height":10},{"x":440,"y":1985,"width":20,"height":10},{"x":495,"y":1995,"width":30,"height":30},{"x":590,"y":1985,"width":140,"height":10},{"x":55,"y":1995,"width":30,"height":10},{"x":165,"y":1995,"width":10,"height":10},{"x":350,"y":1995,"width":40,"height":10},{"x":445,"y":2005,"width":10,"height":30},{"x":55,"y":2005,"width":30,"height":10},{"x":170,"y":2005,"width":100,"height":10},{"x":285,"y":2010,"width":10,"height":20},{"x":390,"y":2005,"width":60,"height":10},{"x":620,"y":2005,"width":200,"height":10},{"x":55,"y":2015,"width":30,"height":10},{"x":175,"y":2015,"width":70,"height":10},{"x":320,"y":2015,"width":60,"height":10},{"x":415,"y":2015,"width":10,"height":10},{"x":500,"y":2015,"width":20,"height":10},{"x":695,"y":2015,"width":50,"height":10},{"x":55,"y":2025,"width":30,"height":10},{"x":105,"y":2025,"width":10,"height":10},{"x":265,"y":2030,"width":10,"height":20},{"x":530,"y":2025,"width":380,"height":10},{"x":55,"y":2035,"width":30,"height":10},{"x":170,"y":2040,"width":140,"height":20},{"x":300,"y":2035,"width":60,"height":10},{"x":695,"y":2035,"width":50,"height":10},{"x":55,"y":2045,"width":30,"height":10},{"x":245,"y":2045,"width":10,"height":10},{"x":350,"y":2045,"width":60,"height":10},{"x":605,"y":2050,"width":230,"height":20},{"x":45,"y":2055,"width":10,"height":10},{"x":215,"y":2055,"width":170,"height":10},{"x":370,"y":2055,"width":40,"height":10},{"x":45,"y":2065,"width":10,"height":10},{"x":265,"y":2065,"width":250,"height":10},{"x":600,"y":2070,"width":240,"height":20},{"x":270,"y":2080,"width":240,"height":20},{"x":395,"y":2085,"width":10,"height":10},{"x":595,"y":2085,"width":250,"height":10},{"x":45,"y":2095,"width":10,"height":10},{"x":425,"y":2095,"width":590,"height":10},{"x":50,"y":2105,"width":20,"height":10},{"x":420,"y":2105,"width":600,"height":10},{"x":380,"y":2115,"width":680,"height":10},{"x":380,"y":2125,"width":680,"height":10},{"x":380,"y":2135,"width":680,"height":10},{"x":380,"y":2145,"width":680,"height":10},{"x":380,"y":2155,"width":680,"height":10}]
\ No newline at end of file
diff --git a/assets/img/map/cave.png b/assets/img/map/cave.png
index 0cbc8dd..7826179 100644
Binary files a/assets/img/map/cave.png and b/assets/img/map/cave.png differ
diff --git a/assets/img/map/tutorial1.png b/assets/img/map/tutorial1.png
new file mode 100644
index 0000000..29f3a8b
Binary files /dev/null and b/assets/img/map/tutorial1.png differ
diff --git a/assets/img/map/tutorial2.png b/assets/img/map/tutorial2.png
new file mode 100644
index 0000000..3c55f05
Binary files /dev/null and b/assets/img/map/tutorial2.png differ
diff --git a/assets/worlds/mainworld.json b/assets/worlds/mainworld.json
index 9c46d40..5c86b0f 100644
--- a/assets/worlds/mainworld.json
+++ b/assets/worlds/mainworld.json
@@ -1,44 +1,282 @@
{
"end_position": {
- "x": 350.0,
- "y": 2050.0
+ "x": 440.0,
+ "y": 2090.0
},
"player_spawn": {
- "x": 220.0,
+ "x": 120.0,
"y": 50.0
},
"fish": [
- {"x":49,"y":801},{"x":570,"y":594},{"x":761,"y":186},{"x":760,"y":940},{"x":241,"y":32},{"x":501,"y":18},{"x":487,"y":37},{"x":802,"y":849},{"x":864,"y":43},{"x":544,"y":886},{"x":987,"y":710},{"x":949,"y":404},{"x":694,"y":32},{"x":364,"y":899},{"x":26,"y":849},{"x":253,"y":627},{"x":39,"y":547},{"x":307,"y":730},{"x":133,"y":967},{"x":861,"y":76},{"x":199,"y":229},{"x":617,"y":532},{"x":391,"y":388},{"x":491,"y":816},{"x":539,"y":243},{"x":222,"y":288},{"x":81,"y":784},{"x":432,"y":830},{"x":741,"y":737},{"x":426,"y":480},{"x":591,"y":437},{"x":903,"y":380},{"x":653,"y":349},{"x":684,"y":235},{"x":797,"y":438},{"x":546,"y":615},{"x":497,"y":523},{"x":406,"y":468},{"x":173,"y":183},{"x":641,"y":187},{"x":517,"y":294},{"x":527,"y":650},{"x":962,"y":237},{"x":25,"y":868},{"x":16,"y":369},{"x":434,"y":712},{"x":632,"y":315},{"x":172,"y":421},{"x":450,"y":53},{"x":731,"y":220},{"x":532,"y":467},{"x":816,"y":497},{"x":948,"y":539},{"x":467,"y":829},{"x":533,"y":809},{"x":146,"y":989},{"x":850,"y":245},{"x":989,"y":214},{"x":203,"y":354},{"x":466,"y":611},{"x":382,"y":376},{"x":111,"y":148},{"x":411,"y":77},{"x":124,"y":418},{"x":154,"y":611},{"x":56,"y":732},{"x":800,"y":488},{"x":851,"y":668},{"x":240,"y":220},{"x":1000,"y":62},{"x":95,"y":784},{"x":700,"y":428},{"x":735,"y":517},{"x":259,"y":843},{"x":647,"y":268},{"x":668,"y":823},{"x":198,"y":241},{"x":243,"y":422},{"x":838,"y":433},{"x":642,"y":97},{"x":563,"y":974},{"x":386,"y":548},{"x":646,"y":482},{"x":691,"y":794},{"x":167,"y":485},{"x":978,"y":622},{"x":845,"y":431},{"x":529,"y":719},{"x":963,"y":145},{"x":6,"y":412},{"x":381,"y":830},{"x":918,"y":118},{"x":915,"y":27},{"x":618,"y":262},{"x":250,"y":635},{"x":100,"y":500},{"x":442,"y":321},{"x":769,"y":767},{"x":714,"y":204},{"x":506,"y":872},{"x":575,"y":178},{"x":256,"y":411},{"x":921,"y":617},{"x":971,"y":214},{"x":726,"y":702},{"x":103,"y":450},{"x":501,"y":134},{"x":265,"y":993},{"x":31,"y":63},{"x":502,"y":448},{"x":46,"y":457},{"x":809,"y":184},{"x":763,"y":962},{"x":632,"y":873},{"x":916,"y":761},{"x":710,"y":720},{"x":873,"y":222},{"x":256,"y":861},{"x":246,"y":482},{"x":390,"y":812},{"x":28,"y":247},{"x":516,"y":523},{"x":869,"y":43},{"x":680,"y":740},{"x":406,"y":65},{"x":657,"y":196},{"x":692,"y":635},{"x":97,"y":993},{"x":616,"y":490},{"x":515,"y":955},{"x":412,"y":502},{"x":743,"y":565},{"x":16,"y":499},{"x":324,"y":582},{"x":871,"y":62},{"x":128,"y":476},{"x":716,"y":525},{"x":627,"y":2},{"x":730,"y":913},{"x":704,"y":522},{"x":242,"y":934},{"x":172,"y":277},{"x":651,"y":948},{"x":349,"y":263},{"x":731,"y":967},{"x":382,"y":762},{"x":217,"y":15},{"x":49,"y":25},{"x":583,"y":110},{"x":700,"y":620},{"x":230,"y":537},{"x":285,"y":978},{"x":4,"y":791},{"x":939,"y":866},{"x":371,"y":342},{"x":759,"y":870},{"x":892,"y":103},{"x":57,"y":129},{"x":233,"y":383},{"x":171,"y":472},{"x":173,"y":842},{"x":516,"y":464},{"x":407,"y":458},{"x":963,"y":231},{"x":526,"y":253},{"x":815,"y":857},{"x":175,"y":909},{"x":993,"y":255},{"x":129,"y":390},{"x":76,"y":997},{"x":833,"y":174},{"x":501,"y":396},{"x":897,"y":218},{"x":876,"y":601},{"x":41,"y":165},{"x":993,"y":473},{"x":606,"y":308},{"x":831,"y":382},{"x":517,"y":828},{"x":984,"y":26},{"x":286,"y":712},{"x":422,"y":311},{"x":448,"y":103},{"x":260,"y":229},{"x":5,"y":738},{"x":283,"y":346},{"x":744,"y":463},{"x":634,"y":719},{"x":446,"y":977},{"x":220,"y":89},{"x":745,"y":866},{"x":851,"y":860},{"x":369,"y":940},{"x":828,"y":577},{"x":350,"y":337},{"x":334,"y":378},{"x":203,"y":248},{"x":665,"y":788},{"x":334,"y":927},{"x":307,"y":764},{"x":500,"y":763},{"x":613,"y":843},{"x":384,"y":253},{"x":956,"y":569},{"x":846,"y":137},{"x":105,"y":728},{"x":686,"y":226},{"x":657,"y":52},{"x":592,"y":433},{"x":997,"y":820},{"x":746,"y":389},{"x":405,"y":448},{"x":973,"y":19},{"x":538,"y":518},{"x":790,"y":275},{"x":633,"y":738},{"x":128,"y":484},{"x":603,"y":371},{"x":932,"y":21},{"x":582,"y":445},{"x":438,"y":793},{"x":963,"y":69},{"x":158,"y":263},{"x":988,"y":297},{"x":249,"y":227},{"x":245,"y":466},{"x":131,"y":495},{"x":620,"y":266},{"x":505,"y":384},{"x":813,"y":647},{"x":113,"y":66},{"x":757,"y":10},{"x":2,"y":707},{"x":540,"y":140},{"x":562,"y":691},{"x":484,"y":433},{"x":859,"y":455},{"x":248,"y":117},{"x":36,"y":432},{"x":798,"y":754},{"x":611,"y":291},{"x":664,"y":770},{"x":299,"y":788},{"x":433,"y":920},{"x":540,"y":739},{"x":201,"y":829},{"x":972,"y":362},{"x":811,"y":120},{"x":941,"y":670},{"x":186,"y":448},{"x":549,"y":611},{"x":206,"y":387},{"x":973,"y":437},{"x":700,"y":709},{"x":472,"y":243},{"x":971,"y":518},{"x":184,"y":540},{"x":271,"y":257},{"x":290,"y":895},{"x":546,"y":7},{"x":256,"y":542},{"x":418,"y":553},{"x":816,"y":875},{"x":908,"y":547},{"x":315,"y":354},{"x":266,"y":471},{"x":242,"y":88},{"x":785,"y":52},{"x":497,"y":47},{"x":466,"y":279},{"x":750,"y":690},{"x":329,"y":296},{"x":545,"y":715},{"x":508,"y":562},{"x":993,"y":467},{"x":703,"y":733},{"x":824,"y":11},{"x":419,"y":337},{"x":393,"y":229},{"x":898,"y":261},{"x":264,"y":708},{"x":711,"y":768},{"x":568,"y":409},{"x":473,"y":342},{"x":329,"y":53},{"x":95,"y":815},{"x":783,"y":977},{"x":48,"y":551},{"x":635,"y":931},{"x":653,"y":86},{"x":9,"y":153},{"x":955,"y":660},{"x":480,"y":716},{"x":936,"y":622},{"x":607,"y":221},{"x":423,"y":545},{"x":507,"y":668},{"x":676,"y":957},{"x":253,"y":515},{"x":327,"y":495},{"x":965,"y":808},{"x":2,"y":807},{"x":276,"y":199},{"x":584,"y":75},{"x":770,"y":51},{"x":667,"y":717},{"x":944,"y":913},{"x":982,"y":977},{"x":618,"y":482},{"x":372,"y":545},{"x":507,"y":518},{"x":604,"y":492},{"x":772,"y":730},{"x":350,"y":141},{"x":783,"y":437},{"x":282,"y":714},{"x":269,"y":691},{"x":991,"y":386},{"x":234,"y":196},{"x":908,"y":635},{"x":785,"y":340},{"x":125,"y":712},{"x":466,"y":210},{"x":280,"y":185},{"x":995,"y":466},{"x":589,"y":258},{"x":700,"y":120},{"x":855,"y":323},{"x":690,"y":355},{"x":755,"y":353},{"x":378,"y":970},{"x":865,"y":270},{"x":220,"y":62},{"x":685,"y":848},{"x":670,"y":907},{"x":710,"y":671},{"x":209,"y":68},{"x":642,"y":470},{"x":104,"y":642},{"x":631,"y":328},{"x":898,"y":424},{"x":909,"y":427},{"x":189,"y":141},{"x":259,"y":993},{"x":332,"y":791},{"x":842,"y":778},{"x":63,"y":390},{"x":146,"y":895},{"x":230,"y":274},{"x":316,"y":447},{"x":603,"y":59},{"x":377,"y":841},{"x":602,"y":119},{"x":728,"y":557},{"x":395,"y":514},{"x":379,"y":754},{"x":822,"y":840},{"x":860,"y":478},{"x":695,"y":360},{"x":156,"y":784},{"x":241,"y":353},{"x":195,"y":199},{"x":284,"y":110},{"x":484,"y":966},{"x":889,"y":370},{"x":246,"y":684},{"x":710,"y":345},{"x":382,"y":635},{"x":447,"y":948},{"x":741,"y":274},{"x":224,"y":883},{"x":99,"y":37},{"x":472,"y":803},{"x":141,"y":397},{"x":371,"y":602},{"x":7,"y":482},{"x":184,"y":990},{"x":555,"y":313},{"x":573,"y":886},{"x":167,"y":365},{"x":810,"y":721},{"x":958,"y":767},{"x":891,"y":561},{"x":314,"y":987},{"x":156,"y":95},{"x":349,"y":542},{"x":775,"y":35},{"x":121,"y":655},{"x":311,"y":242},{"x":534,"y":135},{"x":71,"y":134},{"x":367,"y":896},{"x":447,"y":524},{"x":120,"y":421},{"x":878,"y":398},{"x":469,"y":822},{"x":483,"y":966},{"x":240,"y":880},{"x":759,"y":980},{"x":531,"y":759},{"x":395,"y":118},{"x":354,"y":360},{"x":173,"y":924},{"x":550,"y":958},{"x":888,"y":379},{"x":244,"y":448},{"x":999,"y":554},{"x":941,"y":455},{"x":798,"y":916},{"x":134,"y":123},{"x":90,"y":440},{"x":923,"y":263},{"x":405,"y":595},{"x":194,"y":387},{"x":370,"y":697},{"x":943,"y":888},{"x":607,"y":336},{"x":168,"y":105},{"x":874,"y":66},{"x":675,"y":50},{"x":601,"y":242},{"x":925,"y":728},{"x":643,"y":609},{"x":769,"y":713},{"x":410,"y":913},{"x":153,"y":776},{"x":775,"y":949},{"x":184,"y":93},{"x":624,"y":632},{"x":899,"y":804},{"x":909,"y":327},{"x":371,"y":510},{"x":663,"y":415},{"x":337,"y":542},{"x":248,"y":104},{"x":925,"y":450},{"x":310,"y":925},{"x":4,"y":550},{"x":559,"y":652},{"x":671,"y":296},{"x":414,"y":60},{"x":972,"y":505},{"x":221,"y":147},{"x":318,"y":592},{"x":861,"y":656},{"x":258,"y":675},{"x":565,"y":390},{"x":703,"y":236},{"x":227,"y":76},{"x":989,"y":252},{"x":924,"y":419},{"x":983,"y":971},{"x":795,"y":244},{"x":256,"y":498},{"x":517,"y":674},{"x":89,"y":197},{"x":366,"y":234},{"x":41,"y":952},{"x":487,"y":981},{"x":939,"y":922},{"x":384,"y":315},{"x":958,"y":57},{"x":499,"y":152},{"x":716,"y":167},{"x":167,"y":301},{"x":781,"y":964},{"x":101,"y":215},{"x":605,"y":396},{"x":31,"y":973},{"x":128,"y":831},{"x":685,"y":701},{"x":150,"y":507},{"x":663,"y":77},{"x":792,"y":561},{"x":398,"y":281},{"x":168,"y":936},{"x":8,"y":266},{"x":19,"y":723},{"x":377,"y":975},{"x":68,"y":114},{"x":191,"y":784},{"x":94,"y":222},{"x":986,"y":578},{"x":474,"y":160},{"x":936,"y":945},{"x":603,"y":778},{"x":105,"y":845},{"x":955,"y":583},{"x":832,"y":905},{"x":264,"y":132},{"x":219,"y":747},{"x":515,"y":562},{"x":178,"y":198},{"x":999,"y":1},{"x":470,"y":345},{"x":450,"y":490},{"x":967,"y":306},{"x":257,"y":360},{"x":632,"y":26},{"x":916,"y":382},{"x":631,"y":194},{"x":492,"y":235},{"x":479,"y":373},{"x":887,"y":154},{"x":65,"y":181},{"x":956,"y":879},{"x":567,"y":578},{"x":718,"y":617},{"x":464,"y":243},{"x":545,"y":410},{"x":923,"y":340},{"x":978,"y":716},{"x":277,"y":261},{"x":462,"y":600},{"x":687,"y":507}
+ {"x":191, "y":141},
+ {"x":585, "y":158},
+ {"x":613, "y":241},
+ {"x":449, "y":232},
+ {"x":315, "y":287},
+ {"x":543, "y":415},
+ {"x":609, "y":401},
+ {"x":596, "y":490},
+ {"x":497, "y":479},
+ {"x":274, "y":524},
+ {"x":415, "y":582},
+ {"x":89, "y":535},
+ {"x":72, "y":555},
+ {"x":75, "y":586},
+ {"x":250, "y":748},
+ {"x":630, "y":767},
+ {"x":407, "y":899},
+ {"x":311, "y":978},
+ {"x":393, "y":1055},
+ {"x":66, "y":792},
+ {"x":79, "y":770},
+ {"x":74, "y":754},
+ {"x":52, "y":763},
+ {"x":68, "y":761},
+ {"x":252, "y":1122},
+ {"x":434, "y":1223},
+ {"x":624, "y":968},
+ {"x":655, "y":1343},
+ {"x":645, "y":1314},
+ {"x":560, "y":1450},
+ {"x":362, "y":1427},
+ {"x":385, "y":1365},
+ {"x":367, "y":1358},
+ {"x":162, "y":1282},
+ {"x":174, "y":1407},
+ {"x":642, "y":1570},
+ {"x":582, "y":1587},
+ {"x":365, "y":1647},
+ {"x":314, "y":1730},
+ {"x":305, "y":1627},
+ {"x":218, "y":1578}
],
"jellyfish": [
{
- "position": {
- "x": 300,
- "y": 100
- }
+ "position": {"x": 280, "y": 200}
+ },
+ {
+ "position": {"x":502, "y":489}
+ },
+ {
+ "position": {"x":564, "y":421}
+ },
+ {
+ "position": {"x":336, "y":496}
+ },
+ {
+ "position": {"x":308, "y":838}
+ },
+ {
+ "position": {"x":392, "y":1008}
+ },
+ {
+ "position": {"x":313, "y":973}
+ },
+ {
+ "position": {"x":367, "y":898}
+ },
+ {
+ "position": {"x":340, "y":1023}
+ },
+ {
+ "position": {"x":271, "y":1010}
+ },
+ {
+ "position": {"x":529, "y":1226}
+ },
+ {
+ "position": {"x":284, "y":1536}
}
],
"octopus": [
{
"position_a" : {
- "x": 300,
- "y": 150
+ "x": 440,
+ "y": 110
},
"position_b" : {
- "x": 500,
- "y": 100
+ "x": 550,
+ "y": 130
+ }
+ },
+ {
+ "position_a" : {
+ "x": 316,
+ "y": 384
+ },
+ "position_b" : {
+ "x": 154,
+ "y": 350
+ }
+ },
+ {
+ "position_a" : {
+ "x": 542,
+ "y": 612
+ },
+ "position_b" : {
+ "x": 535,
+ "y": 486
+ }
+ },
+ {
+ "position_a" : {
+ "x": 285,
+ "y": 1211
+ },
+ "position_b" : {
+ "x": 365,
+ "y": 1156
+ }
+ },
+ {
+ "position_a" : {
+ "x": 199,
+ "y": 1629
+ },
+ "position_b" : {
+ "x": 316,
+ "y": 1731
+ }
+ },
+ {
+ "position_a" : {
+ "x": 320,
+ "y": 1705
+ },
+ "position_b" : {
+ "x": 233,
+ "y": 1582
}
}
],
"whirlpool": [
{
"position" : {
- "x": 250,
- "y": 250
+ "x":401,
+ "y":364
+ },
+ "should_remove": false,
+ "rotation": 0
+ },
+ {
+ "position" : {
+ "x":73,
+ "y":868
+ },
+ "should_remove": false,
+ "rotation": 0
+ },
+ {
+ "position" : {
+ "x":486,
+ "y":828
+ },
+ "should_remove": false,
+ "rotation": 0
+ },
+ {
+ "position" : {
+ "x":441,
+ "y":1663
},
"should_remove": false,
"rotation": 0
}
+ ],
+ "pufferfish": [
+ {
+ "position" : {
+ "x": 261,
+ "y": 387
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 195,
+ "y": 694
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 635,
+ "y": 731
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 169,
+ "y": 1104
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 478,
+ "y": 1333
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 499,
+ "y": 1775
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ },
+ {
+ "position" : {
+ "x": 74,
+ "y": 1259
+ },
+ "is_knocking_back": false,
+ "time_knocking_back": 0.0,
+ "inflate_timer": 0.0,
+ "is_large": false,
+ "stun_timer": 0.0,
+ "puffer_state": "SmallIdle"
+
+ }
+
]
}
\ No newline at end of file
diff --git a/src/entities/enemy/jellyfish.rs b/src/entities/enemy/jellyfish.rs
index 1330bdf..b1fcc80 100644
--- a/src/entities/enemy/jellyfish.rs
+++ b/src/entities/enemy/jellyfish.rs
@@ -6,7 +6,7 @@ use crate::{
use raylib::prelude::*;
use serde::{Deserialize, Serialize};
-const JELLYFISH_STUN_DURATION: f64 = 0.75;
+const JELLYFISH_STUN_DURATION: f64 = 1.5;
const JELLYFISH_STUN_REACH: f32 = 20.0;
#[derive(Debug, Serialize, Deserialize, Default, Clone)]
diff --git a/src/entities/enemy/mod.rs b/src/entities/enemy/mod.rs
index 18acd78..91246eb 100644
--- a/src/entities/enemy/mod.rs
+++ b/src/entities/enemy/mod.rs
@@ -1,4 +1,5 @@
pub mod base;
pub mod jellyfish;
pub mod octopus;
-pub mod whirlpool;
\ No newline at end of file
+pub mod whirlpool;
+pub mod pufferfish;
\ No newline at end of file
diff --git a/src/entities/enemy/octopus.rs b/src/entities/enemy/octopus.rs
index 73d8cee..5d57e46 100644
--- a/src/entities/enemy/octopus.rs
+++ b/src/entities/enemy/octopus.rs
@@ -10,7 +10,7 @@ use raylib::prelude::*;
use serde::{Deserialize, Serialize};
const OCTOPUS_SUCK_AIR_DELAY: f64 = 3.5;
-const OCTOPUS_SUCK_AIR_RANGE: f32 = 70.0;
+const OCTOPUS_SUCK_AIR_RANGE: f32 = 40.0;
const OCTOPUS_SUCK_AIR_DURATION: f64 = 1.0;
const OCTOPUS_SUCK_AIR_AMOUNT: f32 = 0.1;
diff --git a/src/entities/enemy/pufferfish.rs b/src/entities/enemy/pufferfish.rs
new file mode 100644
index 0000000..9f72119
--- /dev/null
+++ b/src/entities/enemy/pufferfish.rs
@@ -0,0 +1,154 @@
+use raylib::prelude::*;
+
+use serde::{Deserialize, Serialize};
+
+use crate::{lib::utils::calculate_linear_slide, pallette::TRANSLUCENT_RED_64};
+
+use super::base::EnemyBase;
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq)]
+pub enum PufferState {
+ SmallIdle,
+ Growing,
+ LargeIdle,
+ Blowing,
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub struct Pufferfish {
+ pub position: Vector2,
+ pub is_knocking_back: bool,
+ pub time_knocking_back: f64,
+
+ pub inflate_timer: f64,
+ pub is_large: bool,
+ pub stun_timer: f64,
+ pub puffer_state: PufferState,
+}
+
+impl EnemyBase for Pufferfish {
+ fn render(
+ &mut self,
+ context_2d: &mut RaylibMode2D,
+ player: &mut crate::player::Player,
+ resources: &mut crate::resources::GlobalResources,
+ dt: f64,
+ ) {
+
+ let is_stunned = self.stun_timer > 0.0;
+
+ // Render the stun ring
+ if is_stunned {
+ println!("Stunned");
+ let stun_ring_alpha =
+ calculate_linear_slide(self.stun_timer / 1.0);
+ context_2d.draw_circle_v(
+ self.position,
+ 12.0,
+ TRANSLUCENT_RED_64.fade(0.55 * stun_ring_alpha as f32),
+ );
+
+ self.stun_timer -= dt;
+ }
+
+
+ let angle = player.position.angle_to(self.position).to_degrees();
+
+
+ match self.puffer_state {
+ PufferState::SmallIdle => {
+ resources.pufferfish_small.draw(
+ context_2d,
+ Vector2 {
+ x: self.position.x,
+ y: self.position.y,
+ },
+ angle,
+ );
+
+ if self.position.distance_to(player.position).abs() <= 100.0 && self.inflate_timer > 1.0{
+ self.puffer_state = PufferState::Growing;
+ }
+ self.is_large = false;
+ },
+ PufferState::Growing => {
+ self.inflate_timer = 0.0;
+ resources.pufferfish_expand.draw(
+ context_2d,
+ Vector2 {
+ x: self.position.x,
+ y: self.position.y,
+ },
+ angle,
+ );
+
+ if resources.pufferfish_expand.get_current_frame_id(context_2d) == 3 {
+ self.puffer_state = PufferState::LargeIdle;
+ }
+ self.is_large = true;
+
+ },
+ PufferState::LargeIdle => {
+ self.inflate_timer = 0.0;
+ resources.pufferfish_big.draw(
+ context_2d,
+ Vector2 {
+ x: self.position.x,
+ y: self.position.y,
+ },
+ angle,
+ );
+
+ if self.position.distance_to(player.position).abs() <= 65.0{
+ self.puffer_state = PufferState::Blowing;
+ self.is_knocking_back = true;
+ self.time_knocking_back = 0.0;
+ }
+
+ self.is_large = true;
+ },
+ PufferState::Blowing => {
+
+ resources.pufferfish_attack.draw(
+ context_2d,
+ Vector2 {
+ x: self.position.x,
+ y: self.position.y,
+ },
+ angle,
+ );
+
+
+ if resources.pufferfish_expand.get_current_frame_id(context_2d) == 3 && self.inflate_timer > 1.0{
+ self.puffer_state = PufferState::SmallIdle;
+ self.inflate_timer = 0.0;
+ }
+ self.is_large = false;
+ },
+ }
+ }
+
+ fn handle_logic(&mut self, player: &mut crate::player::Player, dt: f64) {
+
+
+
+ self.inflate_timer += dt;
+ self.time_knocking_back += dt;
+
+ if self.time_knocking_back >= 0.5{
+ self.is_knocking_back = false;
+ }
+
+ if self.position.distance_to(player.position).abs() > 120.0 && self.is_large {
+ self.puffer_state = PufferState::Blowing;
+ self.inflate_timer = 0.0;
+ }
+
+ }
+
+ fn handle_getting_attacked(&mut self, stun_duration: f64, current_time: f64) {
+
+ self.stun_timer = stun_duration;
+
+ }
+}
diff --git a/src/items.rs b/src/items.rs
index f649bd5..364dc99 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -32,25 +32,25 @@ impl StunGun {
pub fn lvl1() -> Self {
Self {
range: 30.0,
- duration: 0.75,
+ duration: 2.0,
level: 1,
- cost: 30,
+ cost: 15,
}
}
pub fn lvl2() -> Self {
Self {
range: 60.0,
- duration: 1.25,
+ duration: 2.5,
level: 2,
- cost: 40,
+ cost: 25,
}
}
pub fn lvl3() -> Self {
Self {
range: 80.0,
- duration: 1.0,
+ duration: 3.0,
level: 3,
- cost: 50,
+ cost: 40,
}
}
}
@@ -111,14 +111,14 @@ impl AirBag {
Self {
extra_oxygen: 0.15,
level: 1,
- cost: 30,
+ cost: 25,
}
}
pub fn lvl2() -> Self {
Self {
extra_oxygen: 0.30,
level: 2,
- cost: 40,
+ cost: 35,
}
}
pub fn lvl3() -> Self {
@@ -186,21 +186,21 @@ impl Flashlight {
Self {
radius: 0.25,
level: 1,
- cost: 40,
+ cost: 20,
}
}
pub fn lvl2() -> Self {
Self {
radius: 0.5,
level: 2,
- cost: 50,
+ cost: 30,
}
}
pub fn lvl3() -> Self {
Self {
radius: 1.0,
level: 3,
- cost: 60,
+ cost: 50,
}
}
}
@@ -259,21 +259,21 @@ pub struct Flippers {
impl Flippers {
pub fn lvl1() -> Self {
Self {
- speed_increase: 1.2,
+ speed_increase: 1.1,
level: 1,
cost: 30,
}
}
pub fn lvl2() -> Self {
Self {
- speed_increase: 1.5,
+ speed_increase: 1.2,
level: 2,
cost: 40,
}
}
pub fn lvl3() -> Self {
Self {
- speed_increase: 1.8,
+ speed_increase: 1.3,
level: 3,
cost: 50,
}
diff --git a/src/lib/wrappers/audio/player.rs b/src/lib/wrappers/audio/player.rs
index 4ca9a25..182a217 100644
--- a/src/lib/wrappers/audio/player.rs
+++ b/src/lib/wrappers/audio/player.rs
@@ -39,3 +39,10 @@ impl std::ops::Deref for AudioPlayer {
&self.backend
}
}
+
+
+impl std::ops::DerefMut for AudioPlayer {
+ fn deref_mut(&mut self) -> &mut Self::Target {
+ &mut self.backend
+ }
+}
diff --git a/src/logic/ingame/mod.rs b/src/logic/ingame/mod.rs
index d1aa504..9f9970a 100644
--- a/src/logic/ingame/mod.rs
+++ b/src/logic/ingame/mod.rs
@@ -253,6 +253,17 @@ impl Screen for InGameScreen {
}
+ // Iterates over pufferfish
+ for pufferfish in game_core.world.pufferfish.iter_mut(){
+
+ pufferfish.handle_logic(&mut game_core.player, dt);
+ pufferfish.render(&mut context_2d, &mut game_core.player, &mut game_core.resources, dt);
+
+
+
+ }
+
+
// Removes whirlpools set for removal
game_core.world.whirlpool.retain(|x| !x.should_remove());
diff --git a/src/logic/ingame/playerlogic.rs b/src/logic/ingame/playerlogic.rs
index cf9a397..0eee09e 100644
--- a/src/logic/ingame/playerlogic.rs
+++ b/src/logic/ingame/playerlogic.rs
@@ -1,6 +1,7 @@
+use raylib::core::audio::RaylibAudio;
use raylib::prelude::*;
-use crate::gamecore::GameCore;
+use crate::{gamecore::GameCore, lib::wrappers::audio::player::AudioPlayer};
const NORMAL_PLAYER_SPEED: i32 = 1;
const BOOST_PLAYER_SPEED: i32 = NORMAL_PLAYER_SPEED * 2;
@@ -11,14 +12,19 @@ const BOOST_DECREASE_PER_SECOND: f32 = 0.65;
const BOOST_REGEN_PER_SECOND: f32 = 0.25;
const BREATH_DECREASE_PER_SECOND: f32 = 0.02;
+
+
pub fn update_player_movement(
draw_handle: &mut RaylibDrawHandle,
game_core: &mut GameCore,
window_center: Vector2,
) {
+
+ // let mut p: AudioPlayer = AudioPlayer::new(RaylibAudio::init_audio_device());
+ // p.play_sound(&game_core.resources.breath);
// Calculate DT
let dt = draw_handle.get_time() - game_core.last_frame_time;
-
+
// Handle player movement
let mouse_pose = draw_handle.get_mouse_position();
let mouse_world_pose = draw_handle.get_screen_to_world2D(mouse_pose, game_core.master_camera);
@@ -80,6 +86,7 @@ pub fn update_player_movement(
game_core
.player
.begin_attack(&mut game_core.world, draw_handle.get_time());
+ //println!("{{\"x\":{}, \"y\":{}}},",f32::round(game_core.player.position.x),f32::round(game_core.player.position.y));
}
// Move the player in their direction
@@ -202,6 +209,44 @@ pub fn update_player_movement(
}
+ for pufferfish in game_core.world.pufferfish.iter_mut(){
+
+ if pufferfish.is_knocking_back{
+ // Calculates info for formulas
+
+ // Deltas between positions
+ let net_pose = game_core.player.position - pufferfish.position;
+
+ // Angle between: UNITS: RADIANS
+ let angle = net_pose.y.atan2(net_pose.x);
+
+ // Calculates force
+ let force = 1.0;
+
+ // Calculates componets of force
+ let mut force_x = (force as f32 * angle.cos()).clamp(-1.0, 1.0);
+ let mut force_y = (force as f32 * angle.sin()).clamp(-1.0, 1.0);
+
+ // Prevents Nan erros
+ if force_x.is_nan(){
+ force_x = 1.0 * net_pose.x;
+ }
+
+ if force_y.is_nan(){
+ force_y = 1.0 * net_pose.y;
+ }
+
+ game_core.player.additional_vel.x += force_x;
+ game_core.player.additional_vel.y += force_y;
+
+ should_apply_friction = false;
+
+ }
+
+
+
+ }
+
if should_apply_friction {
game_core.player.additional_vel.x /= PLAYER_FRICTION;
game_core.player.additional_vel.y /= PLAYER_FRICTION;
diff --git a/src/logic/mainmenu.rs b/src/logic/mainmenu.rs
index 421105c..475e9bc 100644
--- a/src/logic/mainmenu.rs
+++ b/src/logic/mainmenu.rs
@@ -34,8 +34,8 @@ impl Screen for MainMenuScreen {
// Render title
draw_handle.draw_text(
- "ONE BREATH",
- (win_height / 2) - 80,
+ "DEEP BREATH",
+ (win_height / 2) - 100,
win_width / 8,
80,
Color::BLACK,
diff --git a/src/logic/pausemenu.rs b/src/logic/pausemenu.rs
index 7b627f0..6d265c0 100644
--- a/src/logic/pausemenu.rs
+++ b/src/logic/pausemenu.rs
@@ -123,9 +123,9 @@ impl Screen for PauseMenuScreen {
// Render credits
draw_handle.draw_text(
- "Credits:\n\t- @ewpratten\n\t- @rsninja722\n\t- @wm-c\n\t- @catarinaburghi",
+ "Credits:\n\t- @ewpratten\n\t- @rsninja722\n\t- @wm-c\n\t- @catarinaburghi\n\t- @kondroel",
(win_width / 2) - (SCREEN_PANEL_SIZE.x as i32 / 2) + 10,
- (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 170,
+ (win_height / 2) - (SCREEN_PANEL_SIZE.y as i32 / 2) + 150,
20,
Color::BLACK,
);
diff --git a/src/main.rs b/src/main.rs
index cbf7e65..27cabe3 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -23,7 +23,7 @@ const DEFAULT_WINDOW_DIMENSIONS: Vector2 = Vector2 {
x: 1080.0,
y: 720.0,
};
-const WINDOW_TITLE: &str = r"One Breath";
+const WINDOW_TITLE: &str = r"Deep Breath";
const MAX_FPS: u32 = 60;
fn main() {
diff --git a/src/player.rs b/src/player.rs
index b11b086..c173602 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -103,6 +103,11 @@ impl Player {
if whirlpool.position.distance_to(self.position).abs() <= stun_reach {
whirlpool.handle_getting_attacked(self.attacking_timer, current_time);
}
+ }
+ for pufferfish in world.pufferfish.iter_mut() {
+ if pufferfish.position.distance_to(self.position).abs() <= stun_reach {
+ pufferfish.handle_getting_attacked(self.attacking_timer, current_time);
+ }
}
}
}
diff --git a/src/resources.rs b/src/resources.rs
index 35b16ac..589a8fd 100644
--- a/src/resources.rs
+++ b/src/resources.rs
@@ -1,9 +1,4 @@
-use raylib::{
- math::Vector2,
- shaders::Shader,
- texture::{Image, RenderTexture2D, Texture2D},
- RaylibHandle, RaylibThread,
-};
+use raylib::{RaylibHandle, RaylibThread, audio::Sound, math::Vector2, shaders::Shader, texture::{Image, RenderTexture2D, Texture2D}};
use crate::lib::wrappers::animation::FrameAnimationWrapper;
@@ -33,6 +28,10 @@ pub struct GlobalResources {
pub octopus_animation_regular: FrameAnimationWrapper,
pub octopus_animation_attack: FrameAnimationWrapper,
pub whirlpool: FrameAnimationWrapper,
+ pub pufferfish_big: FrameAnimationWrapper,
+ pub pufferfish_small: FrameAnimationWrapper,
+ pub pufferfish_attack: FrameAnimationWrapper,
+ pub pufferfish_expand: FrameAnimationWrapper,
// Darkness layer
pub darkness_overlay: Texture2D,
@@ -62,6 +61,9 @@ pub struct GlobalResources {
// Treasure
pub transponder: FrameAnimationWrapper,
+
+ // Audio
+ pub breath: Sound,
}
impl GlobalResources {
@@ -155,7 +157,7 @@ impl GlobalResources {
)?,
Vector2 { x: 20.0, y: 20.0 },
15,
- 4,
+ 6,
),
octopus_animation_regular: FrameAnimationWrapper::new(
raylib.load_texture_from_image(
@@ -257,6 +259,43 @@ impl GlobalResources {
4,
4,
),
+ pufferfish_big: FrameAnimationWrapper::new(
+ raylib.load_texture_from_image(
+ &thread,
+ &Image::load_image("./assets/img/enemies/pufferFishBigIdle.png")?,
+ )?,
+ Vector2 { x: 19.0, y: 19.0 },
+ 3,
+ 2,
+ ),
+ pufferfish_small: FrameAnimationWrapper::new(
+ raylib.load_texture_from_image(
+ &thread,
+ &Image::load_image("./assets/img/enemies/pufferFishIdle.png")?,
+ )?,
+ Vector2 { x: 19.0, y: 19.0 },
+ 6,
+ 2,
+ ),
+ pufferfish_attack: FrameAnimationWrapper::new(
+ raylib.load_texture_from_image(
+ &thread,
+ &Image::load_image("./assets/img/enemies/pufferFishAttack.png")?,
+ )?,
+ Vector2 { x: 39.0, y: 25.0 },
+ 4,
+ 2,
+ ),
+ pufferfish_expand: FrameAnimationWrapper::new(
+ raylib.load_texture_from_image(
+ &thread,
+ &Image::load_image("./assets/img/enemies/pufferFishExpand.png")?,
+ )?,
+ Vector2 { x: 19.0, y: 19.0 },
+ 4,
+ 2,
+ ),
+ breath: Sound::load_sound("./assets/audio/breath.mp3")?
})
}
}
diff --git a/src/world.rs b/src/world.rs
index e1e1e00..15f592b 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -4,14 +4,7 @@ use failure::Error;
use raylib::math::{Rectangle, Vector2};
use serde::{Deserialize, Serialize};
-use crate::{
- entities::{
- enemy::{jellyfish::JellyFish, octopus::Octopus, whirlpool::Whirlpool,},
- fish::FishEntity,
-
- },
- player::Player,
-};
+use crate::{entities::{enemy::{jellyfish::JellyFish, octopus::Octopus, pufferfish::Pufferfish, whirlpool::Whirlpool}, fish::FishEntity}, player::Player};
#[derive(Debug, Serialize, Deserialize, Clone)]
pub struct World {
@@ -31,6 +24,7 @@ pub struct World {
pub jellyfish: Vec,
pub octopus: Vec,
pub whirlpool: Vec,
+ pub pufferfish: Vec
}