wip

2025-04-29 21:08:17 +02:00
218 changed files with 5916 additions and 10881 deletions
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -1,2 +0,0 @@
-[env]
-BEVY_ASSET_ROOT = { value = "", relative = true }
--- a/.github/actions/discord-webhook/action.yml
+++ b/.github/actions/discord-webhook/action.yml
@@ -1,59 +0,0 @@
-name: "Discord Webhook"
-description: "Send a message to Discord via webhook using curl"
-inputs:
-  webhook_url:
-    description: "Discord webhook URL"
-    required: true
-  message:
-    description: "Message to send"
-    required: true
-  username:
-    description: "Override the default username of the webhook"
-    required: false
-    default: ""
-  avatar_url:
-    description: "Override the default avatar of the webhook"
-    required: false
-    default: ""
-  color:
-    description: "Embed color (decimal number)"
-    required: false
-    default: ""
-
-runs:
-  using: "composite"
-  steps:
-    - name: Send Discord notification
-      shell: bash
-      run: |
-        MESSAGE='${{ inputs.message }}'
-
-        if [ -n "${{ inputs.color }}" ]; then
-          # Send as embed with color
-          PAYLOAD=$(jq -n \
-            --arg content "$MESSAGE" \
-            --arg username "${{ inputs.username }}" \
-            --arg avatar "${{ inputs.avatar_url }}" \
-            --arg color "${{ inputs.color }}" \
-            '{
-              content: (if $content != "" then $content else null end),
-              username: (if $username != "" then $username else null end),
-              avatar_url: (if $avatar != "" then $avatar else null end),
-              embeds: (if $color != "" then [{description: $content, color: ($color | tonumber)}] else null end)
-            } | with_entries(select(.value != null))')
-        else
-          # Send as simple message
-          PAYLOAD=$(jq -n \
-            --arg content "$MESSAGE" \
-            --arg username "${{ inputs.username }}" \
-            --arg avatar "${{ inputs.avatar_url }}" \
-            '{
-              content: $content,
-              username: (if $username != "" then $username else null end),
-              avatar_url: (if $avatar != "" then $avatar else null end)
-            } | with_entries(select(.value != null))')
-        fi
-
-        curl -H "Content-Type: application/json" \
-             -d "$PAYLOAD" \
-             "${{ inputs.webhook_url }}"
--- a/.github/workflows/archive_steamos.yml
+++ b/.github/workflows/archive_steamos.yml
@@ -15,19 +15,19 @@ jobs:
          toolchain: stable
          components: clippy, rustfmt

-      - name: install linux dependencies
-        if: runner.os == 'linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+      - name: "Install and cache dependencies (Linux)"
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+          version: 1.0

      - name: Build
        run: |
-          cargo build --release --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
+          cargo build --release --locked --target=x86_64-unknown-linux-gnu

      - name: Archive
        run: |
-          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded ./
+          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded hedz_reloaded
          tar -czf steamos.tar.gz hedz_reloaded

      - uses: actions/upload-artifact@v4
--- a/.github/workflows/archive_win.yml
+++ b/.github/workflows/archive_win.yml
@@ -20,19 +20,20 @@ jobs:
        run: |
          which cargo-xwin || cargo install --locked cargo-xwin

-      - name: install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y lld clang cmake ninja-build
+      - name: "Install and cache dependencies (Windows)"
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: lld clang cmake ninja-build
+          version: 1.0

      - name: Build binaries (Windows)
        run: |
-          cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded
+          cargo xwin build --locked --release --target=x86_64-pc-windows-msvc

      - name: Archive
        run: |
          ls -lisa target/x86_64-pc-windows-msvc/release/
-          cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe ./
+          cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe hedz_reloaded.exe
          tar -czf win.tar.gz hedz_reloaded.exe

      - uses: actions/upload-artifact@v4
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,11 +22,12 @@ jobs:
          toolchain: stable
          components: clippy, rustfmt

-      - name: install linux dependencies
+      - name: "Install and cache dependencies (Linux)"
        if: runner.os == 'linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+          version: 1.0

      - name: Formatting
        run: |
@@ -38,10 +39,8 @@ jobs:

      - name: Build
        run: |
-          cargo build --bin hedz_reloaded
-          cargo build --bin hedz_reloaded_server --no-default-features
+          cargo build

      - name: Tests
        run: |
-          cargo test --lib hedz_reloaded
-          cargo test --lib hedz_reloaded --no-default-features
+          cargo test
--- a/.github/workflows/ci_debug.yml
+++ b/.github/workflows/ci_debug.yml
@@ -15,19 +15,15 @@ jobs:
          toolchain: stable
          components: clippy, rustfmt

-      - name: install linux dependencies
-        if: runner.os == 'linux'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+      - name: "Install and cache dependencies (Linux)"
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
+          version: 1.0

-      - name: Build client
+      - name: Build
        run: |
-          cargo build --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
-
-      - name: Build server
-        run: |
-          cargo build --locked --target=x86_64-unknown-linux-gnu --bin hedz_reloaded_server --no-default-features
+          cargo build --locked --target=x86_64-unknown-linux-gnu

      - name: Lints
        run: |
@@ -35,8 +31,8 @@ jobs:

      - name: Archive
        run: |
-          cp target/x86_64-unknown-linux-gnu/debug/hedz_reloaded target/x86_64-unknown-linux-gnu/debug/hedz_reloaded_server ./
-          tar -czf steamos-debug.tar.gz hedz_reloaded hedz_reloaded_server
+          cp target/x86_64-unknown-linux-gnu/debug/hedz_reloaded hedz_reloaded
+          tar -czf steamos-debug.tar.gz hedz_reloaded

      - uses: actions/upload-artifact@v4
        with:
--- a/.github/workflows/steam_alpha.yml
+++ b/.github/workflows/steam_alpha.yml
@@ -22,13 +22,13 @@ jobs:

      - name: Build (lipo)
        run: |
-          cargo build --release --target=x86_64-apple-darwin --bin hedz_reloaded
-          cargo build --release --target=aarch64-apple-darwin --bin hedz_reloaded
+          cargo build --release --target=x86_64-apple-darwin
+          cargo build --release --target=aarch64-apple-darwin
          lipo -create -output target/release/hedz_reloaded target/aarch64-apple-darwin/release/hedz_reloaded target/x86_64-apple-darwin/release/hedz_reloaded

      - name: Archive
        run: |
-          cp target/release/hedz_reloaded ./
+          cp target/release/hedz_reloaded ./hedz_reloaded
          tar -czf hedz-macos.tar.gz hedz_reloaded
          ls -lisah hedz-macos.tar.gz

@@ -80,10 +80,10 @@ jobs:
        id: vars
        run: |
          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT

      - name: Discord notification
-        uses: ./.github/actions/discord-webhook
+        uses: appleboy/discord-action@v1.2.0
        with:
          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
          message: New macos release (`${{ steps.vars.outputs.branch }}`) [`${{ steps.vars.outputs.sha_short }}`]
@@ -103,7 +103,7 @@ jobs:
        uses: awalsh128/cache-apt-pkgs-action@latest
        with:
          packages: libasound2-dev libudev-dev libwayland-dev libxkbcommon-dev
-          version: 2
+          version: 1.0

      - uses: leafwing-studios/cargo-cache@v2
        with:
@@ -111,11 +111,11 @@ jobs:

      - name: Build
        run: |
-          cargo build --locked --release --target=x86_64-unknown-linux-gnu --bin hedz_reloaded
+          cargo build --locked --release --target=x86_64-unknown-linux-gnu

      - name: Archive
        run: |
