0.5 Updates

Cargo.toml

@@ -23,8 +23,8 @@ core = { path = "./core", package = "fishfight-core" }
 # ultimate = { path = "../FishFight-ultimate", package = "fishfight-ultimate", optional = true }
 ff-particles = { version = "0.1", features = ["serde"] }
 fishsticks = { git = "https://github.com/fishfight/fishsticks", default-features = false, features = ["gilrs"] }
-macroquad = { version = "0.3.10" }
-macroquad-platformer = "0.1"
+macroquad = { version = "=0.3.16" } # Newer versions break is_key_pressed detection
+macroquad-platformer = "0.1.3"
 hecs = "0.7.1"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"

README.md

@@ -72,26 +72,9 @@ pacman -S fishfight
 2. Clone this repository: `git clone https://github.com/fishfight/FishFight.git`
 3. `cargo run`
 
-## Default key bindings
-
-Keyboard right:
-- movement: arrow keys `↑`, `←`, `↓`, `→`
-- pick/drop: `K`
-- attack: `L`
-- slide: `↓` + `RightCtrl`
-
-Keyboard left:
-- movement: `W`, `A`, `S`, `D` (& `Space` for jump)
-- pick/drop: `C`
-- attack: `V` & `LeftCtrl`
-- slide: `A` + `F`
-
-Gamepad:
-- movement: direction axis
-- pick/drop: `X`
-- attack: `B`
-- jump: `A`
-- slide: `Down` + `Y`
+## Default Keybindings
+
+You can view and modify the default keybindings in [config.toml](./config.toml).
 
 ## Credits
 

assets/decoration/anemones.json

@@ -3,10 +3,6 @@
   "sprite": {
     "texture": "default_decoration",
     "autoplay_id": "idle",
-    "frame_size": {
-      "x": 48,
-      "y": 51
-    },
     "animations": [
       {
         "id": "idle",

assets/decoration/seaweed.json

@@ -3,10 +3,6 @@
   "sprite": {
     "texture": "default_decoration",
     "autoplay_id": "idle",
-    "frame_size": {
-      "x": 48,
-      "y": 51
-    },
     "animations": [
       {
         "id": "idle",
@@ -15,7 +11,6 @@
         "fps": 8,
         "is_looping": true
       }
-    ],
-    "autoplay": true
+    ]
   }
-}
+}

assets/items/cannon.json

@@ -46,7 +46,6 @@
           "type": "circle_collider",
           "radius": 80,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {

assets/items/grenades.json

@@ -60,8 +60,7 @@
             "fps": 12,
             "is_looping": true
           }
-        ],
-        "should_autoplay": true
+        ]
       },
       "particles": [
         {
@@ -101,4 +100,4 @@
       }
     ]
   }
-}
+}

assets/items/kick_bomb.json

@@ -42,7 +42,6 @@
           "type": "circle_collider",
           "radius": 64,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {

assets/items/mines.json

@@ -30,7 +30,6 @@
           "type": "circle_collider",
           "radius": 64,
           "is_explosion": true,
-          "particle_effect": "hit",
           "sound_effect": "explode"
         },
         {

assets/maps/lev01.json

@@ -856,11 +856,11 @@
           }
         },
         {
-          "id": "mines",
+          "id": "kick_bomb",
           "kind": "item",
           "position": {
-            "x": 142.4722,
-            "y": 253.69444
+            "x": 141.7857,
+            "y": 240.12857
           }
         },
         {
@@ -1494,10 +1494,10 @@
         "56": [
           "jumpthrough"
         ],
-        "60": [
+        "58": [
           "jumpthrough"
         ],
-        "58": [
+        "60": [
           "jumpthrough"
         ]
       }

assets/maps/lev02.json

@@ -274,8 +274,8 @@
         0,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -301,8 +301,8 @@
         2,
         8,
         10,
-        59,
-        61,
+        0,
+        0,
         0,
         0,
         0,
@@ -355,8 +355,8 @@
         13,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -409,8 +409,8 @@
         6,
         8,
         10,
-        59,
-        61,
+        0,
+        0,
         0,
         0,
         0,
@@ -436,8 +436,8 @@
         13,
         8,
         10,
-        0,
-        0,
+        59,
+        61,
         0,
         0,
         0,
@@ -536,7 +536,7 @@
         0,
         0,
         0,
-        0,
+        57,
         29,
         30,
         40,
@@ -699,8 +699,8 @@
           "id": "anemones",
           "kind": "decoration",
           "position": {
-            "x": 37.54866,
-            "y": 237.76035
+            "x": 35.88199,
+            "y": 301.0937
           }
         },
         {
@@ -728,35 +728,123 @@
       "has_collision": false,
       "objects": [
         {
-          "id": "sword",
+          "id": "grenades",
           "kind": "item",
           "position": {
-            "x": 225.00365,
-            "y": 570.9357
+            "x": 798.1076,
+            "y": 120.600006
           }
         },
         {
-          "id": "sword",
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 419.0,
+            "y": 399.33334
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 608.94116,
+            "y": 82.56866
+          }
+        },
+        {
+          "id": "crab",
+          "kind": "environment",
+          "position": {
+            "x": 135.36362,
+            "y": 147.27274
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 248.2858,
+            "y": 424.99997
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 765.28577,
+            "y": 205.14287
+          }
+        },
+        {
+          "id": "fish_school",
+          "kind": "environment",
+          "position": {
+            "x": 204.00006,
+            "y": 108.42859
+          }
+        },
+        {
+          "id": "sniper_rifle",
+          "kind": "item",
+          "position": {
+            "x": 578.4286,
+            "y": 54.14292
+          }
+        },
+        {
+          "id": "mines",
           "kind": "item",
           "position": {
-            "x": 655.00366,
-            "y": 284.93573
+            "x": 41.571472,
+            "y": 221.28577
           }
         },
         {
           "id": "musket",
           "kind": "item",
           "position": {
-            "x": 353.08264,
-            "y": 19.381384
+            "x": 569.85706,
+            "y": 306.33325
           }
         },
         {
-          "id": "mines",
+          "id": "musket",
+          "kind": "item",
+          "position": {
+            "x": 199.16669,
+            "y": 444.16672
+          }
+        },
+        {
+          "id": "sproinger",
+          "kind": "environment",
+          "position": {
+            "x": 705.6667,
+            "y": 491.83334
+          }
+        },
+        {
+          "id": "sword",
+          "kind": "item",
+          "position": {
+            "x": 143.18549,
+            "y": 612.7539
+          }
+        },
+        {
+          "id": "sword",
+          "kind": "item",
+          "position": {
+            "x": 401.6703,
+            "y": 385.7691
+          }
+        },
+        {
+          "id": "musket",
           "kind": "item",
           "position": {
-            "x": 726.0,
-            "y": 70.0
+            "x": 274.90082,
+            "y": 32.108643
           }
         }
       ],
@@ -1483,16 +1571,20 @@
   ],
   "spawn_points": [
     {
-      "x": 82.574425,
-      "y": 468.84995
+      "x": 98.210815,
+      "y": 490.57727
     },
     {
-      "x": 316.61115,
-      "y": 103.42124
+      "x": 271.61115,
+      "y": 101.75456
     },
     {
       "x": 787.6791,
       "y": 195.83423
+    },
+    {
+      "x": 650.2078,
+      "y": 458.88315
     }
   ]
 }