diff --git a/assets/worlds/mainworld.json b/assets/worlds/mainworld.json index 591d3b6..368ba0d 100644 --- a/assets/worlds/mainworld.json +++ b/assets/worlds/mainworld.json @@ -52,10 +52,40 @@ ], "jellyfish": [ { - "position": { - "x": 280, - "y": 200 - } + "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": [ @@ -68,6 +98,56 @@ "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": [ @@ -78,7 +158,30 @@ }, "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 } - ] } \ 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;