-          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded ./
+          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded hedz_reloaded
          tar -czf steamos.tar.gz hedz_reloaded

      - uses: actions/upload-artifact@v4
@@ -126,7 +126,7 @@ jobs:
      - name: Copy Binary for SteamOS
        run: |
          mkdir -p build/steamos/content
-          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded build/steamos/content/
+          cp target/x86_64-unknown-linux-gnu/release/hedz_reloaded build/steamos/content/hedz_reloaded

      - name: Install SteamCMD
        run: |
@@ -161,10 +161,10 @@ jobs:
        id: vars
        run: |
          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT

      - name: Discord notification
-        uses: ./.github/actions/discord-webhook
+        uses: appleboy/discord-action@v1.2.0
        with:
          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
          message: New steamos release (`${{ steps.vars.outputs.branch }}`) [`${{ steps.vars.outputs.sha_short }}`]
@@ -185,19 +185,20 @@ jobs:
        run: |
          which cargo-xwin || cargo install --locked cargo-xwin

-      - name: install dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y lld clang cmake ninja-build
+      - name: "Install and cache dependencies (Windows)"
+        uses: awalsh128/cache-apt-pkgs-action@latest
+        with:
+          packages: lld clang cmake ninja-build
+          version: 1.0

      - name: Build binaries (Windows)
        run: |
-          cargo xwin build --locked --release --target=x86_64-pc-windows-msvc --bin hedz_reloaded
+          cargo xwin build --locked --release --target=x86_64-pc-windows-msvc

      - name: Move binary
        run: |
          ls -lisa target/x86_64-pc-windows-msvc/release/
-          cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe build/win/
+          cp target/x86_64-pc-windows-msvc/release/hedz_reloaded.exe build/win/hedz_reloaded.exe

      - uses: ./.github/actions/steamcmd
        with:
@@ -216,10 +217,10 @@ jobs:
        id: vars
        run: |
          echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "branch=$(git branch --show-current)" >> $GITHUB_OUTPUT
+          echo "branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}" >> $GITHUB_OUTPUT

      - name: Discord notification
-        uses: ./.github/actions/discord-webhook
+        uses: appleboy/discord-action@v1.2.0
        with:
          webhook_url: ${{ secrets.DISCORD_WEBHOOK }}
          message: New windows release (`${{ steps.vars.outputs.branch }}`) [`${{ steps.vars.outputs.sha_short }}`]
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,2 +0,0 @@
-imports_granularity = "Crate"
-group_imports = "One"
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,9 +1,17 @@
-[workspace]
-resolver = "3"
-members = ["crates/*"]
+[package]
+name = "hedz_reloaded"
+version = "0.1.0"
+edition = "2024"
+build = "build.rs"

-[workspace.dependencies]
-avian3d = { version = "0.4.0", default-features = false, features = [
+[profile.dev.package."*"]
+opt-level = 3
+
+[features]
+dbg = ["avian3d/debug-plugin", "dep:bevy-inspector-egui"]
+
+[dependencies]
+avian3d = { version = "0.2", default-features = false, features = [
    "3d",
    "f32",
    "parry-f32",
@@ -11,74 +19,35 @@ avian3d = { version = "0.4.0", default-features = false, features = [
    "bevy_scene",
    "bevy_picking",       # todo: Consider if this one is necessary
    "parallel",
-    "serialize",
 ] }
-bevy = { version = "0.17.0", default-features = false, features = [
-    "animation",
-    "async_executor",
-    "bevy_asset",
-    "bevy_color",
-    "bevy_core_pipeline",
-    "bevy_gilrs",
-    "bevy_gizmos",
-    "bevy_gltf",
-    "bevy_input_focus",
-    "bevy_log",
-    "bevy_mesh_picking_backend",
-    "bevy_pbr",
-    "bevy_picking",
-    "bevy_render",
-    "bevy_scene",
-    "bevy_sprite",
-    "bevy_sprite_picking_backend",
-    "bevy_state",
-    "bevy_text",
-    "bevy_ui",
-    "bevy_ui_render",
-    "bevy_ui_picking_backend",
-    "default_font",
-    "hdr",
-    "multi_threaded",
-    "png",
-    "reflect_auto_register",
-    "smaa_luts",
-    "std",
-    "sysinfo_plugin",
-    "tonemapping_luts",
-    "vorbis",
-    "webgl2",
-    "zstd_rust",
-    "track_location",
-] }
-bevy-inspector-egui = "0.34"
-bevy-steamworks = "0.15.0"
-bevy_asset_loader = "=0.24.0-rc.1"
-bevy_ballistic = { git = "https://github.com/rustunit/bevy_ballistic.git", rev = "b08ffec" }
-bevy_common_assets = { version = "0.14.0", features = ["ron"] }
-bevy_debug_log = { git = "https://github.com/rustunit/bevy_debug_log.git", rev = "86051a0" }
-bevy_pkv = { version = "0.14", default-features = false, features = [
-    "bevy",
-    "redb",
-] }
-bevy_replicon = "0.37.1"
-# TODO: i dont think we need this in dedicated server mode
-bevy_replicon_renet = { version = "0.13.0", features = ["renet_steam"] }
-bevy_sprite3d = "7.0.0"
-bevy_trenchbroom = { version = "0.10", default-features = false, features = [
-    "physics-integration",
-] }
-bevy_trenchbroom_avian = "0.10"
-clap = { version = "=4.5.47", features = ["derive"] }
-happy_feet = { git = "https://github.com/rustunit/happy_feet.git", rev = "919657fa", features = [
-    "serde",
+bevy = { version = "0.16.0", features = ["track_location"] }
+bevy_trenchbroom = { version = "0.7", features = [
+    "auto_register",
+    "avian",
+    "client",
 ] }
 nil = "0.14.0"
+bevy_asset_loader = "0.23.0-rc.3"
+bevy_sprite3d = "5.0.0"
 rand = "=0.8.5"
-ron = "0.8"
+bevy-inspector-egui = { version = "0.31", optional = true }
+bevy-steamworks = "0.13.0"
+bevy_ballistic = "0.3.0"
+bevy-ui-gradients = "0.4.0"
+bevy_debug_log = "0.6.0"
+bevy_common_assets = { version = "0.13.0", features = ["ron"] }
 serde = { version = "1.0.219", features = ["derive"] }
-shared = { path = "crates/shared" }
-# TODO: i dont think we need this in dedicated server mode
-steamworks = "0.12"
+ron = "0.8"

-[profile.dev.package."*"]
-opt-level = 3
+[build-dependencies]
+vergen-gitcl = "1.0"
+
+[lints.clippy]
+too_many_arguments = "allow"
+type_complexity = "allow"
+
+[patch.crates-io]
+bevy-steamworks = { git = "https://github.com/HouraiTeahouse/bevy_steamworks.git", rev = "0bc62fc" }
+avian3d = { git = "https://github.com/Jondolf/avian.git", rev = "9511076" }
+bevy_ballistic = { git = "https://github.com/rustunit/bevy_ballistic.git", branch = "bevy-0.16" }
+bevy_trenchbroom = { git = "https://github.com/extrawurst/bevy_trenchbroom.git", branch = "bevy-0.16.0" }
--- a/assets/all.headsdb.ron
+++ b/assets/all.headsdb.ron
@@ -1,20 +1,20 @@
 ([
-    /*00*/(key:"angry demonstrator", ability:Thrown, aps:2, ammo:10, range:90, damage:25, projectile:"molotov", interrupt_shoot:false),
-    /*01*/(key:"carnival knife thrower", ability:Arrow, range:60, ammo:5),
-    /*02*/(key:"chicago gangster", ability:Gun, aps:7.4, ammo:25, range:60, damage:12),
-    /*03*/(key:"commando", ability:Gun, aps:7.4, ammo:26, range:60, damage:12),
-    /*04*/(key:"field medic", ability:Medic, aps:20),
-    /*05*/(key:"geisha", ability:Curver, range:60, ammo:10, damage:25, projectile:"fan"),
-    /*06*/(key:"goblin", ability:Arrow, aps:2, ammo:5, range:90, damage:50),
-    /*07*/(key:"green grocer", ability:Curver, range:60, ammo:10, damage:25, projectile:"carrot"),
-    /*08*/(key:"highland hammer thrower", ability:Thrown, aps:2, ammo:10, damage:25, range:80, projectile:"hammer", interrupt_shoot:false),
-    /*09*/(key:"legionnaire", ability:Gun, aps:2, ammo:25, range:60, damage:13, shoot_offset:0.1667),
-    /*10*/(key:"mig pilot", ability:Missile, ammo:5, range:60, damage:100, controls:Plane, interrupt_shoot:false),
-    /*11*/(key:"nanny", ability:None, ammo:5, range:60, projectile:"handbag"),
-    /*12*/(key:"panic attack", ability:Turbo),
-    /*13*/(key:"salty sea dog", ability:None),
-    /*14*/(key:"snow plough operator", ability:None),
-    /*15*/(key:"soldier ant", ability:None),
-    /*16*/(key:"super market shopper", ability:Thrown, ammo:10, range:80, damage:17, projectile:"handbag"),
-    /*17*/(key:"troll", ability:Thrown, ammo:10, range:80, damage:17, projectile:"club"),
+    /*00*/(key:"angry demonstrator", ability:Thrown, ammo: 10, range:90, damage:25, projectile:"molotov"),
+    /*01*/(key:"carnival knife thrower", range:60, ammo: 5 ),
+    /*02*/(key:"chicago gangster", ability:Gun, ammo: 25, range:60),
+    /*03*/(key:"commando", ability:Gun, ammo: 26, range:60, damage:12),
+    /*04*/(key:"field medic"),
+    /*05*/(key:"geisha"),
+    /*06*/(key:"goblin", ability:Arrow, ammo: 5, range:90, damage:50),
+    /*07*/(key:"green grocer", range:60, ammo: 10, damage: 25),
+    /*08*/(key:"highland hammer thrower", ability:Thrown, ammo: 10, damage: 25, range:80, projectile:"hammer"),
+    /*09*/(key:"legionnaire", ability:Gun, ammo: 25, range:60, damage: 13),
+    /*10*/(key:"mig pilot", ability:Missile, ammo: 5, range:60, damage:100, controls:Plane),
+    /*11*/(key:"nanny", ability:Thrown, range:60),
+    /*12*/(key:"panic attack"),
+    /*13*/(key:"salty sea dog"),
+    /*14*/(key:"snow plough operator"),
+    /*15*/(key:"soldier ant"),
+    /*16*/(key:"super market shopper", ability:Thrown, ammo: 10, range:80, damage: 17, projectile:"handbag"),
+    /*17*/(key:"troll", ability:Thrown, ammo: 10, range:80, damage: 17),
 ])
--- a/assets/maps/map1.map
+++ b/assets/maps/map1.map
@@ -16,12 +16,12 @@
 }
 // brush 1
 {
-( -256 -832 2320 ) ( -256 -768 272 ) ( -256 -768 2320 ) TinyTexPack2/Brick/Brick_20_window [ 0 -1 0 0 ] [ 0 0 -1 16 ] 90 1 1
-( 768 -832 2320 ) ( -256 -832 272 ) ( -256 -832 2320 ) TinyTexPack2/Brick/Brick_20_window [ 1 0 0 0 ] [ 0 0 -1 16 ] 90 1 1
-( 768 -768 272 ) ( -256 -832 272 ) ( 768 -832 272 ) TinyTexPack2/Brick/Brick_20_window [ -1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( 768 -768 2320 ) ( -256 -832 2320 ) ( -256 -768 2320 ) TinyTexPack2/Brick/Brick_20_window [ 1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( 768 -768 2320 ) ( -256 -768 272 ) ( 768 -768 272 ) TinyTexPack2/Brick/Brick_20_window [ -1 0 0 0 ] [ 0 0 -1 16 ] 90 1 1
-( 768 -768 2320 ) ( 768 -832 272 ) ( 768 -832 2320 ) TinyTexPack2/Brick/Brick_20_window [ 0 1 0 0 ] [ 0 0 -1 16 ] 90 1 1
+( -256 -832 2320 ) ( -256 -768 272 ) ( -256 -768 2320 ) TinyTexPack2/Brick/Brick_20_window [ 0 -1 0 0 ] [ 0 0 -1 16 ] 270 1 1
+( 768 -832 2320 ) ( -256 -832 272 ) ( -256 -832 2320 ) TinyTexPack2/Brick/Brick_20_window [ 1 0 0 0 ] [ 0 0 -1 16 ] 270 1 1
+( 768 -768 272 ) ( -256 -832 272 ) ( 768 -832 272 ) TinyTexPack2/Brick/Brick_20_window [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
+( 768 -768 2320 ) ( -256 -832 2320 ) ( -256 -768 2320 ) TinyTexPack2/Brick/Brick_20_window [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
+( 768 -768 2320 ) ( -256 -768 272 ) ( 768 -768 272 ) TinyTexPack2/Brick/Brick_20_window [ -1 0 0 0 ] [ 0 0 -1 16 ] 270 1 1
+( 768 -768 2320 ) ( 768 -832 272 ) ( 768 -832 2320 ) TinyTexPack2/Brick/Brick_20_window [ 0 1 0 0 ] [ 0 0 -1 16 ] 270 1 1
 }
 // brush 2
 {
@@ -1074,7 +1074,7 @@
 // brush 119
 {
 ( -5376 3584 -1440 ) ( -5376 3584 -1439 ) ( -5376 3583 -1440 ) airlock/airlock-wall-outside [ -1.9967346175427393e-16 -1 0 64 ] [ 0 0 -1 -64 ] 180 1 1
-( -5376 3392 -1440 ) ( -5377 3392 -1440 ) ( -5376 3392 -1439 ) airlock/airlock-wall [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
+( -5376 3515.4285714285716 -1440 ) ( -5377 3515.4285714285716 -1440 ) ( -5376 3515.4285714285716 -1439 ) airlock/airlock-wall [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
 ( -5344 3968 -1472 ) ( -5345 3968 -1472 ) ( -5344 3967 -1472 ) airlock/airlock-wall [ -1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
 ( -5312 3584 -1248 ) ( -5376 3680 -1472 ) ( -5312 3680 -1472 ) airlock/airlock-wall-outside [ -1 0 0 0 ] [ 0 0.39391929857916613 -0.9191450300180586 33.614258 ] 180 1 1
 ( -5312 3968 -1472 ) ( -5312 3967 -1472 ) ( -5312 3968 -1471 ) airlock/airlock-wall [ 1.9967346175427393e-16 1 0 -64 ] [ 0 0 -1 -64 ] 180 1 1
@@ -1082,8 +1082,8 @@
 // brush 120
 {
 ( -5376 3584 -1440 ) ( -5376 3584 -1439 ) ( -5376 3583 -1440 ) airlock/airlock-wall-outside [ -1.9967346175427393e-16 -1 0 64 ] [ 0 0 -1 -64 ] 180 1 1
-( -5376 3392 -1440 ) ( -5377 3392 -1440 ) ( -5376 3392 -1439 ) airlock/airlock-wall [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
-( -5312 3872 -704 ) ( -5312 3680 -704 ) ( -5440 3680 -704 ) airlock/airlock-wall [ 1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
+( -5376 3515.4285714285716 -1440 ) ( -5377 3515.4285714285716 -1440 ) ( -5376 3515.4285714285716 -1439 ) airlock/airlock-wall [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
+( -5312 3872 -1024 ) ( -5312 3680 -1024 ) ( -5440 3680 -1024 ) airlock/airlock-wall [ 1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
 ( -5312 3680 -1024 ) ( -5376 3584 -1248 ) ( -5312 3584 -1248 ) airlock/airlock-wall-outside [ -1 7.105427357601002e-15 0 0 ] [ -2.7989649608114045e-15 -0.39391929857916613 -0.9191450300180586 84.0361 ] 180 1 1
 ( -5312 3968 -1472 ) ( -5312 3967 -1472 ) ( -5312 3968 -1471 ) airlock/airlock-wall [ 1.9967346175427393e-16 1 0 -64 ] [ 0 0 -1 -64 ] 180 1 1
 }
@@ -1091,8 +1091,8 @@
 {
 ( -5376 3584 -1440 ) ( -5376 3584 -1439 ) ( -5376 3583 -1440 ) airlock/airlock-wall-outside [ -1.9967346175427393e-16 -1 0 64 ] [ 0 0 -1 -64 ] 180 1 1
 ( -5312 3968 -1248 ) ( -5440 3872 -1024 ) ( -5312 3872 -1024 ) airlock/airlock-wall-outside [ 1 0 0 0 ] [ 0 0.3939192985791677 -0.9191450300180579 33.614502 ] 180 1 1
-( -5312 3872 -704 ) ( -5312 3680 -704 ) ( -5440 3680 -704 ) airlock/airlock-wall [ 1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
-( -5344 4096 -1472 ) ( -5344 4096 -1471 ) ( -5345 4096 -1472 ) airlock/airlock-wall [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
+( -5312 3872 -1024 ) ( -5312 3680 -1024 ) ( -5440 3680 -1024 ) airlock/airlock-wall [ 1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
+( -5344 4032 -1472 ) ( -5344 4032 -1471 ) ( -5345 4032 -1472 ) airlock/airlock-wall [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
 ( -5312 3968 -1472 ) ( -5312 3967 -1472 ) ( -5312 3968 -1471 ) airlock/airlock-wall [ 1.9967346175427393e-16 1 0 -64 ] [ 0 0 -1 -64 ] 180 1 1
 }
 // brush 122
@@ -1100,125 +1100,9 @@
 ( -5376 3584 -1440 ) ( -5376 3584 -1439 ) ( -5376 3583 -1440 ) airlock/airlock-wall-outside [ -1.9967346175427393e-16 -1 0 64 ] [ 0 0 -1 -64 ] 180 1 1
 ( -5312 3872 -1472 ) ( -5376 3968 -1248 ) ( -5312 3968 -1248 ) airlock/airlock-wall-outside [ 1 0 0 0 ] [ 0 -0.3939192985791677 -0.9191450300180579 84.03613 ] 180 1 1
 ( -5344 3968 -1472 ) ( -5345 3968 -1472 ) ( -5344 3967 -1472 ) airlock/airlock-wall [ -1 0 0 0 ] [ 0 -1 0 64 ] 180 1 1
-( -5344 4096 -1472 ) ( -5344 4096 -1471 ) ( -5345 4096 -1472 ) airlock/airlock-wall [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
+( -5344 4032 -1472 ) ( -5344 4032 -1471 ) ( -5345 4032 -1472 ) airlock/airlock-wall [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 -64 ] 180 1 1
 ( -5312 3968 -1472 ) ( -5312 3967 -1472 ) ( -5312 3968 -1471 ) airlock/airlock-wall [ 1.9967346175427393e-16 1 0 -64 ] [ 0 0 -1 -64 ] 180 1 1
 }
-// brush 123
-{
-( -5376 3392 -1472 ) ( -5568 3392 -1600 ) ( -5568 4096 -1600 ) canals [ -0.7071067811865474 0 -0.7071067811865477 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5376 3392 -1600 ) ( -5568 3392 -1600 ) ( -5376 3392 -1472 ) canals [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5568 4096 -1600 ) ( -5568 3392 -1600 ) ( -5376 3392 -1600 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5376 4096 -1472 ) ( -5568 4096 -1600 ) ( -5376 4096 -1600 ) canals [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5376 3392 -1472 ) ( -5376 4096 -1472 ) ( -5376 4096 -1600 ) canals [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-}
-// brush 124
-{
-( -7168 3392 -1600 ) ( -7168 3392 -1599 ) ( -7168 3391 -1600 ) canals [ 1.9967346175427393e-16 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -4416 3328 -1536 ) ( -4416 3328 -1535 ) ( -4415 3328 -1536 ) canals [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -4480 3392 -1600 ) ( -4480 3391 -1600 ) ( -4479 3392 -1600 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -4416 3328 -768 ) ( -4415 3328 -768 ) ( -4416 3327 -768 ) canals [ 1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( -4480 3392 -1600 ) ( -4479 3392 -1600 ) ( -4480 3392 -1599 ) canals [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5376 3328 -1536 ) ( -5376 3327 -1536 ) ( -5376 3328 -1535 ) canals [ -1.9967346175427393e-16 -1 0 0 ] [ 0 0 -1 0 ] 180 1 1
-}
-// brush 125
-{
-( -7168 4160 -1600 ) ( -7168 4160 -1599 ) ( -7168 4159 -1600 ) canals [ 1.9967346175427393e-16 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -4416 4096 -1536 ) ( -4416 4096 -1535 ) ( -4415 4096 -1536 ) canals [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -4480 4160 -1600 ) ( -4480 4159 -1600 ) ( -4479 4160 -1600 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -4416 4096 -768 ) ( -4415 4096 -768 ) ( -4416 4095 -768 ) canals [ 1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( -4480 4160 -1600 ) ( -4479 4160 -1600 ) ( -4480 4160 -1599 ) canals [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5376 4096 -1536 ) ( -5376 4095 -1536 ) ( -5376 4096 -1535 ) canals [ -1.9967346175427393e-16 -1 0 0 ] [ 0 0 -1 0 ] 180 1 1
-}
-// brush 126
-{
-( -7136 3392 -1664 ) ( -7136 3393 -1664 ) ( -7136 3392 -1663 ) canals [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5696 3392 -1664 ) ( -5696 3392 -1663 ) ( -5695 3392 -1664 ) canals [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5696 3392 -1664 ) ( -5695 3392 -1664 ) ( -5696 3393 -1664 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5568 4096 -1600 ) ( -5568 4097 -1600 ) ( -5567 4096 -1600 ) canals [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5568 4096 -1600 ) ( -5567 4096 -1600 ) ( -5568 4096 -1599 ) canals [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5568 4096 -1600 ) ( -5568 4096 -1599 ) ( -5568 4097 -1600 ) canals [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-}
-// brush 127
-{
-( -6496 3392 -768 ) ( -6496 3393 -768 ) ( -6496 3392 -767 ) canals [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5504 3392 -768 ) ( -5504 3392 -767 ) ( -5503 3392 -768 ) canals [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5504 3392 -768 ) ( -5503 3392 -768 ) ( -5504 3393 -768 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5376 4096 -704 ) ( -5376 4097 -704 ) ( -5375 4096 -704 ) canals [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( -5376 4096 -704 ) ( -5375 4096 -704 ) ( -5376 4096 -703 ) canals [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( -5376 4096 -704 ) ( -5376 4096 -703 ) ( -5376 4097 -704 ) canals [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-}
-// brush 128
-{
-( -6560 4096 -304 ) ( -6560 4097 -304 ) ( -6560 4096 -303 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 0 0 -1 16 ] 270 1 1
-( -6496 3392 -368 ) ( -6497 3392 -368 ) ( -6496 3392 -367 ) canals [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] [ 0 0 -1 16 ] 180 1 1
-( -6496 3648 -768 ) ( -6496 3649 -768 ) ( -6497 3648 -768 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 180 1 1
-( -6688 4096 -304 ) ( -6689 4096 -304 ) ( -6688 4097 -304 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 270 1 1
-( -6688 4096 -304 ) ( -6688 4096 -303 ) ( -6689 4096 -304 ) canals [ -1.0000000000000007 5.456456664689579e-16 0 -128 ] [ 0 0 -1 16 ] 0 1 1
-( -6496 3648 -368 ) ( -6496 3648 -367 ) ( -6496 3649 -368 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 0 0 -1 16 ] 0 1 1
-}
-// brush 129
-{
-( -7296 4096 -304 ) ( -7296 4097 -304 ) ( -7296 4096 -303 ) tile [ 0 -1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -8544 4096 -304 ) ( -8544 4096 -303 ) ( -8543 4096 -304 ) tile [ 1 0 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -8544 4096 -304 ) ( -8543 4096 -304 ) ( -8544 4097 -304 ) tile [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -7648 4544 -240 ) ( -7648 4545 -240 ) ( -7647 4544 -240 ) tile [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -7648 4224 -240 ) ( -7647 4224 -240 ) ( -7648 4224 -239 ) tile [ -1 0 0 0 ] [ 0 0 -1 16 ] 180 1 1
-( -6432 4544 -240 ) ( -6432 4544 -239 ) ( -6432 4545 -240 ) tile [ 0 1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-}
-// brush 130
-{
-( -7232 4096 -304 ) ( -7232 4097 -304 ) ( -7232 4096 -303 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 0 0 -1 16 ] 270 1 1
-( -7168 3392 -368 ) ( -7169 3392 -368 ) ( -7168 3392 -367 ) canals [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] [ 0 0 -1 16 ] 180 1 1
-( -7168 3648 -1600 ) ( -7168 3649 -1600 ) ( -7169 3648 -1600 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 180 1 1
-( -7360 4096 -304 ) ( -7361 4096 -304 ) ( -7360 4097 -304 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 270 1 1
-( -7360 4096 -304 ) ( -7360 4096 -303 ) ( -7361 4096 -304 ) canals [ -1.0000000000000007 5.456456664689579e-16 0 -128 ] [ 0 0 -1 16 ] 0 1 1
-( -7168 3648 -368 ) ( -7168 3648 -367 ) ( -7168 3649 -368 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 0 0 -1 16 ] 0 1 1
-}
-// brush 131
-{
-( -7296 3264 -304 ) ( -7296 3265 -304 ) ( -7296 3264 -303 ) tile [ 0 -1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -8544 3136 -304 ) ( -8544 3136 -303 ) ( -8543 3136 -304 ) tile [ 1 0 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -8544 3264 -304 ) ( -8543 3264 -304 ) ( -8544 3265 -304 ) tile [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -7648 3712 -240 ) ( -7648 3713 -240 ) ( -7647 3712 -240 ) tile [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -7648 3392 -240 ) ( -7647 3392 -240 ) ( -7648 3392 -239 ) tile [ -1 0 0 0 ] [ 0 0 -1 16 ] 180 1 1
-( -6304 3712 -240 ) ( -6304 3712 -239 ) ( -6304 3713 -240 ) tile [ 0 1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-}
-// brush 132
-{
-( -6560 5344 -304 ) ( -6560 5344 -303 ) ( -6560 5343 -304 ) tile [ 1.9967346175427393e-16 1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -6112 3392 -240 ) ( -6112 3392 -239 ) ( -6111 3392 -240 ) tile [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -6560 5344 -304 ) ( -6560 5343 -304 ) ( -6559 5344 -304 ) tile [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -6112 4448 -240 ) ( -6111 4448 -240 ) ( -6112 4447 -240 ) tile [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -6560 4096 -304 ) ( -6559 4096 -304 ) ( -6560 4096 -303 ) tile [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -6304 4448 -240 ) ( -6304 4447 -240 ) ( -6304 4448 -239 ) tile [ -1.9967346175427393e-16 -1 0 0 ] [ 0 0 -1 16 ] 180 1 1
-}
-// brush 133
-{
-( -7296 5344 -304 ) ( -7296 5344 -303 ) ( -7296 5343 -304 ) tile [ 1.9967346175427393e-16 1 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -6848 3392 -240 ) ( -6848 3392 -239 ) ( -6847 3392 -240 ) tile [ -1 1.9967346175427393e-16 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -7296 5344 -304 ) ( -7296 5343 -304 ) ( -7295 5344 -304 ) tile [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -6848 4448 -240 ) ( -6847 4448 -240 ) ( -6848 4447 -240 ) tile [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -7296 4096 -304 ) ( -7295 4096 -304 ) ( -7296 4096 -303 ) tile [ 1 -1.9967346175427393e-16 0 0 ] [ 0 0 -1 16 ] 270 1 1
-( -7168 4448 -240 ) ( -7168 4447 -240 ) ( -7168 4448 -239 ) tile [ -1.9967346175427393e-16 -1 0 0 ] [ 0 0 -1 16 ] 180 1 1
-}
-// brush 134
-{
-( -7168 3328 -368 ) ( -7168 3329 -368 ) ( -7168 3328 -367 ) canals [ 6.762803511326634e-16 1.0000000000000007 0 128 ] [ 0 0 -1 16 ] 180 1 1
-( -7008 3328 -368 ) ( -7008 3328 -367 ) ( -7007 3328 -368 ) canals [ -0.9999999999999998 -2.9040269150165053e-16 0 -64 ] [ 0 0 -1 16 ] 0 1 1
-( -7008 3328 -768 ) ( -7007 3328 -768 ) ( -7008 3329 -768 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 180 1 1
-( -6560 3520 -304 ) ( -6560 3521 -304 ) ( -6559 3520 -304 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 270 1 1
-( -6560 3392 -304 ) ( -6559 3392 -304 ) ( -6560 3392 -303 ) canals [ 0.9999999999999998 2.9040269150165053e-16 0 64 ] [ 0 0 -1 16 ] 270 1 1
-( -6560 3520 -304 ) ( -6560 3520 -303 ) ( -6560 3521 -304 ) canals [ -6.762803511326634e-16 -1.0000000000000007 0 -128 ] [ 0 0 -1 16 ] 0 1 1
-}
-// brush 135
-{
-( -7168 4096 -368 ) ( -7168 4097 -368 ) ( -7168 4096 -367 ) canals [ 6.762803511326634e-16 1.0000000000000007 0 128 ] [ 0 0 -1 16 ] 180 1 1
-( -7008 4096 -368 ) ( -7008 4096 -367 ) ( -7007 4096 -368 ) canals [ -0.9999999999999998 -2.9040269150165053e-16 0 -64 ] [ 0 0 -1 16 ] 0 1 1
-( -7008 4096 -768 ) ( -7007 4096 -768 ) ( -7008 4097 -768 ) canals [ 4.812271809458903e-16 -0.9999999999999999 0 64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 180 1 1
-( -6560 4288 -304 ) ( -6560 4289 -304 ) ( -6559 4288 -304 ) canals [ -4.812271809458903e-16 0.9999999999999999 0 -64 ] [ 1.0000000000000007 -5.456456664689579e-16 0 128 ] 270 1 1
-( -6560 4160 -304 ) ( -6559 4160 -304 ) ( -6560 4160 -303 ) canals [ 0.9999999999999998 2.9040269150165053e-16 0 64 ] [ 0 0 -1 16 ] 270 1 1
-( -6560 4288 -304 ) ( -6560 4288 -303 ) ( -6560 4289 -304 ) canals [ -6.762803511326634e-16 -1.0000000000000007 0 -128 ] [ 0 0 -1 16 ] 0 1 1
-}
 }
 // entity 1
 {
@@ -1229,11 +1113,10 @@
 {
 "classname" "enemy_spawn"
 "origin" "648 -680 -232"
-"angles" "0 90 0"
+"angles" "0 -90 0"
 "head" "field medic"
 "key" "fence_gate"
 "disable_ai" "true"
-"spawn_order" "0"
 }
 // entity 3
 {
@@ -1245,9 +1128,8 @@
 "classname" "enemy_spawn"
 "origin" "3256 248 -232"
 "head" "field medic"
-"angles" "0 180 0"
+"angles" "0 0 0"
 "disable_ai" "true"
-"spawn_order" "1"
 }
 // entity 5
 {
@@ -1438,7 +1320,7 @@
 {
 "classname" "move_target"
 "origin" "1152 0 -216"
-"angles" "0 -90 0"
+"angles" "0 0 0"
 "targetname" "target_fence_01"
 }
 // entity 20
@@ -1470,7 +1352,7 @@
 {
 "classname" "move_target"
 "origin" "1152 512 -216"
-"angles" "0 90 0"
+"angles" "0 -180 0"
 "targetname" "target_fence_02"
 }
 // entity 22
@@ -1502,18 +1384,16 @@
 {
 "classname" "enemy_spawn"
 "origin" "2568 4504 -232"
-"angles" "0 0 0"
+"angles" "0 180 0"
 "head" "super market shopper"
-"spawn_order" "2"
 }
 // entity 24
 {
 "classname" "enemy_spawn"
 "origin" "648 6760 -232"
-"angles" "0 -90 0"
+"angles" "0 90 0"
 "head" "green grocer"
 "key" "fence_shaft"
-"spawn_order" "3"
 }
 // entity 25
 {
@@ -1528,7 +1408,6 @@
 "classname" "move_target"
 "origin" "1480 6600 -232"
 "targetname" "target_fence_shaft"
-"angles" "0 -90 0"
 }
 // entity 27
 {
@@ -1653,253 +1532,6 @@
 }
 // entity 40
 {
-"classname" "platform"
-"target" "test_target"
-"angles" "0 0 0"
-// brush 0
-{
-( 368 1120 16 ) ( 368 1121 16 ) ( 368 1120 17 ) origin [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 368 1120 16 ) ( 368 1120 17 ) ( 369 1120 16 ) origin [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 368 1120 16 ) ( 369 1120 16 ) ( 368 1121 16 ) origin [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( 400 1152 32 ) ( 400 1153 32 ) ( 401 1152 32 ) origin [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( 400 1152 32 ) ( 401 1152 32 ) ( 400 1152 33 ) origin [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 400 1152 32 ) ( 400 1152 33 ) ( 400 1153 32 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-}
-// brush 1
-{
-( 256 976 -16 ) ( 256 977 -16 ) ( 256 976 -15 ) blue-metal [ 0 -1 0 16 ] [ 0 0 -1 -144 ] 90 1 1
-( 320 1008 -16 ) ( 320 1008 -15 ) ( 321 1008 -16 ) blue-metal [ 1 0 0 -32 ] [ 0 0 -1 -144 ] 90 1 1
-( 320 976 -48 ) ( 321 976 -48 ) ( 320 977 -48 ) blue-metal [ -1 0 0 32 ] [ 0 -1 0 16 ] 0 1 1
-( 512 1200 16 ) ( 512 1201 16 ) ( 513 1200 16 ) blue-metal [ 1 0 0 -32 ] [ 0 -1 0 16 ] 180 1 1
-( 512 1264 16 ) ( 513 1264 16 ) ( 512 1264 17 ) blue-metal [ -1 0 0 32 ] [ 0 0 -1 -144 ] 90 1 1
-( 512 1200 16 ) ( 512 1200 17 ) ( 512 1201 16 ) blue-metal [ 0 1 0 -16 ] [ 0 0 -1 -144 ] 180 1 1
-}
-}
-// entity 41
-{
-"classname" "platform_target"
-"origin" "-40 1128 24"
-"targetname" "test_target"
-}
-// entity 42
-{
-"classname" "platform"
-"target" "test_target_2"
-"angles" "0 0 0"
-// brush 0
-{
-( 256 720 -16 ) ( 256 721 -16 ) ( 256 720 -15 ) blue-metal [ 0 -1 0 -240 ] [ 0 0 -1 -144 ] 90 1 1
-( 320 752 -16 ) ( 320 752 -15 ) ( 321 752 -16 ) blue-metal [ 1 0 0 -32 ] [ 0 0 -1 -144 ] 90 1 1
-( 320 720 -48 ) ( 321 720 -48 ) ( 320 721 -48 ) blue-metal [ -1 0 0 32 ] [ 0 -1 0 -240 ] 0 1 1
-( 512 944 16 ) ( 512 945 16 ) ( 513 944 16 ) blue-metal [ 1 0 0 -32 ] [ 0 -1 0 -240 ] 180 1 1
-( 512 1008 16 ) ( 513 1008 16 ) ( 512 1008 17 ) blue-metal [ -1 0 0 32 ] [ 0 0 -1 -144 ] 90 1 1
-( 512 944 16 ) ( 512 944 17 ) ( 512 945 16 ) blue-metal [ 0 1 0 240 ] [ 0 0 -1 -144 ] 180 1 1
-}
-// brush 1
-{
-( 368 864 16 ) ( 368 865 16 ) ( 368 864 17 ) origin [ 0 -1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 368 864 16 ) ( 368 864 17 ) ( 369 864 16 ) origin [ 1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 368 864 16 ) ( 369 864 16 ) ( 368 865 16 ) origin [ -1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( 400 896 32 ) ( 400 897 32 ) ( 401 896 32 ) origin [ 1 0 0 0 ] [ 0 -1 0 0 ] 0 1 1
-( 400 896 32 ) ( 401 896 32 ) ( 400 896 33 ) origin [ -1 0 0 0 ] [ 0 0 -1 0 ] 0 1 1
-( 400 896 32 ) ( 400 896 33 ) ( 400 897 32 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 0 1 1
-}
-}
-// entity 43
-{
-"classname" "platform_target"
-"origin" "104 552 568"
-"targetname" "test_target_2"
-}
-// entity 44
-{
-"classname" "secret_head"
-"origin" "2712 5240 792"
-"head_id" "13"
-}
-// entity 45
-{
-"classname" "enemy_spawn"
-"origin" "-184 -584 -232"
-"angles" "0 0 0"
-"head" "commando"
-"key" ""
-"disable_ai" "true"
-}
-// entity 46
-{
-"classname" "enemy_spawn"
-"origin" "-184 -504 -232"
-"angles" "0 0 0"
-"head" "angry demonstrator"
-"key" ""
-"disable_ai" "true"
-}
-// entity 47
-{
-"classname" "enemy_spawn"
-"origin" "-184 -440 -232"
-"angles" "0 0 0"
-"head" "goblin"
-"key" ""
-"disable_ai" "true"
-}
-// entity 48
-{
-"classname" "enemy_spawn"
-"origin" "-184 -360 -232"
-"angles" "0 0 0"
-"head" "green grocer"
-"key" ""
-"disable_ai" "true"
-}
-// entity 49
-{
-"classname" "enemy_spawn"
-"origin" "-184 -280 -232"
-"angles" "0 0 0"
-"head" "highland hammer thrower"
-"key" ""
-"disable_ai" "true"
-}
-// entity 50
-{
-"classname" "enemy_spawn"
-"origin" "-184 -184 -232"
-"angles" "0 0 0"
-"head" "legionnaire"
-"key" ""
-"disable_ai" "true"
-}
-// entity 51
-{
-"classname" "enemy_spawn"
-"origin" "-184 -104 -232"
-"angles" "0 0 0"
-"head" "mig pilot"
-"key" ""
-"disable_ai" "true"
-}
-// entity 52
-{
-"classname" "enemy_spawn"
-"origin" "-184 -8 -232"
-"angles" "0 0 0"
-"head" "soldier ant"
-"key" ""
-"disable_ai" "true"
-}
-// entity 53
-{
-"classname" "enemy_spawn"
-"origin" "-184 -680 -232"
-"angles" "0 0 0"
-"head" "super market shopper"
-"key" ""
-"disable_ai" "true"
-}
-// entity 54
-{
-"classname" "enemy_spawn"
-"origin" "-184 88 -232"
-"angles" "0 0 0"
-"head" "nanny"
-"key" ""
-"disable_ai" "true"
-}
-// entity 55
-{
-"classname" "enemy_spawn"
-"origin" "-184 184 -232"
-"angles" "0 0 0"
-"head" "chicago gangster"
-"key" ""
-"disable_ai" "true"
-}
-// entity 56
-{
-"classname" "enemy_spawn"
-"origin" "-184 264 -232"
-"angles" "0 0 0"
-"head" "carnival knife thrower"
-"key" ""
-"disable_ai" "true"
-}
-// entity 57
-{
-"classname" "enemy_spawn"
-"origin" "-184 344 -232"
-"angles" "0 0 0"
-"head" "snow plough operator"
-"key" ""
-"disable_ai" "true"
-}
-// entity 58
-{
-"classname" "enemy_spawn"
-"origin" "-184 424 -232"
-"angles" "0 0 0"
-"head" "salty sea dog"
-"key" ""
-"disable_ai" "true"
-}
-// entity 59
-{
-"classname" "enemy_spawn"
-"origin" "-184 504 -232"
-"angles" "0 0 0"
-"head" "geisha"
-"key" ""
-"disable_ai" "true"
-}
-// entity 60
-{
-"classname" "platform"
-"target" "elevator_02_target"
-// brush 0
-{
-( -7168 3840 -2720 ) ( -7168 3841 -2720 ) ( -7168 3840 -2719 ) canals [ 0 -1 0 0 ] [ 0 0 -1 -96 ] 90 1 1
-( -7136 3392 -2720 ) ( -7136 3392 -2719 ) ( -7135 3392 -2720 ) canals [ 1 0 0 0 ] [ 0 0 -1 -96 ] 90 1 1
-( -7136 3840 -2720 ) ( -7135 3840 -2720 ) ( -7136 3841 -2720 ) canals [ -1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( -6496 4032 -1408 ) ( -6496 4033 -1408 ) ( -6495 4032 -1408 ) canals [ 1 0 0 0 ] [ 0 -1 0 0 ] 90 1 1
-( -6496 4096 -2656 ) ( -6495 4096 -2656 ) ( -6496 4096 -2655 ) canals [ -1 0 0 0 ] [ 0 0 -1 -96 ] 90 1 1
-( -6560 4032 -2656 ) ( -6560 4032 -2655 ) ( -6560 4033 -2656 ) canals [ 0 1 0 0 ] [ 0 0 -1 -96 ] 90 1 1
-}
-// brush 1
-{
-( -6848 3712 -1408 ) ( -6848 3713 -1408 ) ( -6848 3712 -1407 ) origin [ 0 -1 0 0 ] [ 0 0 -1 0 ] 270 1 1
-( -6848 3712 -1408 ) ( -6848 3712 -1407 ) ( -6847 3712 -1408 ) origin [ 1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
-( -6848 3712 -1408 ) ( -6847 3712 -1408 ) ( -6848 3713 -1408 ) origin [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -6784 3776 -1376 ) ( -6784 3777 -1376 ) ( -6783 3776 -1376 ) origin [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -6784 3776 -1376 ) ( -6783 3776 -1376 ) ( -6784 3776 -1375 ) origin [ -1 0 0 0 ] [ 0 0 -1 0 ] 270 1 1
-( -6784 3776 -1376 ) ( -6784 3776 -1375 ) ( -6784 3777 -1376 ) origin [ 0 1 0 0 ] [ 0 0 -1 0 ] 270 1 1
-}
-}
-// entity 61
-{
-"classname" "platform_target"
-"origin" "-6824 3736 -264"
-"targetname" "elevator_02_target"
-}
-// entity 62
-{
-"classname" "water"
-// brush 0
-{
-( -7296 6976 -1632 ) ( -7296 6977 -1632 ) ( -7296 6976 -1631 ) water [ 0 -1 0 0 ] [ 0 0 -1 -32 ] 180 1 1
-( -6080 3264 -1632 ) ( -6080 3264 -1631 ) ( -6079 3264 -1632 ) water [ 1 0 0 0 ] [ 0 0 -1 -32 ] 90 1 1
-( -6080 6976 -1632 ) ( -6079 6976 -1632 ) ( -6080 6977 -1632 ) water [ -1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -5568 7360 -1568 ) ( -5568 7361 -1568 ) ( -5567 7360 -1568 ) water [ 1 0 0 0 ] [ 0 -1 0 0 ] 270 1 1
-( -5568 4224 -1568 ) ( -5567 4224 -1568 ) ( -5568 4224 -1567 ) water [ -1 0 0 0 ] [ 0 0 -1 -32 ] 270 1 1
-( -5504 7360 -1568 ) ( -5504 7360 -1567 ) ( -5504 7361 -1568 ) water [ 0 1 0 0 ] [ 0 0 -1 -32 ] 270 1 1
-}
-}
-// entity 63
-{
-"classname" "enemy_spawn"
-"origin" "-184 584 -232"
-"angles" "0 0 0"
-"head" "troll"
-"key" ""
-"disable_ai" "true"
+"classname" "decal"
+"origin" "56 -440 -232"
 }
--- a/assets/models/beaming.glb
+++ b/assets/models/beaming.glb
--- a/assets/models/cash.glb
+++ b/assets/models/cash.glb
--- a/assets/models/characters/angry
+++ b/assets/models/characters/angry
--- a/assets/models/characters/carnival
+++ b/assets/models/characters/carnival
--- a/assets/models/characters/chicago
+++ b/assets/models/characters/chicago
--- a/assets/models/characters/commando.glb
+++ b/assets/models/characters/commando.glb
--- a/assets/models/characters/field
+++ b/assets/models/characters/field
--- a/assets/models/characters/geisha.glb
+++ b/assets/models/characters/geisha.glb
--- a/assets/models/characters/goblin.glb
+++ b/assets/models/characters/goblin.glb
--- a/assets/models/characters/green
+++ b/assets/models/characters/green
--- a/assets/models/characters/highland
+++ b/assets/models/characters/highland
--- a/assets/models/characters/legionnaire.glb
+++ b/assets/models/characters/legionnaire.glb
--- a/assets/models/characters/mig
+++ b/assets/models/characters/mig
--- a/assets/models/characters/nanny.glb
+++ b/assets/models/characters/nanny.glb
--- a/assets/models/characters/salty
+++ b/assets/models/characters/salty
--- a/assets/models/characters/snow
+++ b/assets/models/characters/snow
--- a/assets/models/characters/soldier
+++ b/assets/models/characters/soldier
--- a/assets/models/characters/super
+++ b/assets/models/characters/super
--- a/assets/models/characters/troll.glb
+++ b/assets/models/characters/troll.glb
--- a/assets/models/head_drop.glb
+++ b/assets/models/head_drop.glb
--- a/assets/models/head_drops/aa_gun.glb
+++ b/assets/models/head_drops/aa_gun.glb
--- a/assets/models/head_drops/airstrike.glb
+++ b/assets/models/head_drops/airstrike.glb
--- a/assets/models/head_drops/arrow.glb
+++ b/assets/models/head_drops/arrow.glb
--- a/assets/models/head_drops/automobile.glb
+++ b/assets/models/head_drops/automobile.glb
--- a/assets/models/head_drops/boat.glb
+++ b/assets/models/head_drops/boat.glb
--- a/assets/models/head_drops/bouncer.glb
+++ b/assets/models/head_drops/bouncer.glb
--- a/assets/models/head_drops/cell.glb
+++ b/assets/models/head_drops/cell.glb
--- a/assets/models/head_drops/curver.glb
+++ b/assets/models/head_drops/curver.glb
--- a/assets/models/head_drops/dropped.glb
+++ b/assets/models/head_drops/dropped.glb
--- a/assets/models/head_drops/far_sight.glb
+++ b/assets/models/head_drops/far_sight.glb
--- a/assets/models/head_drops/flamer.glb
+++ b/assets/models/head_drops/flamer.glb
--- a/assets/models/head_drops/glider.glb
+++ b/assets/models/head_drops/glider.glb
--- a/assets/models/head_drops/guided_missile.glb
+++ b/assets/models/head_drops/guided_missile.glb
--- a/assets/models/head_drops/gun.glb
+++ b/assets/models/head_drops/gun.glb
--- a/assets/models/head_drops/hover.glb
+++ b/assets/models/head_drops/hover.glb
--- a/assets/models/head_drops/invisiblity.glb
+++ b/assets/models/head_drops/invisiblity.glb
--- a/assets/models/head_drops/laser.glb
+++ b/assets/models/head_drops/laser.glb
--- a/assets/models/head_drops/medic.glb
+++ b/assets/models/head_drops/medic.glb
--- a/assets/models/head_drops/mine.glb
+++ b/assets/models/head_drops/mine.glb
--- a/assets/models/head_drops/missile.glb
+++ b/assets/models/head_drops/missile.glb
--- a/assets/models/head_drops/motorbike.glb
+++ b/assets/models/head_drops/motorbike.glb
--- a/assets/models/head_drops/none.glb
+++ b/assets/models/head_drops/none.glb
--- a/assets/models/head_drops/pet_attack.glb
+++ b/assets/models/head_drops/pet_attack.glb
--- a/assets/models/head_drops/plane.glb
+++ b/assets/models/head_drops/plane.glb
--- a/assets/models/head_drops/power_jump.glb
+++ b/assets/models/head_drops/power_jump.glb
--- a/assets/models/head_drops/power_shield.glb
+++ b/assets/models/head_drops/power_shield.glb
--- a/assets/models/head_drops/quake.glb
+++ b/assets/models/head_drops/quake.glb
--- a/assets/models/head_drops/shield.glb
+++ b/assets/models/head_drops/shield.glb
--- a/assets/models/head_drops/spray.glb
+++ b/assets/models/head_drops/spray.glb
--- a/assets/models/head_drops/sprouter.glb
+++ b/assets/models/head_drops/sprouter.glb
--- a/assets/models/head_drops/swarm.glb
+++ b/assets/models/head_drops/swarm.glb
--- a/assets/models/head_drops/teleport.glb
+++ b/assets/models/head_drops/teleport.glb
--- a/assets/models/head_drops/thrown.glb
+++ b/assets/models/head_drops/thrown.glb
--- a/assets/models/head_drops/thruster.glb
+++ b/assets/models/head_drops/thruster.glb
--- a/assets/models/head_drops/turbo.glb
+++ b/assets/models/head_drops/turbo.glb
--- a/assets/models/heads/chicago
+++ b/assets/models/heads/chicago
--- a/assets/models/heads/highland
+++ b/assets/models/heads/highland
--- a/assets/models/heads/nanny.glb
+++ b/assets/models/heads/nanny.glb
--- a/assets/models/heads/soldier
+++ b/assets/models/heads/soldier
--- a/assets/models/key.glb
+++ b/assets/models/key.glb
--- a/assets/models/medic_particle.glb
+++ b/assets/models/medic_particle.glb
--- a/assets/models/projectiles/carrot.glb
+++ b/assets/models/projectiles/carrot.glb
--- a/assets/models/projectiles/club.glb
+++ b/assets/models/projectiles/club.glb
--- a/assets/models/projectiles/fan.glb
+++ b/assets/models/projectiles/fan.glb
--- a/assets/models/projectiles/hammer.glb
+++ b/assets/models/projectiles/hammer.glb
--- a/assets/models/projectiles/handbag.glb
+++ b/assets/models/projectiles/handbag.glb
--- a/assets/models/projectiles/missile.glb
+++ b/assets/models/projectiles/missile.glb
--- a/assets/models/projectiles/molotov.glb
+++ b/assets/models/projectiles/molotov.glb
--- a/assets/models/spawn.glb
+++ b/assets/models/spawn.glb
--- a/assets/sfx/abilities/fall-land.ogg
+++ b/assets/sfx/abilities/fall-land.ogg
--- a/assets/sfx/abilities/handbag_hit.ogg
+++ b/assets/sfx/abilities/handbag_hit.ogg
--- a/assets/sfx/abilities/heal.ogg
+++ b/assets/sfx/abilities/heal.ogg
--- a/assets/sfx/abilities/step01.ogg
+++ b/assets/sfx/abilities/step01.ogg
--- a/assets/sfx/abilities/step02.ogg
+++ b/assets/sfx/abilities/step02.ogg
--- a/assets/sfx/ambient/alien_gate.ogg
+++ b/assets/sfx/ambient/alien_gate.ogg
--- a/assets/sfx/ambient/button.ogg
+++ b/assets/sfx/ambient/button.ogg
--- a/assets/sfx/ambient/downtown_loop.ogg
+++ b/assets/sfx/ambient/downtown_loop.ogg
--- a/assets/sfx/ambient/downtown_elevator.ogg
+++ b/assets/sfx/ambient/downtown_elevator.ogg
--- a/assets/sfx/ambient/downtown_underground_elevator.ogg
+++ b/assets/sfx/ambient/downtown_underground_elevator.ogg
--- a/assets/sfx/effects/beam_in_out.ogg
+++ b/assets/sfx/effects/beam_in_out.ogg
--- a/assets/sfx/effects/cash_collect.ogg
+++ b/assets/sfx/effects/cash_collect.ogg
--- a/assets/sfx/effects/secret_collected.ogg
+++ b/assets/sfx/effects/secret_collected.ogg
--- a/assets/sfx/effects/secret_discovered.ogg
+++ b/assets/sfx/effects/secret_discovered.ogg
--- a/assets/sfx/music/02.ogg
+++ b/assets/sfx/music/02.ogg
--- a/assets/sfx/ui/volume.ogg
+++ b/assets/sfx/ui/volume.ogg
--- a/assets/textures/blue-fence.material
+++ b/assets/textures/blue-fence.material
--- a/assets/textures/fence.material
+++ b/assets/textures/fence.material
--- a/assets/textures/water.material
+++ b/assets/textures/water.material
--- a/Show More
+++ b/Show More