Merge #507

507: Update level items r=zicklag a=zicklag

bors merge

Co-authored-by: Zicklag <zicklag@katharostech.com>

Author: bors[bot]

assets/map/levels/level1.map.yaml

@@ -1226,6 +1226,22 @@ layers:
             - 536.0
             - 309.5
           element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 738
+            - 111
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 643
+            - 520
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 223
+            - 520
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 131
+            - 111
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
             - 719.0
             - 400.5

assets/map/levels/level2.map.yaml

@@ -765,10 +765,6 @@ layers:
             - 944
             - 74
           element: ../elements/environment/sproinger/sproinger.element.yaml
-        - pos:
-            - 706.8572
-            - 337.5
-          element: ../elements/item/sword/sword.element.yaml
         - pos:
             - 536.0
             - 185.5
@@ -801,9 +797,6 @@ layers:
             - 120.0
             - 89.5
           element: ../elements/decoration/anemones/anemones.element.yaml
-  - id: items
-    kind: !element
-      elements:
         - pos:
             - 222.6668
             - 127.5
@@ -812,38 +805,65 @@ layers:
             - 446.0
             - 185.5
           element: ../elements/environment/fish_school/fish_school.element.yaml
-        - pos:
-            - 712.0001
-            - 73.5
-          element: ../elements/environment/crab/crab.element.yaml
         - pos:
             - 891.3332
             - 241.5
           element: ../elements/environment/fish_school/fish_school.element.yaml
+        - pos:
+            - 712.0001
+            - 73.5
+          element: ../elements/environment/crab/crab.element.yaml
         - pos:
             - 478.6667
             - 265.5
           element: ../elements/environment/crab/crab.element.yaml
+  - id: items
+    kind: !element
+      elements:
         - pos:
-            - 256.0
-            - 73.5
-          element: ../elements/item/musket/musket.element.yaml
-        - pos:
-            - 652.5714
-            - 73.5
-          element: ../elements/item/musket/musket.element.yaml
-        - pos:
-            - 456.0
-            - 285.5
-          element: ../elements/item/kick_bomb/kick_bomb.element.yaml
-        - pos:
-            - 1015.1428
-            - 95.5
-          element: ../elements/item/kick_bomb/kick_bomb.element.yaml
+            - 706.8572
+            - 337.5
+          element: ../elements/item/sword/sword.element.yaml
         - pos:
             - 224.0
             - 311.5
           element: ../elements/item/sword/sword.element.yaml
+        - pos:
+            - 500
+            - 263
+          element: ../elements/item/mine/mine.element.yaml
+        - pos:
+            - 180
+            - 178
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 994
+            - 81
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 800
+            - 207
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 449 
+            - 276
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 854
+            - 207
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 644
+            - 89
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 93
+            - 89
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 262
+            - 89
+          element: ../elements/item/grenade/grenade.element.yaml
   - id: spawners
     kind: !element
       elements:

assets/map/levels/level3.map.yaml

@@ -1457,14 +1457,6 @@ layers:
   - id: items
     kind: !element
       elements:
-        - pos:
-            - 65.399994
-            - 471.5
-          element: ../elements/item/grenade/grenade.element.yaml
-        - pos:
-            - 824.0
-            - 469.5
-          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
             - 441.41046
             - 143.5
@@ -1494,25 +1486,61 @@ layers:
             - 303.5
           element: ../elements/environment/crab/crab.element.yaml
         - pos:
-            - 568.0
-            - 137.5
-          element: ../elements/item/musket/musket.element.yaml
+            - 700
+            - 148
+          element: ../elements/item/mine/mine.element.yaml
         - pos:
-            - 328.11426
-            - 145.5
-          element: ../elements/item/musket/musket.element.yaml
+            - 177
+            - 148
+          element: ../elements/item/mine/mine.element.yaml
+        - pos:
+            - 65.399994
+            - 471.5
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 800.0
+            - 469.5
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 549
+            - 475
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 304
+            - 475
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 104
+            - 374
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 760
+            - 363
+          element: ../elements/item/grenade/grenade.element.yaml
+        - pos:
+            - 428
+            - 159
+          element: ../elements/item/stomp_boots/stomp_boots.element.yaml
         - pos:
             - 416.0
             - 369.5
           element: ../elements/item/sword/sword.element.yaml
         - pos:
-            - 568.0
-            - 483.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 567
+            - 306
+          element: ../elements/item/crate/crate.element.yaml
         - pos:
-            - 308.0
-            - 479.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 300
+            - 306
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 557
+            - 161
+          element: ../elements/item/crate/crate.element.yaml
+        - pos:
+            - 345
+            - 161
+          element: ../elements/item/crate/crate.element.yaml
   - id: spawners
     kind: !element
       elements:
@@ -1525,7 +1553,7 @@ layers:
             - 478.44418
           element: ../elements/environment/player_spawner/player_spawner.element.yaml
         - pos:
-            - 195.5694
+            - 240.5694
             - 173.61493
           element: ../elements/environment/player_spawner/player_spawner.element.yaml
         - pos:

assets/map/levels/level4.map.yaml

@@ -1227,57 +1227,49 @@ layers:
     kind: !element
       elements:
         - pos:
-            - 107.4286
-            - 225.5
-          element: ../elements/item/blunderbass/blunderbass.element.yaml
-        - pos:
-            - 120.40002
-            - 129.5
-          element: ../elements/item/crate/crate.element.yaml
-        - pos:
-            - 1024.0
-            - 137.5
-          element: ../elements/item/crate/crate.element.yaml
+            - 562
+            - 275
+          element: ../elements/item/sword/sword.element.yaml
         - pos:
-            - 111.40014
-            - 337.5
-          element: ../elements/item/crate/crate.element.yaml
+            - 1038
+            - 130
+          element: ../elements/item/stomp_boots/stomp_boots.element.yaml
         - pos:
-            - 1043.9714
-            - 329.5
-          element: ../elements/item/crate/crate.element.yaml
+            - 76
+            - 130
+          element: ../elements/item/stomp_boots/stomp_boots.element.yaml
         - pos:
-            - 392.0
-            - 433.5
-          element: ../elements/item/crate/crate.element.yaml
+            - 1024
+            - 258
+          element: ../elements/item/mine/mine.element.yaml
         - pos:
-            - 677.2236
-            - 433.5
-          element: ../elements/item/crate/crate.element.yaml
+            - 127
+            - 257
+          element: ../elements/item/mine/mine.element.yaml
         - pos:
-            - 616.0
-            - 111.5
-          element: ../elements/item/musket/musket.element.yaml
+            - 385
+            - 446
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
-            - 808.0
-            - 463.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 800
+            - 446
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
-            - 536.1026
-            - 441.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 1023
+            - 352
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
-            - 884.0
-            - 145.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 128
+            - 352
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
-            - 277.7143
-            - 121.5
-          element: ../elements/item/sword/sword.element.yaml
+            - 247
+            - 124
+          element: ../elements/item/grenade/grenade.element.yaml
         - pos:
-            - 800.0
-            - 425.5
-          element: ../elements/item/mine/mine.element.yaml
+            - 822
+            - 124
+          element: ../elements/item/grenade/grenade.element.yaml
   - id: spawners
     kind: !element
       elements: